Replace pod name with pod name + uuid if necessary.

* Upgrade gocd agent image version to latest.

Author: varshavaradarajan

src/main/java/cd/go/contrib/elasticagent/KubernetesInstanceFactory.java

@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
@@ -233,11 +232,12 @@ private static String image(Map<String, String> properties) {
     private KubernetesInstance createUsingPodYaml(CreateAgentRequest request, PluginSettings settings, KubernetesClient client, PluginRequest pluginRequest) {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         String podYaml = request.properties().get(POD_CONFIGURATION.getKey());
-        String templatizedPodYaml = getTemplatizedPodYamlString(podYaml);
+        String templatizedPodYaml = getTemplatizedPodSpec(podYaml);
 
         Pod elasticAgentPod = new Pod();
         try {
             elasticAgentPod = mapper.readValue(templatizedPodYaml, Pod.class);
+            setPodNameIfNecessary(elasticAgentPod, podYaml);
         } catch (IOException e) {
             //ignore error here, handle this inside validate profile!
             LOG.error(e.getMessage());
@@ -268,7 +268,9 @@ else if ("yaml".equalsIgnoreCase(fileType)) {
             FileUtils.copyURLToFile(new URL(fileToDownload), podSpecFile);
             LOG.debug(format("Finished downloading %s to %s", fileToDownload, podSpecFile));
             String spec = FileUtils.readFileToString(podSpecFile, UTF_8);
-            elasticAgentPod = mapper.readValue(spec, Pod.class);
+            String templatizedPodSpec = getTemplatizedPodSpec(spec);
+            elasticAgentPod = mapper.readValue(templatizedPodSpec, Pod.class);
+            setPodNameIfNecessary(elasticAgentPod, spec);
             FileUtils.deleteQuietly(podSpecFile);
             LOG.debug(format("Deleted %s", podSpecFile));
 
@@ -280,11 +282,18 @@ else if ("yaml".equalsIgnoreCase(fileType)) {
         return createKubernetesPod(client, elasticAgentPod);
     }
 
+    private void setPodNameIfNecessary(Pod elasticAgentPod, String spec) {
+        if (!spec.contains(POD_POSTFIX)) {
+            String newPodName = elasticAgentPod.getMetadata().getName().concat(String.format("-%s", UUID.randomUUID().toString()));
+            elasticAgentPod.getMetadata().setName(newPodName);
+        }
+    }
+
 
-    public static String getTemplatizedPodYamlString(String podYaml) {
+    public static String getTemplatizedPodSpec(String podSpec) {
         StringWriter writer = new StringWriter();
         MustacheFactory mf = new DefaultMustacheFactory();
-        Mustache mustache = mf.compile(new StringReader(podYaml), "templatePod");
+        Mustache mustache = mf.compile(new StringReader(podSpec), "templatePod");
         mustache.execute(writer, KubernetesInstanceFactory.getJinJavaContext());
         return writer.toString();
     }
@@ -294,7 +303,7 @@ private static Map<String, String> getJinJavaContext() {
         context.put(POD_POSTFIX, UUID.randomUUID().toString());
         context.put(CONTAINER_POSTFIX, UUID.randomUUID().toString());
         context.put(GOCD_AGENT_IMAGE, "gocd/gocd-agent-alpine-3.6");
-        context.put(LATEST_VERSION, "v18.10.0");
+        context.put(LATEST_VERSION, "v19.1.0");
         return context;
     }
 }

src/main/java/cd/go/contrib/elasticagent/executors/ProfileValidateRequestExecutor.java

@@ -130,7 +130,7 @@ private void validatePodYaml(HashMap<String, String> properties, ArrayList<Map<S
 
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         try {
-            mapper.readValue(KubernetesInstanceFactory.getTemplatizedPodYamlString(podYaml), Pod.class);
+            mapper.readValue(KubernetesInstanceFactory.getTemplatizedPodSpec(podYaml), Pod.class);
         } catch (IOException e) {
             addError(result, key, "Invalid Pod Yaml.");
         }

src/test/java/cd/go/contrib/elasticagent/KubernetesAgentInstancesIntegrationTest.java

@@ -36,6 +36,7 @@
 import java.util.Map;
 
 import static cd.go.contrib.elasticagent.executors.GetProfileMetadataExecutor.PRIVILEGED;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -265,7 +266,7 @@ public void usingPodYamlConfigurations_shouldCreateKubernetesPodWithPodMetadata(
         Pod elasticAgentPod = argumentCaptor.getValue();
 
         assertNotNull(elasticAgentPod.getMetadata());
-        assertThat(elasticAgentPod.getMetadata().getName(), is("test-pod-yaml"));
+        assertThat(elasticAgentPod.getMetadata().getName(), containsString("test-pod-yaml"));
 
         assertThat(elasticAgentPod.getMetadata().getName(), is(instance.name()));
     }
@@ -389,7 +390,7 @@ public void usingRemoteFile_shouldCreateKubernetesPodWithPodMetadata() {
         Pod elasticAgentPod = argumentCaptor.getValue();
 
         assertNotNull(elasticAgentPod.getMetadata());
-        assertThat(elasticAgentPod.getMetadata().getName(), is("test-pod-json"));
+        assertThat(elasticAgentPod.getMetadata().getName(), containsString("test-pod-json"));
 
         assertThat(elasticAgentPod.getMetadata().getName(), is(instance.name()));
     }