✨ : add information about image used for jobs

gaia-app · Feb 2, 2020 · 053d839 · 053d839
1 parent 555ff00
commit 053d839
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java b/src/main/java/io/codeka/gaia/runner/StackCommandBuilder.java
@@ -53,7 +53,8 @@ private String buildScript(Stack stack, TerraformModule module,
         var script = new TerraformScript()
                 .setExternalUrl(settings.getExternalUrl())
                 .setStackId(stack.getId())
-                .setGitRepositoryUrl(evalGitRepositoryUrl(module));
+                .setGitRepositoryUrl(evalGitRepositoryUrl(module))
+                .setTerraformImage(module.getTerraformImage().image());
 
         if (StringUtils.isNotBlank(module.getDirectory())) {
             script.setGitDirectory(module.getDirectory());

diff --git a/src/main/java/io/codeka/gaia/stacks/bo/mustache/TerraformScript.java b/src/main/java/io/codeka/gaia/stacks/bo/mustache/TerraformScript.java
@@ -5,12 +5,22 @@
  */
 public class TerraformScript {
 
+    private String terraformImage;
     private String gitRepositoryUrl;
     private String gitDirectory;
     private String externalUrl;
     private String stackId;
     private String command;
 
+    public String getTerraformImage() {
+        return terraformImage;
+    }
+
+    public TerraformScript setTerraformImage(String terraformImage) {
+        this.terraformImage = terraformImage;
+        return this;
+    }
+
     public String getGitRepositoryUrl() {
         return gitRepositoryUrl;
     }

diff --git a/src/main/resources/mustache/terraform.mustache b/src/main/resources/mustache/terraform.mustache
@@ -1,5 +1,7 @@
 set -e
 
+echo 'using image {{terraformImage}}'
+
 echo 'cloning {{gitRepositoryUrl}}' | awk '{ sub(/oauth2:(.*)@/, "oauth2:[MASKED]@");}1'
 git clone {{gitRepositoryUrl}} module
 

diff --git a/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java b/src/test/java/io/codeka/gaia/runner/StackCommandBuilderTest.java
@@ -100,6 +100,7 @@ void buildPlanScript_shouldGenerateAFullScript() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildPlanScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -117,6 +118,7 @@ void buildPlanScript_shouldGenerateAFullScript_forAModuleWithoutDirectory() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildPlanScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -136,6 +138,7 @@ void buildPlanScript_shouldGenerateAFullScript_forAModuleWithAccessToken() {
         when(registryOAuth2Provider.getOAuth2Url(anyString(), anyString())).thenReturn("url_with_token");
         var script = stackCommandBuilder.buildPlanScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning url_with_token' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone url_with_token"));
         assertTrue(script.contains("cd module"));
@@ -209,6 +212,7 @@ void buildApplyScript_shouldGenerateAFullScript() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildApplyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -226,6 +230,7 @@ void buildApplyScript_shouldGenerateAFullScript_forAModuleWithoutDirectory() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildApplyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -245,6 +250,7 @@ void buildApplyScript_shouldGenerateAFullScript_forAModuleWithAccessToken() {
         when(registryOAuth2Provider.getOAuth2Url(anyString(), anyString())).thenReturn("url_with_token");
         var script = stackCommandBuilder.buildApplyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning url_with_token' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone url_with_token"));
         assertTrue(script.contains("cd module"));
@@ -318,6 +324,7 @@ void buildPlanDestroyScript_shouldGenerateAFullScript() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildPlanDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -335,6 +342,7 @@ void buildPlanDestroyScript_shouldGenerateAFullScript_forAModuleWithoutDirectory
         var stack = new Stack();
         var script = stackCommandBuilder.buildPlanDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -354,6 +362,7 @@ void buildPlanDestroyScript_shouldGenerateAFullScript_forAModuleWithAccessToken(
         when(registryOAuth2Provider.getOAuth2Url(anyString(), anyString())).thenReturn("url_with_token");
         var script = stackCommandBuilder.buildPlanDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning url_with_token' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone url_with_token"));
         assertTrue(script.contains("cd module"));
@@ -427,6 +436,7 @@ void buildDestroyScript_shouldGenerateAFullScript() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -444,6 +454,7 @@ void buildDestroyScript_shouldGenerateAFullScript_forAModuleWithoutDirectory() {
         var stack = new Stack();
         var script = stackCommandBuilder.buildDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning git://test' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone git://test module"));
         assertTrue(script.contains("cd module"));
@@ -463,6 +474,7 @@ void buildDestroyScript_shouldGenerateAFullScript_forAModuleWithAccessToken() {
         when(registryOAuth2Provider.getOAuth2Url(anyString(), anyString())).thenReturn("url_with_token");
         var script = stackCommandBuilder.buildDestroyScript(stack, module);
 
+        assertTrue(script.contains("echo 'using image hashicorp/terraform:latest'"));
         assertTrue(script.contains("echo 'cloning url_with_token' | awk '{ sub(/oauth2:(.*)@/, \"oauth2:[MASKED]@\");}1'"));
         assertTrue(script.contains("git clone url_with_token"));
         assertTrue(script.contains("cd module"));