Merge pull request #33560 from geoand/#33552

Don't ignore invalid config in quarkus.container-image.name
quarkusio · May 23, 2023 · 3249613 · 3249613
2 parents 19c69ed + 3b4b4b7
commit 3249613
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/extensions/container-image/deployment/pom.xml b/extensions/container-image/deployment/pom.xml
@@ -42,8 +42,8 @@
             <artifactId>quarkus-container-image</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-internal</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/.../deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java b/.../deployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageConfig.java
@@ -24,7 +24,7 @@ public class ContainerImageConfig {
      */
     @ConfigItem(defaultValue = "${quarkus.application.name:unset}")
     @ConvertWith(TrimmedStringConverter.class)
-    public Optional<String> name;
+    public String name;
 
     /**
      * The tag of the container image. If not set defaults to the application version

diff --git a/...ployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageProcessor.java b/...ployment/src/main/java/io/quarkus/container/image/deployment/ContainerImageProcessor.java
@@ -89,8 +89,7 @@ public void publishImageInfo(ApplicationInfoBuildItem app,
         }
 
         String effectiveName = containerImageCustomName.map(ContainerImageCustomNameBuildItem::getName)
-                .or(() -> containerImageConfig.name)
-                .orElse(app.getName());
+                .orElse(containerImageConfig.name);
         String repository = (containerImageConfig.getEffectiveGroup().map(s -> s + "/").orElse("")) + effectiveName;
         if (!ImageReference.isValidRepository(repository)) {
             throw new IllegalArgumentException("The supplied combination of container-image group '"

diff --git a/...ployment/src/test/java/io/quarkus/container/image/deployment/InvalidConfigInNameTest.java b/...ployment/src/test/java/io/quarkus/container/image/deployment/InvalidConfigInNameTest.java
@@ -0,0 +1,25 @@
+package io.quarkus.container.image.deployment;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.NoSuchElementException;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class InvalidConfigInNameTest {
+
+    @RegisterExtension
+    static QuarkusUnitTest runner = new QuarkusUnitTest()
+            .setExpectedException(NoSuchElementException.class)
+            .withEmptyApplication()
+            .overrideConfigKey("quarkus.container-image.build", "true")
+            .overrideConfigKey("quarkus.container-image.name", "test-${foo.bar}");
+
+    @Test
+    void shouldThrow() {
+        fail("Should not be run");
+    }
+}