Merge pull request #36 from bdpiparva/pending-pod-count

Removed unwanted refresh agent call.

Author: bdpiprava

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

@@ -150,7 +150,7 @@ public Agents instancesCreatedAfterTimeout(PluginSettings settings, Agents agent
 
     @Override
     public void refreshAll(PluginRequest pluginRequest) {
-        LOG.debug("[Refresh Instances]. Syncing k8s elastic agent pod information.");
+        LOG.debug("[Refresh Instances] Syncing k8s elastic agent pod information.");
         KubernetesClient client = factory.client(pluginRequest.getPluginSettings());
         PodList list = client.pods().list();
 

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

@@ -72,7 +72,6 @@ public GoPluginApiResponse handle(GoPluginApiRequest request) {
                 case REQUEST_VALIDATE_PROFILE:
                     return ProfileValidateRequest.fromJSON(request.requestBody()).executor().execute();
                 case REQUEST_CREATE_AGENT:
-                    refreshInstances();
                     return CreateAgentRequest.fromJSON(request.requestBody()).executor(agentInstances, pluginRequest).execute();
                 case REQUEST_SHOULD_ASSIGN_WORK:
                     refreshInstances();

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

@@ -71,6 +71,12 @@ public void setUp() {
         when(factory.client(mockPluginSettings)).thenReturn(mockKubernetesClient);
         JobIdentifier jobId = new JobIdentifier("test", 1L, "Test pipeline", "test name", "1", "test job", 100L);
         when(mockCreateAgentRequest.jobIdentifier()).thenReturn(jobId);
+
+        final PodList podList = mock(PodList.class);
+        when(mockKubernetesClient.pods()).thenReturn(mockedOperation);
+        when(mockPluginRequest.getPluginSettings()).thenReturn(mockPluginSettings);
+        when(mockedOperation.list()).thenReturn(podList);
+        when(podList.getItems()).thenReturn(Collections.emptyList());
     }
 
     @Test
@@ -141,11 +147,6 @@ public void shouldNotCreatePodsWhenOutstandingLimitOfPendingKubernetesPodsHasRea
 
     @Test
     public void shouldSyncPodsStateFromClusterBeforeCreatingPod() {
-        final PodList podList = mock(PodList.class);
-        when(mockKubernetesClient.pods()).thenReturn(mockedOperation);
-        when(mockPluginRequest.getPluginSettings()).thenReturn(mockPluginSettings);
-        when(mockedOperation.list()).thenReturn(podList);
-        when(podList.getItems()).thenReturn(Collections.emptyList());
         when(mockKubernetesInstanceFactory.create(mockCreateAgentRequest, mockPluginSettings, mockKubernetesClient, mockPluginRequest, false)).
                 thenReturn(new KubernetesInstance(new DateTime(), "test", "test-agent", new HashMap<>(), 100L, PodState.Running));
 

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

@@ -51,13 +51,15 @@ public class ServerPingRequestExecutorTest extends BaseTest {
     @Mock
     private Pod mockedPod;
     @Mock
+    private PluginRequest pluginRequest;
+    @Mock
     private PodResource<Pod, DoneablePod> podResource;
     private ObjectMeta objectMetadata;
 
     @Before
     public void setUp() {
         initMocks(this);
-        when(factory.client(any(PluginSettings.class))).thenReturn(mockedClient);
+        when(factory.client(any())).thenReturn(mockedClient);
         when(mockedClient.pods()).thenReturn(mockedOperation);
         when(mockedOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
             @Override
@@ -74,6 +76,10 @@ public Pod answer(InvocationOnMock invocation) throws Throwable {
         objectMetadata.setCreationTimestamp(getSimpleDateFormat().format(new Date()));
 
         when(mockedPod.getMetadata()).thenReturn(objectMetadata);
+
+        final PodList podList = mock(PodList.class);
+        when(mockedOperation.list()).thenReturn(podList);
+        when(podList.getItems()).thenReturn(Collections.emptyList());
     }
 
     @Test
@@ -122,7 +128,7 @@ 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(1L)), createSettings(), null);
+        KubernetesInstance container = agentInstances.create(new CreateAgentRequest(null, properties, null, new JobIdentifier(1L)), createSettings(), pluginRequest);
 
         agentInstances.clock = new Clock.TestClock().forward(Period.minutes(11));
         PluginRequest pluginRequest = mock(PluginRequest.class);

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

@@ -33,13 +33,15 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -52,14 +54,21 @@ public class ShouldAssignWorkRequestExecutorTest extends BaseTest {
     @Mock
     private KubernetesClient mockedClient;
     @Mock
+    private PluginRequest pluginRequest;
+    @Mock
     private MixedOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> mockedOperation;
     private String environment = "QA";
 
     @Before
     public void setUp() throws Exception {
         initMocks(this);
-        when(factory.client(any(PluginSettings.class))).thenReturn(mockedClient);
+        when(factory.client(any())).thenReturn(mockedClient);
         when(mockedClient.pods()).thenReturn(mockedOperation);
+        
+        final PodList podList = mock(PodList.class);
+        when(mockedOperation.list()).thenReturn(podList);
+        when(podList.getItems()).thenReturn(Collections.emptyList());
+
         when(mockedOperation.create(any(Pod.class))).thenAnswer(new Answer<Pod>() {
             @Override
             public Pod answer(InvocationOnMock invocation) throws Throwable {
@@ -71,7 +80,7 @@ public Pod answer(InvocationOnMock invocation) throws Throwable {
         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(100L)), createSettings(), null);
+        instance = agentInstances.create(new CreateAgentRequest(UUID.randomUUID().toString(), properties, environment, new JobIdentifier(100L)), createSettings(), pluginRequest);
     }
 
     @Test