Merge pull request #27436 from vespa-engine/hmusum/stricter-validation-of-application-id-string

Stricter validation when creating ApplicationId from a string

1 files changed, 14 insertions, 4 deletions

diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
index 0a60b868bde..72f2a64a599 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ApplicationIdTest.java
@@ -18,7 +18,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 /**
  * @author Ulf Lilleengen
  * @author vegard
- * @since 5.1
  */
 public class ApplicationIdTest {
 
@@ -81,9 +80,20 @@ public class ApplicationIdTest {
 
     @Test
     void require_that_invalid_idstring_throws_exception() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            ApplicationId.fromSerializedForm("foo:baz");
-        });
+        var e = assertThrows(IllegalArgumentException.class, () -> ApplicationId.fromSerializedForm("foo:baz"));
+        assertEquals("Application ids must be on the form tenant:application:instance, but was foo:baz", e.getMessage());
+
+        e = assertThrows(IllegalArgumentException.class, () -> ApplicationId.fromFullString("foo.baz"));
+        assertEquals("Application ids must be on the form tenant.application.instance, but was foo.baz", e.getMessage());
+
+        // TODO: Add when we throw exception on strings with too many parts
+        /*
+        e = assertThrows(IllegalArgumentException.class, () -> ApplicationId.fromSerializedForm("foo:baz:bar:xyzzy"));
+        assertEquals("Application ids must be on the form tenant:application:instance, but was foo:baz:bar:xyzzy", e.getMessage());
+
+        e = assertThrows(IllegalArgumentException.class, () -> ApplicationId.fromFullString("foo.baz.bar.xyzzy"));
+        assertEquals("Application ids must be on the form tenant.application.instance, but was foo.baz.bar.xyzzy", e.getMessage());
+         */
     }
 
     @Test