changed default for marathon configuration to application.json and …

…adapted legacy handling for `app-definition.json` Fixes #7
dcos-labs · Mar 14, 2017 · 81d5853 · 81d5853
1 parent 2d80680
commit 81d5853
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 7 deletions.
diff --git a/samples/jee-sample/app-definition.json → samples/jee-sample/application.json b/samples/jee-sample/app-definition.json → samples/jee-sample/application.json
diff --git a/samples/jee-sample/pom.xml b/samples/jee-sample/pom.xml
@@ -56,7 +56,7 @@
             <plugin>
                 <groupId>dcos</groupId>
                 <artifactId>dcos-maven-plugin</artifactId>
-                <version>0.1</version>
+                <version>0.3-SNAPSHOT</version>
                 <configuration>
                     <dcosUrl>https://frontend-elasticl-lgydh6t853qv-753743843.eu-central-1.elb.amazonaws.com/</dcosUrl>
                     <ignoreSslCertificate>true</ignoreSslCertificate>

diff --git a/samples/simple-sample/app-definition.json → samples/simple-sample/application.json b/samples/simple-sample/app-definition.json → samples/simple-sample/application.json
diff --git a/samples/simple-sample/pom.xml b/samples/simple-sample/pom.xml
@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>dcos</groupId>
                 <artifactId>dcos-maven-plugin</artifactId>
-                <version>0.1</version>
+                <version>0.3-SNAPSHOT</version>
                 <configuration>
                     <dcosUrl>https://junterste-elasticl-wzqyi9j6o2f2-484663919.eu-central-1.elb.amazonaws.com/</dcosUrl>
                     <ignoreSslCertificate>true</ignoreSslCertificate>

diff --git a/...es/spring-boot-sample/app-definition.json → samples/spring-boot-sample/application.json b/...es/spring-boot-sample/app-definition.json → samples/spring-boot-sample/application.json
diff --git a/samples/spring-boot-sample/pom.xml b/samples/spring-boot-sample/pom.xml
@@ -75,7 +75,7 @@
             <plugin>
                 <groupId>dcos</groupId>
                 <artifactId>dcos-maven-plugin</artifactId>
-                <version>0.1</version>
+                <version>0.3-SNAPSHOT</version>
                 <configuration>
                     <dcosUrl>http://junterste-elasticl-792mfv4rl50j-59247683.us-west-2.elb.amazonaws.com/</dcosUrl>
                     <ignoreSslCertificate>true</ignoreSslCertificate>

diff --git a/src/main/java/dcos/AbstractDcosMojo.java b/src/main/java/dcos/AbstractDcosMojo.java
@@ -13,9 +13,12 @@
  */
 abstract class AbstractDcosMojo extends AbstractMojo {
 
-  @Parameter(defaultValue = "${project.basedir}/app-definition.json", property = "appDefinition", required = true)
+  @Parameter(defaultValue = "${project.basedir}/application.json", property = "appDefinition", required = true)
   File appDefinitionFile;
 
+  @Parameter(defaultValue = "${project.basedir}/app-definition.json", property = "legacyAppDefinition", required = true, readonly = true)
+  File legacyAppDefinitionFile;
+
   @Parameter(defaultValue = "${project.basedir}/.dcos-token", property = "dcosTokenFile", required = true)
   File dcosTokenFile;
 
@@ -31,6 +34,7 @@ abstract class AbstractDcosMojo extends AbstractMojo {
   void logConfiguration() {
     Log log = getLog();
     log.info("app definition: " + appDefinitionFile);
+    log.info("legacy default app definition: " + legacyAppDefinitionFile);
     log.info("dcos token: " + dcosTokenFile);
     log.info("dcos url: " + dcosUrl);
     log.info("ignore ssl certificate: " + ignoreSslCertificate);

diff --git a/src/main/java/dcos/DcosDeployMojo.java b/src/main/java/dcos/DcosDeployMojo.java
@@ -24,11 +24,16 @@ public void execute() throws MojoExecutionException {
       getLog().info("About to execute DC/OS deploy");
       logConfiguration();
       client = DcosPluginHelper.buildClient(ignoreSslCertificate);
-      Map<String, Object> marathonConfigurationJson = DcosPluginHelper.readJsonFileToMap(appDefinitionFile);
+      Map<String, Object> marathonConfigurationJson = DcosPluginHelper.readJsonFileToMap(appDefinitionFile, legacyAppDefinitionFile);
       HttpPut put = new HttpPut(buildDcosUrl(marathonConfigurationJson.get("id"), marathonConfigurationJson));
       put.setHeader("Authorization", "token=" + DcosPluginHelper.readToken(dcosTokenFile));
       put.setHeader("Content-Type", "application/json");
-      put.setEntity(new FileEntity(appDefinitionFile));
+      if (appDefinitionFile.exists()) {
+        put.setEntity(new FileEntity(appDefinitionFile));
+      } else {
+        // legacy handling
+        put.setEntity(new FileEntity(legacyAppDefinitionFile));
+      }
       CloseableHttpResponse response = client.execute(put);
       getLog().info("Response from DC/OS [" + response.getStatusLine().getStatusCode() + "] " + IOUtils.toString(response.getEntity().getContent(), "UTF-8"));
     } catch (Exception e) {

diff --git a/src/main/java/dcos/DcosPluginHelper.java b/src/main/java/dcos/DcosPluginHelper.java
@@ -30,6 +30,14 @@ static Map<String, Object> readJsonFileToMap(File file) {
     }
   }
 
+  @SuppressWarnings("deprecation")
+  static Map<String, Object> readJsonFileToMap(File file, File fallbackFile) {
+    if (file.exists()) {
+      return readJsonFileToMap(file);
+    }
+    return readJsonFileToMap(fallbackFile);
+  }
+
   @SuppressWarnings("deprecation")
   static String readToken(File tokenFile) {
     try {

diff --git a/src/main/java/dcos/DcosRestartMojo.java b/src/main/java/dcos/DcosRestartMojo.java
@@ -23,7 +23,7 @@ public void execute() throws MojoExecutionException {
       getLog().info("About to execute DC/OS restart");
       logConfiguration();
       client = DcosPluginHelper.buildClient(ignoreSslCertificate);
-      Map<String, Object> marathonConfigurationJson = DcosPluginHelper.readJsonFileToMap(appDefinitionFile);
+      Map<String, Object> marathonConfigurationJson = DcosPluginHelper.readJsonFileToMap(appDefinitionFile, legacyAppDefinitionFile);
       HttpPost post = new HttpPost(DcosPluginHelper.cleanUrl(buildDcosUrl(marathonConfigurationJson.get("id"), marathonConfigurationJson) + "/restart"));
       post.setHeader("Authorization", "token=" + DcosPluginHelper.readToken(dcosTokenFile));
       CloseableHttpResponse response = client.execute(post);