From f8faae33716ee9ff2a523612f79c1036b22368c6 Mon Sep 17 00:00:00 2001 From: Romain Manni-Bucau Date: Thu, 29 Dec 2022 19:55:30 +0100 Subject: [PATCH 1/2] Fixes #3898, log an info instead of o warning when entrypoint makes the image to ignore jvm parameters --- .../jib/plugins/common/PluginConfigurationProcessor.java | 7 ++++++- .../plugins/common/PluginConfigurationProcessorTest.java | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java index f8b7abfc15..e49e4d93a1 100644 --- a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java +++ b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java @@ -595,8 +595,13 @@ static List computeEntrypoint( || !rawConfiguration.getJvmFlags().isEmpty() || !rawExtraClasspath.isEmpty() || rawConfiguration.getExpandClasspathDependencies())) { + // in a multi-module project it is not rare to configure a ton of jvmflags, sometimes + // classpath + // but having a submodule overriding entrypoint and ignoring all that is intended when such a + // config is done + // so just log it for user awareness but as an INFO, it is NOT an error projectProperties.log( - LogEvent.warn( + LogEvent.info( "mainClass, extraClasspath, jvmFlags, and expandClasspathDependencies are ignored " + "when entrypoint is specified")); } diff --git a/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java b/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java index 2bbebb6e17..7fd608667c 100644 --- a/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java +++ b/jib-plugins-common/src/test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java @@ -642,7 +642,7 @@ public void testEntrypoint_warningOnJvmFlags() assertThat(buildPlan.getEntrypoint()).containsExactly("custom", "entrypoint").inOrder(); verify(projectProperties) .log( - LogEvent.warn( + LogEvent.info( "mainClass, extraClasspath, jvmFlags, and expandClasspathDependencies are ignored " + "when entrypoint is specified")); } @@ -664,7 +664,7 @@ public void testEntrypoint_warningOnMainclass() assertThat(buildPlan.getEntrypoint()).containsExactly("custom", "entrypoint").inOrder(); verify(projectProperties) .log( - LogEvent.warn( + LogEvent.info( "mainClass, extraClasspath, jvmFlags, and expandClasspathDependencies are ignored " + "when entrypoint is specified")); } @@ -686,7 +686,7 @@ public void testEntrypoint_warningOnExpandClasspathDependencies() assertThat(buildPlan.getEntrypoint()).containsExactly("custom", "entrypoint").inOrder(); verify(projectProperties) .log( - LogEvent.warn( + LogEvent.info( "mainClass, extraClasspath, jvmFlags, and expandClasspathDependencies are ignored " + "when entrypoint is specified")); } From 6edf728acdd2ae1812f114ac5d2d3678f8f4eae0 Mon Sep 17 00:00:00 2001 From: Romain Manni-Bucau Date: Sun, 8 Jan 2023 17:20:08 +0100 Subject: [PATCH 2/2] review feedback, dropping comment on top of LogEvent.info --- .../jib/plugins/common/PluginConfigurationProcessor.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java index e49e4d93a1..21b314dc29 100644 --- a/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java +++ b/jib-plugins-common/src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java @@ -595,11 +595,6 @@ static List computeEntrypoint( || !rawConfiguration.getJvmFlags().isEmpty() || !rawExtraClasspath.isEmpty() || rawConfiguration.getExpandClasspathDependencies())) { - // in a multi-module project it is not rare to configure a ton of jvmflags, sometimes - // classpath - // but having a submodule overriding entrypoint and ignoring all that is intended when such a - // config is done - // so just log it for user awareness but as an INFO, it is NOT an error projectProperties.log( LogEvent.info( "mainClass, extraClasspath, jvmFlags, and expandClasspathDependencies are ignored "