Add validation error when generateName field is specified in Elastic …

…Agent Profile Pod Yaml
gocd · Sep 5, 2019 · 0bf5f55 · 0bf5f55
1 parent e3894e8
commit 0bf5f55
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/src/main/java/cd/go/contrib/elasticagent/executors/ProfileValidateRequestExecutor.java b/src/main/java/cd/go/contrib/elasticagent/executors/ProfileValidateRequestExecutor.java
@@ -89,8 +89,7 @@ public GoPluginApiResponse execute() {
                     validationError.put("message", "Should be one of `properties`, `remote`, `yaml`.");
                     result.add(validationError);
             }
-        }
-        else {
+        } else {
 
             boolean isSpecifiedUsingPodYaml = Boolean.valueOf(new HashMap<>(request.getProperties()).get(SPECIFIED_USING_POD_CONFIGURATION.getKey()));
 
@@ -127,12 +126,17 @@ private void validatePodYaml(HashMap<String, String> properties, ArrayList<Map<S
             addNotBlankError(result, key, "Pod Configuration");
             return;
         }
-
+        Pod pod = new Pod();
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         try {
-            mapper.readValue(KubernetesInstanceFactory.getTemplatizedPodSpec(podYaml), Pod.class);
+            pod = mapper.readValue(KubernetesInstanceFactory.getTemplatizedPodSpec(podYaml), Pod.class);
         } catch (IOException e) {
             addError(result, key, "Invalid Pod Yaml.");
+            return;
+        }
+
+        if (StringUtils.isNotBlank(pod.getMetadata().getGenerateName())) {
+            addError(result, key, "Invalid Pod Yaml. generateName field is not supported by GoCD. Please use {{ POD_POSTFIX }} instead.");
         }
     }
 

diff --git a/src/test/java/cd/go/contrib/elasticagent/executors/ProfileValidateRequestExecutorTest.java b/src/test/java/cd/go/contrib/elasticagent/executors/ProfileValidateRequestExecutorTest.java
@@ -84,6 +84,26 @@ public void shouldAllowPodYamlConfiguration() throws Exception {
         JSONAssert.assertEquals("[]", json, JSONCompareMode.NON_EXTENSIBLE);
     }
 
+    @Test
+    public void shouldNotAllowPodYamlConfigurationWhenGenerateNameIsSpecified() throws Exception {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("PodSpecType", "yaml");
+        String podYaml = "apiVersion: v1\n" +
+                "kind: Pod\n" +
+                "metadata:\n" +
+                "  generateName: pod-name\n" +
+                "  labels:\n" +
+                "    app: web\n" +
+                "spec:\n" +
+                "  containers:\n" +
+                "    - name: gocd-agent-container\n" +
+                "      image: gocd/fancy-agent-image:latest";
+
+        properties.put("PodConfiguration", podYaml);
+        ProfileValidateRequestExecutor executor = new ProfileValidateRequestExecutor(new ProfileValidateRequest(properties));
+        String json = executor.execute().responseBody();
+        JSONAssert.assertEquals("[{\"message\":\"Invalid Pod Yaml. generateName field is not supported by GoCD. Please use {{ POD_POSTFIX }} instead.\",\"key\":\"PodConfiguration\"}]", json, JSONCompareMode.NON_EXTENSIBLE);
+    }
 
     @Test
     public void shouldAllowJinjaTemplatedPodYaml() throws Exception {