Add more messages, improve existing messages

Author: arvindsv

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

@@ -63,12 +63,13 @@ public KubernetesInstance create(CreateAgentRequest request, PluginSettings sett
         synchronized (instances) {
             refreshAll(settings);
             doWithLockOnSemaphore(new SetupSemaphore(maxAllowedContainers, instances, semaphore));
-
+            consoleLogAppender.accept("Waiting to create agent pod.");
             if (semaphore.tryAcquire()) {
                 return createKubernetesInstance(request, settings, pluginRequest, consoleLogAppender);
             } else {
-                LOG.warn(format("[Create Agent Request] The number of pending kubernetes pods is currently at the maximum permissible limit ({0}). Total kubernetes pods ({1}). Not creating any more containers.", maxAllowedContainers, instances.size()));
-                consoleLogAppender.accept(format("[Create Agent Request] The number of pending kubernetes pods is currently at the maximum permissible limit ({0}). Total kubernetes pods ({1}). Not creating any more containers.", maxAllowedContainers, instances.size()));
+                String message = format("[Create Agent Request] The number of pending kubernetes pods is currently at the maximum permissible limit ({0}). Total kubernetes pods ({1}). Not creating any more containers.", maxAllowedContainers, instances.size());
+                LOG.warn(message);
+                consoleLogAppender.accept(message);
                 return null;
             }
         }
@@ -83,16 +84,17 @@ private void doWithLockOnSemaphore(Runnable runnable) {
     private KubernetesInstance createKubernetesInstance(CreateAgentRequest request, PluginSettings settings, PluginRequest pluginRequest, ConsoleLogAppender consoleLogAppender) {
         JobIdentifier jobIdentifier = request.jobIdentifier();
         if (isAgentCreatedForJob(jobIdentifier.getJobId())) {
-            LOG.warn(format("[Create Agent Request] Request for creating an agent for Job Identifier [{0}] has already been scheduled. Skipping current request.", jobIdentifier));
-            consoleLogAppender.accept(format("[Create Agent Request] Request for creating an agent for Job Identifier [{0}] has already been scheduled. Skipping current request.", jobIdentifier));
+            String message = format("[Create Agent Request] Request for creating an agent for Job Identifier [{0}] has already been scheduled. Skipping current request.", jobIdentifier);
+            LOG.warn(message);
+            consoleLogAppender.accept(message);
             return null;
         }
 
         KubernetesClient client = factory.client(settings);
         KubernetesInstance instance = kubernetesInstanceFactory.create(request, settings, client, pluginRequest);
-        consoleLogAppender.accept(String.format("Created pod: %s for job %s", instance.name(), jobIdentifier));
+        consoleLogAppender.accept(format("Creating pod: %s", instance.name()));
         register(instance);
-        consoleLogAppender.accept(String.format("Registered agent: %s for job %s", instance.name(), jobIdentifier));
+        consoleLogAppender.accept(format("Agent pod %s created. Waiting for it to register to the GoCD server.", instance.name()));
 
         return instance;
     }

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

@@ -48,7 +48,13 @@ public GoPluginApiResponse execute() throws Exception {
             pluginRequest.appendToConsoleLog(request.jobIdentifier(), message);
         };
         consoleLogAppender.accept(format("Received request to create a pod for job {0} in cluster {1} at {2}", request.jobIdentifier(), request.clusterProfileProperties().getClusterUrl(), new DateTime().toString("yyyy-MM-dd HH:mm:ss ZZ")));
-        agentInstances.create(request, request.clusterProfileProperties(), pluginRequest, consoleLogAppender);
+        try {
+            agentInstances.create(request, request.clusterProfileProperties(), pluginRequest, consoleLogAppender);
+        } catch (Exception e) {
+            consoleLogAppender.accept(format("Failed to create agent pod: %s", e.getMessage()));
+            throw e;
+        }
+
         return new DefaultGoPluginApiResponse(200);
     }
 

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

@@ -23,6 +23,7 @@
 
 import java.util.HashMap;
 
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.*;
 
 public class CreateAgentRequestExecutorTest {
@@ -40,4 +41,26 @@ public void shouldAskDockerContainersToCreateAnAgent() throws Exception {
         verify(pluginRequest).appendToConsoleLog(eq(jobIdentifier), contains("Received request to create a pod for job"));
         verify(agentInstances).create(eq(request), eq(request.clusterProfileProperties()), eq(pluginRequest), any(ConsoleLogAppender.class));
     }
+
+    @Test
+    public void shouldLogErrorMessageToConsoleIfAgentCreateFails() throws Exception {
+        final HashMap<String, String> elasticAgentProfileProperties = new HashMap<>();
+        elasticAgentProfileProperties.put("Image", "image1");
+        ClusterProfileProperties clusterProfileProperties = new ClusterProfileProperties("http://go-server", "http://k8ssvc.url", "");
+        final JobIdentifier jobIdentifier = new JobIdentifier("p1", 1L, "l1", "s1", "1", "j1", 1L);
+        CreateAgentRequest request = new CreateAgentRequest("key1", elasticAgentProfileProperties, "env1", jobIdentifier, clusterProfileProperties);
+        AgentInstances<KubernetesInstance> agentInstances = mock(KubernetesAgentInstances.class);
+        PluginRequest pluginRequest = mock(PluginRequest.class);
+
+        when(agentInstances.create(any(), any(), any(), any())).thenThrow(new RuntimeException("Ouch!"));
+
+        try {
+            new CreateAgentRequestExecutor(request, agentInstances, pluginRequest).execute();
+            fail("Should have thrown an exception.");
+        } catch (Exception e) {
+            // This is expected. Ignore.
+        }
+        verify(pluginRequest).appendToConsoleLog(any(), contains("Received request to create a pod for job"));
+        verify(pluginRequest).appendToConsoleLog(any(), contains("Failed to create agent pod"));
+    }
 }