Add JobIdentifier information as part of pod annotations

Author: GaneshSPatil

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

@@ -45,7 +45,8 @@ public interface Constants {
     // internal use only
     String CREATED_BY_LABEL_KEY = "Elastic-Agent-Created-By";
     String ENVIRONMENT_LABEL_KEY = "Elastic-Agent-Environment-Name";
-    String JOB_ID_LABEL_KEY = "Elastic-Agent-Job-Identifier";
+    String JOB_ID_LABEL_KEY = "Elastic-Agent-Job-Id";
+    String JOB_IDENTIFIER_LABEL_KEY = "Elastic-Agent-Job-Identifier";
 
     String KUBERNETES_NAMESPACE_KEY = "default";
     String KUBERNETES_POD_KIND_LABEL_KEY = "kind";

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

@@ -37,6 +37,7 @@
 
 import static cd.go.contrib.elasticagent.KubernetesPlugin.LOG;
 import static cd.go.contrib.elasticagent.executors.GetProfileMetadataExecutor.POD_CONFIGURATION;
+import static cd.go.contrib.elasticagent.utils.Util.GSON;
 import static cd.go.contrib.elasticagent.utils.Util.getSimpleDateFormat;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
@@ -99,6 +100,7 @@ private static void setLabels(Pod pod, CreateAgentRequest request) {
     private static void setAnnotations(Pod pod, CreateAgentRequest request) {
         Map<String, String> existingAnnotations = (pod.getMetadata().getAnnotations() != null) ? pod.getMetadata().getAnnotations() : new HashMap<>();
         existingAnnotations.putAll(request.properties());
+        existingAnnotations.put(Constants.JOB_IDENTIFIER_LABEL_KEY, GSON.toJson(request.jobIdentifier()));
         pod.getMetadata().setAnnotations(existingAnnotations);
     }
 

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

@@ -17,6 +17,7 @@
 package cd.go.contrib.elasticagent;
 
 import cd.go.contrib.elasticagent.requests.CreateAgentRequest;
+import com.google.gson.Gson;
 import io.fabric8.kubernetes.api.model.Container;
 import io.fabric8.kubernetes.api.model.EnvVar;
 import io.fabric8.kubernetes.api.model.Pod;
@@ -32,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
@@ -145,7 +147,10 @@ public void shouldCreateKubernetesPodWithPodAnnotations() throws Exception {
 
         assertNotNull(elasticAgentPod.getMetadata());
 
-        assertThat(elasticAgentPod.getMetadata().getAnnotations(), is(createAgentRequest.properties()));
+        Map<String, String> expectedAnnotations = new HashMap<>();
+        expectedAnnotations.putAll(createAgentRequest.properties());
+        expectedAnnotations.put(Constants.JOB_IDENTIFIER_LABEL_KEY, new Gson().toJson(createAgentRequest.jobIdentifier()));
+        assertThat(elasticAgentPod.getMetadata().getAnnotations(), is(expectedAnnotations));
     }
 
     @Test
@@ -249,6 +254,7 @@ public void usingPodYamlConfigurations_shouldCreateKubernetesPodWithPodAnnotatio
         HashMap<String, String> expectedAnnotations = new HashMap<>();
         expectedAnnotations.putAll(createAgentRequest.properties());
         expectedAnnotations.put("annotation-key", "my-fancy-annotation-value");
+        expectedAnnotations.put(Constants.JOB_IDENTIFIER_LABEL_KEY, new Gson().toJson(createAgentRequest.jobIdentifier()));
 
         assertThat(elasticAgentPod.getMetadata().getAnnotations(), is(expectedAnnotations));
     }