fix (jkube-kit/generator) : Remove addLatestTagIfSnapshot method from…

… BaseGenerator Signed-off-by: Rohan Kumar <[email protected]>
eclipse-jkube · Jun 20, 2024 · 40f7880 · 40f7880
1 parent 7073d17
commit 40f7880
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 47 deletions.
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
@@ -234,12 +234,6 @@ protected boolean shouldAddGeneratedImageConfiguration(List<ImageConfiguration>
         return true;
     }
 
-    protected void addLatestTagIfSnapshot(BuildConfiguration.BuildConfigurationBuilder buildBuilder) {
-        if (getProject().getVersion().endsWith("-SNAPSHOT") && !getImageName().contains("%t")) {
-            buildBuilder.tags(Collections.singletonList("latest"));
-        }
-    }
-
     protected void addTagsFromConfig(BuildConfiguration.BuildConfigurationBuilder buildConfigurationBuilder) {
         String commaSeparatedTags = getConfigWithFallback(Config.TAGS, "jkube.generator.tags", null);
         if (StringUtils.isNotBlank(commaSeparatedTags)) {

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
@@ -35,7 +35,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.entry;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import static org.eclipse.jkube.generator.api.support.BaseGenerator.PROPERTY_JKUBE_GENERATOR_NAME;
 
 class BaseGeneratorTest {
 
@@ -355,39 +354,6 @@ void shouldAddGeneratedImageConfiguration_whenAddEnabledViaProperty_shouldReturn
     assertThat(result).isTrue();
   }
 
-  @Test
-  @DisplayName("add latest tag if project's version is SNAPSHOT")
-  void addLatestTagIfSnapshot() {
-    ctx = ctx.toBuilder().project(ctx.getProject().toBuilder().version("1.2-SNAPSHOT").build()).build();
-    BuildConfiguration.BuildConfigurationBuilder builder = BuildConfiguration.builder();
-    new TestBaseGenerator(ctx, "test-generator").addLatestTagIfSnapshot(builder);
-    BuildConfiguration config = builder.build();
-    List<String> tags = config.getTags();
-    assertThat(tags)
-        .singleElement()
-        .asString()
-        .endsWith("latest");
-  }
-
-  @Test
-  @DisplayName("omit latest tag if formatter contains '%t'")
-  void omitLatestTagIfTimestamped() {
-    properties.put(PROPERTY_JKUBE_GENERATOR_NAME, "%g/%a:%t");
-    ctx = ctx.toBuilder().project(
-            ctx.getProject().toBuilder()
-                    .version("1.2-SNAPSHOT")
-                    .properties(properties)
-                    .build())
-            .build();
-    BuildConfiguration.BuildConfigurationBuilder builder = BuildConfiguration.builder();
-
-    new TestBaseGenerator(ctx, "test-generator").addLatestTagIfSnapshot(builder);
-
-    BuildConfiguration buildConfiguration = builder.build();
-    List<String> tags = buildConfiguration.getTags();
-    assertThat(tags).isEmpty();
-  }
-
   @Test
   @DisplayName("add tags from config")
   void addTagsFromConfig() {

diff --git a/...rator/java-exec/src/main/java/org/eclipse/jkube/generator/javaexec/JavaExecGenerator.java b/...rator/java-exec/src/main/java/org/eclipse/jkube/generator/javaexec/JavaExecGenerator.java
@@ -155,7 +155,6 @@ protected BuildConfiguration.BuildConfigurationBuilder initImageBuildConfigurati
       addJolokiaPort(buildBuilder);
       addPrometheusPort(buildBuilder);
 
-      addLatestTagIfSnapshot(buildBuilder);
       addTagsFromConfig(buildBuilder);
       buildBuilder.workdir(getBuildWorkdir());
       buildBuilder.entryPoint(getBuildEntryPoint());

diff --git a/...test/java/org/eclipse/jkube/generator/javaexec/JavaExecGeneratorCustomPropertiesTest.java b/...test/java/org/eclipse/jkube/generator/javaexec/JavaExecGeneratorCustomPropertiesTest.java
@@ -60,7 +60,7 @@ void customizeWithOverriddenPropertiesShouldAddImageConfiguration() {
         .hasFieldOrPropertyWithValue("alias", "java-exec")
         .extracting(ImageConfiguration::getBuildConfiguration)
         .hasFieldOrPropertyWithValue("from", "custom-image")
-        .hasFieldOrPropertyWithValue("tags", Collections.singletonList("latest"))
+        .hasFieldOrPropertyWithValue("tags", Collections.emptyList())
         .hasFieldOrPropertyWithValue("env", new HashMap<String, String>(){{
           put("JAVA_APP_DIR", "/other-dir");
           put("JAVA_MAIN_CLASS", "com.example.Main");

diff --git a/...e-kit/generator/karaf/src/main/java/org/eclipse/jkube/generator/karaf/KarafGenerator.java b/...e-kit/generator/karaf/src/main/java/org/eclipse/jkube/generator/karaf/KarafGenerator.java
@@ -76,7 +76,6 @@ public List<ImageConfiguration> customize(List<ImageConfiguration> configs, bool
     if (!prePackagePhase) {
       buildBuilder.assembly(createDefaultAssembly());
     }
-    addLatestTagIfSnapshot(buildBuilder);
     addTagsFromConfig(buildBuilder);
     imageBuilder
         .name(getImageName())

diff --git a/...t/generator/karaf/src/test/java/org/eclipse/jkube/generator/karaf/KarafGeneratorTest.java b/...t/generator/karaf/src/test/java/org/eclipse/jkube/generator/karaf/KarafGeneratorTest.java
@@ -93,7 +93,7 @@ void customizeWithKarafMavenPluginShouldAddImageConfiguration() {
         .hasFieldOrPropertyWithValue("name", "%g/%a:%l")
         .hasFieldOrPropertyWithValue("alias", "karaf")
         .extracting(ImageConfiguration::getBuildConfiguration)
-        .hasFieldOrPropertyWithValue("tags", Collections.singletonList("latest"))
+        .hasFieldOrPropertyWithValue("tags", Collections.emptyList())
         .hasFieldOrPropertyWithValue("ports", Arrays.asList("8181", "8778"))
         .extracting(BuildConfiguration::getEnv)
         .asInstanceOf(InstanceOfAssertFactories.MAP)

diff --git a/...it/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java b/...it/generator/webapp/src/main/java/org/eclipse/jkube/generator/webapp/WebAppGenerator.java
@@ -129,7 +129,6 @@ public List<ImageConfiguration> customize(List<ImageConfiguration> configs, bool
     if (!prePackagePhase) {
       buildBuilder.assembly(createAssembly(handler));
     }
-    addLatestTagIfSnapshot(buildBuilder);
     addTagsFromConfig(buildBuilder);
     imageBuilder
         .name(getImageName())

diff --git a/...enerator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java b/...enerator/webapp/src/test/java/org/eclipse/jkube/generator/webapp/WebAppGeneratorTest.java
@@ -118,7 +118,7 @@ void withDefaultHandler_shouldAddImageConfiguration() throws IOException {
           .hasFieldOrPropertyWithValue("name", "%g/%a:%l")
           .hasFieldOrPropertyWithValue("alias", "webapp")
           .extracting(ImageConfiguration::getBuildConfiguration)
-          .hasFieldOrPropertyWithValue("tags", Collections.singletonList("latest"))
+          .hasFieldOrPropertyWithValue("tags", Collections.emptyList())
           .hasFieldOrPropertyWithValue("ports", Collections.singletonList("8080"))
           .hasFieldOrPropertyWithValue("env", new HashMap<String, String>() {{
               put("DEPLOY_DIR", "/deployments");
@@ -164,7 +164,7 @@ void withOverriddenProperties_shouldAddImageConfiguration() throws IOException {
           .hasFieldOrPropertyWithValue("name", "%a:%l")
           .hasFieldOrPropertyWithValue("alias", "webapp")
           .extracting(ImageConfiguration::getBuildConfiguration)
-          .hasFieldOrPropertyWithValue("tags", Collections.singletonList("latest"))
+          .hasFieldOrPropertyWithValue("tags", Collections.emptyList())
           .hasFieldOrPropertyWithValue("ports", Arrays.asList("8082", "80"))
           .hasFieldOrPropertyWithValue("env", Collections.singletonMap("DEPLOY_DIR", "/other-dir"))
           .hasFieldOrPropertyWithValue("cmd.shell", "sleep 3600")