added elastic_profile_id; release 0.4.0

tomzo · Dec 16, 2016 · 51bb6d3 · 51bb6d3
1 parent e2ffbdf
commit 51bb6d3
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 0.4.0 (16 Dec 2016)
+
+ * fixed IO error reporting
+ * added elastic_profile_id in job
+
+# 0.3.0 (07 Nov 2016)
+
+ * added validation of duplicate keys
+
 # 0.2.0 (21 Oct 2016)
 
 * added optional `timeout` field to job

diff --git a/README.md b/README.md
@@ -296,7 +296,17 @@ test:
     ...
 ```
 
-*Note: timeout is added since 0.2.0*
+*Note: timeout is added since 0.2.0 version of yaml plugin*
+
+### Elastic agent profile id
+
+Job configuration may define elastic agents profile id, as such:
+```yaml
+elastic_profile_id: "docker.unit-test"
+```
+
+It MUST NOT be specified along with `resources`.
+Available in GoCD server since v16.10.0, yaml plugin 0.4.0.
 
 ### Run many instances
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'cd.go.plugin.config.yaml'
-version '0.2.0'
+version '0.4.0'
 
 apply plugin: 'java'
 

diff --git a/release.sh b/release.sh
@@ -7,7 +7,7 @@ if [ ! -f linux-amd64-github-release.tar.bz2 ]; then
 fi
 tar xf linux-amd64-github-release.tar.bz2
 
-VERSION="0.2.0"
+VERSION="0.4.0"
 GHRELEASE_BIN="./bin/linux/amd64/github-release"
 
 $GHRELEASE_BIN release \

diff --git a/src/main/java/cd/go/plugin/config/yaml/transforms/JobTransform.java b/src/main/java/cd/go/plugin/config/yaml/transforms/JobTransform.java
@@ -26,6 +26,8 @@ public class JobTransform {
     private static final String JSON_JOB_TABS_FIELD = "tabs";
     private static final String JSON_JOB_RESOURCES_FIELD = "resources";
     private static final String YAML_JOB_RESOURCES_FIELD = "resources";
+    private static final String JSON_JOB_ELASTIC_PROFILE_FIELD = "elastic_profile_id";
+    private static final String YAML_JOB_ELASTIC_PROFILE_FIELD = "elastic_profile_id";
     private static final String YAML_JOB_ARTIFACTS_FIELD = "artifacts";
     private static final String JSON_JOB_ARTIFACTS_FIELD = "artifacts";
     private static final String JSON_JOB_ARTIFACT_SOURCE_FIELD = "source";
@@ -70,6 +72,7 @@ public JsonObject transform(String jobName, Map<String, Object> jobMap) {
             jobJson.add(JSON_ENV_VAR_FIELD, jsonEnvVariables);
         addTabs(jobJson, jobMap);
         addOptionalStringList(jobJson, jobMap, JSON_JOB_RESOURCES_FIELD, YAML_JOB_RESOURCES_FIELD);
+        addOptionalString(jobJson, jobMap, JSON_JOB_ELASTIC_PROFILE_FIELD, YAML_JOB_ELASTIC_PROFILE_FIELD);
         addArtifacts(jobJson, jobMap);
         addProperties(jobJson, jobMap);
         addTasks(jobJson, jobMap);

diff --git a/src/main/resources/plugin.xml b/src/main/resources/plugin.xml
@@ -2,7 +2,7 @@
 <go-plugin id="yaml.config.plugin" version="1">
     <about>
         <name>YAML Configuration Plugin</name>
-        <version>0.2.0</version>
+        <version>0.4.0</version>
         <target-go-version>16.7.0</target-go-version>
         <description>
             GoCD pipelines and environments configuration in YAML

diff --git a/src/test/java/cd/go/plugin/config/yaml/transforms/JobTransformTest.java b/src/test/java/cd/go/plugin/config/yaml/transforms/JobTransformTest.java
@@ -42,6 +42,11 @@ public void shouldTransformCompleteJob() throws IOException {
         testTransform("complete");
     }
 
+    @Test
+    public void shouldTransformElasticProfileJob() throws IOException {
+        testTransform("elastic_profile");
+    }
+
     private JsonObject testTransform(String caseFile) throws IOException {
         return testTransform(caseFile, caseFile);
     }

diff --git a/src/test/resources/parts/jobs/elastic_profile.json b/src/test/resources/parts/jobs/elastic_profile.json
@@ -0,0 +1,7 @@
+{
+  "name": "test",
+  "elastic_profile_id" : "profile-id",
+  "tasks": [
+    null
+  ]
+}
diff --git a/src/test/resources/parts/jobs/elastic_profile.yaml b/src/test/resources/parts/jobs/elastic_profile.yaml
@@ -0,0 +1,4 @@
+test:
+  elastic_profile_id: "profile-id"
+  tasks:
+    - null