Don't fail on main class inference if custom entrypoint (#3296)

GoogleContainerTools · Jun 10, 2021 · 6b06b3c · 6b06b3c
1 parent f91451a
commit 6b06b3c
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 3 deletions.
diff --git a/...src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java b/...src/main/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessor.java
@@ -632,9 +632,19 @@ static List<String> computeEntrypoint(
     }
 
     String classpathString = String.join(":", classpath);
-    String mainClass =
-        MainClassResolver.resolveMainClass(
-            rawConfiguration.getMainClass().orElse(null), projectProperties);
+    String mainClass;
+    try {
+      mainClass =
+          MainClassResolver.resolveMainClass(
+              rawConfiguration.getMainClass().orElse(null), projectProperties);
+    } catch (MainClassInferenceException ex) {
+      if (entrypointDefined) {
+        // We will use the user-given entrypoint, so don't fail.
+        mainClass = "could-not-infer-a-main-class";
+      } else {
+        throw ex;
+      }
+    }
     addJvmArgFilesLayer(
         rawConfiguration, projectProperties, jibContainerBuilder, classpathString, mainClass);
 

diff --git a/...test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java b/...test/java/com/google/cloud/tools/jib/plugins/common/PluginConfigurationProcessorTest.java
@@ -496,6 +496,54 @@ public void testClasspathArgumentFile()
     assertThat(jvmArgFiles)
         .comparingElementsUsing(EXTRACTION_PATH_OF)
         .containsExactly("/app/jib-classpath-file", "/app/jib-main-class-file");
+
+    String classpath =
+        new String(
+            Files.readAllBytes(appCacheDirectory.resolve("jib-classpath-file")),
+            StandardCharsets.UTF_8);
+    assertThat(classpath)
+        .isEqualTo("/foo:/app/resources:/app/classes:/app/libs/foo-1.jar:/app/libs/bar-2.jar");
+    String mainClass =
+        new String(
+            Files.readAllBytes(appCacheDirectory.resolve("jib-main-class-file")),
+            StandardCharsets.UTF_8);
+    assertThat(mainClass).isEqualTo("java.lang.Object");
+  }
+
+  @Test
+  public void testClasspathArgumentFile_mainClassInferenceFailureWithCustomEntrypoint()
+      throws NumberFormatException, InvalidImageReferenceException, MainClassInferenceException,
+          InvalidAppRootException, IOException, InvalidWorkingDirectoryException,
+          InvalidPlatformException, InvalidContainerVolumeException,
+          IncompatibleBaseImageJavaVersionException, InvalidContainerizingModeException,
+          InvalidFilesModificationTimeException, InvalidCreationTimeException {
+    when(rawConfiguration.getMainClass()).thenReturn(Optional.of("invalid main class"));
+    when(rawConfiguration.getEntrypoint()).thenReturn(Optional.of(Arrays.asList("bash")));
+
+    ContainerBuildPlan buildPlan = processCommonConfiguration();
+
+    assertThat(buildPlan.getEntrypoint()).containsExactly("bash");
+
+    List<FileEntry> jvmArgFiles = getLayerEntries(buildPlan, "jvm arg files");
+    assertThat(jvmArgFiles)
+        .comparingElementsUsing(SOURCE_FILE_OF)
+        .containsExactly(
+            appCacheDirectory.resolve("jib-classpath-file"),
+            appCacheDirectory.resolve("jib-main-class-file"));
+    assertThat(jvmArgFiles)
+        .comparingElementsUsing(EXTRACTION_PATH_OF)
+        .containsExactly("/app/jib-classpath-file", "/app/jib-main-class-file");
+
+    String classpath =
+        new String(
+            Files.readAllBytes(appCacheDirectory.resolve("jib-classpath-file")),
+            StandardCharsets.UTF_8);
+    assertThat(classpath).isEqualTo("/app/resources:/app/classes:/app/libs/*");
+    String mainClass =
+        new String(
+            Files.readAllBytes(appCacheDirectory.resolve("jib-main-class-file")),
+            StandardCharsets.UTF_8);
+    assertThat(mainClass).isEqualTo("could-not-infer-a-main-class");
   }
 
   @Test