Add JobId on KubernetesInstance instance

Author: GaneshSPatil

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

@@ -27,12 +27,14 @@ public class KubernetesInstance {
     private final String environment;
     private final String name;
     private final Map<String, String> properties;
+    private final Long jobId;
 
-    public KubernetesInstance(DateTime createdAt, String environment, String name, Map<String, String> properties) {
+    public KubernetesInstance(DateTime createdAt, String environment, String name, Map<String, String> properties, Long jobId) {
         this.createdAt = createdAt.withZone(DateTimeZone.UTC);
         this.environment = environment;
         this.name = name;
         this.properties = properties;
+        this.jobId = jobId;
     }
 
     public void terminate(KubernetesClient client) {

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

@@ -117,7 +117,8 @@ public KubernetesInstance fromKubernetesPod(Pod elasticAgentPod) {
                 createdAt = new DateTime(getSimpleDateFormat().parse(metadata.getCreationTimestamp())).withZone(DateTimeZone.UTC);
             }
             String environment = metadata.getLabels().get(Constants.ENVIRONMENT_LABEL_KEY);
-            kubernetesInstance = new KubernetesInstance(createdAt, environment, metadata.getName(), metadata.getAnnotations());
+            Long jobId = Long.valueOf(metadata.getLabels().get(Constants.JOB_ID_LABEL_KEY));
+            kubernetesInstance = new KubernetesInstance(createdAt, environment, metadata.getName(), metadata.getAnnotations(), jobId);
         } catch (ParseException e) {
             throw new RuntimeException(e);
         }

src/main/java/cd/go/contrib/elasticagent/model/JobIdentifier.java

@@ -57,7 +57,11 @@ public JobIdentifier() {
         jobId = null;
     }
 
-    public JobIdentifier(String pipelineName, long pipelineCounter, String pipelineLabel, String staqeName, String stageCounter, String jobName, long jobId) {
+    public JobIdentifier(Long jobId) {
+        this(null, null, null, null, null, null, jobId);
+    }
+
+    public JobIdentifier(String pipelineName, Long pipelineCounter, String pipelineLabel, String staqeName, String stageCounter, String jobName, Long jobId) {
         this.pipelineName = pipelineName;
         this.pipelineCounter = pipelineCounter;
         this.pipelineLabel = pipelineLabel;

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

@@ -65,7 +65,7 @@ public void setUp() throws Exception {
 
     @Test
     public void shouldCreateKubernetesPodUsingPodYamlAndCacheCreatedInstance() throws Exception {
-        KubernetesInstance kubernetesInstance = new KubernetesInstance(new DateTime(), "test", "test-agent", new HashMap<>());
+        KubernetesInstance kubernetesInstance = new KubernetesInstance(new DateTime(), "test", "test-agent", new HashMap<>(), null);
         when(mockKubernetesInstanceFactory.create(mockCreateAgentRequest, mockPluginSettings, mockKubernetesClient, mockPluginRequest, true)).
                 thenReturn(kubernetesInstance);
 
@@ -78,7 +78,7 @@ public void shouldCreateKubernetesPodUsingPodYamlAndCacheCreatedInstance() throw
 
     @Test
     public void shouldCreateKubernetesPodAndCacheCreatedInstance() throws Exception {
-        KubernetesInstance kubernetesInstance = new KubernetesInstance(new DateTime(), "test", "test-agent", new HashMap<>());
+        KubernetesInstance kubernetesInstance = new KubernetesInstance(new DateTime(), "test", "test-agent", new HashMap<>(), null);
         when(mockKubernetesInstanceFactory.create(mockCreateAgentRequest, mockPluginSettings, mockKubernetesClient, mockPluginRequest, false)).
                 thenReturn(kubernetesInstance);
         testProperties.put("SpecifiedUsingPodConfiguration", "false");

src/test/java/cd/go/contrib/elasticagent/executors/ServerPingRequestExecutorTest.java

@@ -117,13 +117,15 @@ public void testShouldTerminateInstancesThatNeverAutoRegistered() throws Excepti
         KubernetesAgentInstances agentInstances = new KubernetesAgentInstances(factory);
         HashMap<String, String> properties = new HashMap<>();
         properties.put("Image", "foo");
-        KubernetesInstance container = agentInstances.create(new CreateAgentRequest(null, properties, null, new JobIdentifier()), createSettings(), null);
+        KubernetesInstance container = agentInstances.create(new CreateAgentRequest(null, properties, null, new JobIdentifier(1L)), createSettings(), null);
 
         agentInstances.clock = new Clock.TestClock().forward(Period.minutes(11));
         PluginRequest pluginRequest = mock(PluginRequest.class);
 
         objectMetadata.setName(container.name());
-        objectMetadata.setLabels(new HashMap<>());
+        HashMap<String, String> labels = new HashMap<>();
+        labels.put(Constants.JOB_ID_LABEL_KEY, "1");
+        objectMetadata.setLabels(labels);
         when(pluginRequest.getPluginSettings()).thenReturn(createSettings());
         when(pluginRequest.listAgents()).thenReturn(new Agents());
         verifyNoMoreInteractions(pluginRequest);

src/test/java/cd/go/contrib/elasticagent/executors/ShouldAssignWorkRequestExecutorTest.java

@@ -69,7 +69,7 @@ public void setUp() throws Exception {
         agentInstances = new KubernetesAgentInstances(factory);
         properties.put("foo", "bar");
         properties.put("Image", "gocdcontrib/ubuntu-docker-elastic-agent");
-        instance = agentInstances.create(new CreateAgentRequest(UUID.randomUUID().toString(), properties, environment, new JobIdentifier()), createSettings(), null);
+        instance = agentInstances.create(new CreateAgentRequest(UUID.randomUUID().toString(), properties, environment, new JobIdentifier(1L)), createSettings(), null);
     }
 
     @Test

src/test/java/cd/go/contrib/elasticagent/requests/CreateAgentRequestTest.java

@@ -57,7 +57,7 @@ public void shouldDeserializeFromJSON() throws Exception {
         expectedProperties.put("key2", "value2");
         assertThat(request.properties(), Matchers.<Map<String, String>>equalTo(expectedProperties));
 
-        JobIdentifier expectedJobIdentifier = new JobIdentifier("test-pipeline", 1, "Test Pipeline", "test-stage", "1", "test-job", 100);
+        JobIdentifier expectedJobIdentifier = new JobIdentifier("test-pipeline", 1L, "Test Pipeline", "test-stage", "1", "test-job", 100L);
         JobIdentifier actualJobIdentifier = request.jobIdentifier();
 
         assertThat(actualJobIdentifier, is(expectedJobIdentifier));