🐛 : correct NPE when stack has no credentials

gaia-app · Aug 24, 2020 · e1c28a9 · e1c28a9
1 parent 3bfcfd4
commit e1c28a9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/io/gaia_app/stacks/controller/StackRestController.java b/src/main/java/io/gaia_app/stacks/controller/StackRestController.java
@@ -91,8 +91,10 @@ public Map<String, String> launchJob(@PathVariable String id, @PathVariable JobT
         // create a new job
         var job = new Job(jobType, id, user);
         job.setTerraformImage(stack.getModule().getTerraformImage());
-        this.credentialsRepository.findById(stack.getCredentialsId())
-            .ifPresent(job::setCredentials);
+        if(stack.getCredentialsId() != null){
+            this.credentialsRepository.findById(stack.getCredentialsId())
+                .ifPresent(job::setCredentials);
+        }
         jobRepository.save(job);
 
         return Map.of("jobId", job.getId());

diff --git a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java
@@ -1,5 +1,6 @@
 package io.gaia_app.stacks.controller;
 
+import io.gaia_app.credentials.AWSCredentials;
 import io.gaia_app.credentials.CredentialsRepository;
 import io.gaia_app.modules.bo.TerraformImage;
 import io.gaia_app.modules.bo.TerraformModule;
@@ -201,4 +202,37 @@ void launchJob_shouldConfigureAndSaveTheJob() {
         assertEquals(module.getTerraformImage(), job.getTerraformImage());
     }
 
+    @Test
+    void launchJob_shouldInjectCredentialsIntoJob() {
+        // given
+        var stack = new Stack();
+        stack.setCredentialsId("123456");
+        var module = new TerraformModule();
+        module.setTerraformImage(TerraformImage.Companion.defaultInstance());
+        stack.setModule(module);
+        var user = new User("test_user", null);
+
+        AWSCredentials awsCredentials = new AWSCredentials("a", "s");
+        when(credentialsRepository.findById("123456")).thenReturn(Optional.of(awsCredentials));
+
+        // when
+        when(stackRepository.findById(anyString())).thenReturn(Optional.of(stack));
+        var result = stackRestController.launchJob("test_stack", JobType.RUN, user);
+
+        // then
+        assertThat(result)
+            .isNotNull()
+            .containsKeys("jobId");
+
+        var captor = forClass(Job.class);
+        verify(jobRepository).save(captor.capture());
+        var job = captor.getValue();
+        assertNotNull(job);
+        assertEquals(JobType.RUN, job.getType());
+        assertEquals("test_stack", job.getStackId());
+        assertEquals(user, job.getUser());
+        assertEquals(module.getTerraformImage(), job.getTerraformImage());
+        assertEquals(job.getCredentials(), awsCredentials);
+    }
+
 }