fix (jkube-kit/generator) : Align BaseGenerator's config options to w…

…ork with `jkube.generator.*` properties (#1489) BaseGenerator `add` and `tags` options also available with `jkube.generator.add` and `jkube.generator.tags` properties respectively. Signed-off-by: Rohan Kumar <[email protected]>
eclipse-jkube · May 13, 2022 · 2a372a3 · 2a372a3
1 parent 312c280
commit 2a372a3
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,7 @@ Usage:
 * Fix #1324: Support legacy javaee as well as jakartaee projects in the Tomcat webapp generator
 * Fix #1482: Quarkus Generator and Enricher should be compatible with the Red Hat build
 * Fix #1483: Assembly files with unnormalized paths don't get fileMode changes
+* Fix #1489: Align BaseGenerator's `add` and `tags` config options to work with `jkube.generator.*` properties
 
 ### 1.7.0 (2022-02-25)
 * Fix #1315: Pod Log Service works for Jobs with no selector

diff --git a/...it/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java b/...it/generator/api/src/main/java/org/eclipse/jkube/generator/api/support/BaseGenerator.java
@@ -221,7 +221,7 @@ protected boolean shouldAddGeneratedImageConfiguration(List<ImageConfiguration>
             return false;
         }
         if (containsBuildConfiguration(configs)) {
-            return Configs.asBoolean(getConfig(Config.ADD));
+            return Boolean.parseBoolean(getConfigWithFallback(Config.ADD, "jkube.generator.add", "false"));
         }
         return true;
     }
@@ -233,7 +233,7 @@ protected void addLatestTagIfSnapshot(BuildConfiguration.BuildConfigurationBuild
     }
 
     protected void addTagsFromConfig(BuildConfiguration.BuildConfigurationBuilder buildConfigurationBuilder) {
-        String commaSeparatedTags = getConfig(Config.TAGS);
+        String commaSeparatedTags = getConfigWithFallback(Config.TAGS, "jkube.generator.tags", null);
         if (StringUtils.isNotBlank(commaSeparatedTags)) {
             List<String> tags = Arrays.stream(commaSeparatedTags.split(","))
                 .map(String::trim)

diff --git a/...enerator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java b/...enerator/api/src/test/java/org/eclipse/jkube/generator/api/support/BaseGeneratorTest.java
@@ -334,6 +334,41 @@ public void shouldNotAddDefaultImageInCaseOfSimpleDockerfile() throws IOExceptio
     assertFalse(generator.shouldAddGeneratedImageConfiguration(Collections.emptyList()));
   }
 
+  @Test
+  public void shouldAddGeneratedImageConfiguration_whenAddEnabledViaConfig_shouldReturnTrue() {
+    // Given
+    new Expectations() {{
+      ctx.getProject();
+      result = project;
+    }};
+    properties.put("jkube.generator.test-generator.add", "true");
+    BaseGenerator generator = createGenerator(null);
+
+    // When
+    boolean result = generator.shouldAddGeneratedImageConfiguration(createNewImageConfigurationList());
+
+    // Then
+    assertTrue(result);
+  }
+
+
+  @Test
+  public void shouldAddGeneratedImageConfiguration_whenAddEnabledViaProperty_shouldReturnTrue() {
+    // Given
+    new Expectations() {{
+      ctx.getProject();
+      result = project;
+    }};
+    properties.put("jkube.generator.add", "true");
+    BaseGenerator generator = createGenerator(null);
+
+    // When
+    boolean result = generator.shouldAddGeneratedImageConfiguration(createNewImageConfigurationList());
+
+    // Then
+    assertTrue(result);
+  }
+
   @Test
   public void addLatestTagIfSnapshot() {
     new Expectations() {
@@ -369,6 +404,22 @@ public void addTagsFromConfig() {
         .containsExactlyInAnyOrder("tag-1", "tag-2", "other-tag");
   }
 
+  @Test
+  public void addTagsFromProperty() {
+    new Expectations() {{
+      ctx.getProject();
+      result = project;
+    }};
+    BuildConfiguration.BuildConfigurationBuilder builder = BuildConfiguration.builder();
+    properties.put("jkube.generator.tags", " tag-1, tag-2 , other-tag");
+    BaseGenerator generator = createGenerator(null);
+    generator.addTagsFromConfig(builder);
+    BuildConfiguration config = builder.build();
+    assertThat(config.getTags())
+        .hasSize(3)
+        .containsExactlyInAnyOrder("tag-1", "tag-2", "other-tag");
+  }
+
   public void inKubernetes() {
     // @formatter:off
     new Expectations() {{
@@ -426,4 +477,11 @@ protected String getIstagFrom() {
       return "selectorIstagFromUpstream";
     }
   }
+
+  private List<ImageConfiguration> createNewImageConfigurationList() {
+    return Collections.singletonList(ImageConfiguration.builder()
+        .name("test:latest")
+        .build(BuildConfiguration.builder().from("foo:latest").build())
+        .build());
+  }
 }