Stricter application id pattern

2 files changed, 14 insertions, 8 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
index aa70bf4d26a..f77a6b8d182 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
@@ -16,14 +16,11 @@ import java.util.regex.Pattern;
  */
 public class ApplicationId implements Comparable<ApplicationId> {
 
-    // TODO: remove '.' and '*' from this pattern.
-    static final Pattern namePattern = Pattern.compile("(?!\\.\\.)[a-zA-Z0-9_.*-]{1,256}");
-
-    private static final ApplicationId global = new ApplicationId(TenantName.from("*"),
-                                                                  ApplicationName.from("*"),
-                                                                  InstanceName.from("*")) {
-        @Override public boolean equals(Object other) { return this == other; }
-    };
+    static final Pattern namePattern = Pattern.compile("(?!\\.\\.)[a-zA-Z0-9_-]{1,256}");
+
+    private static final ApplicationId global = new ApplicationId(TenantName.from("hosted-vespa"),
+                                                                  ApplicationName.from("routing"),
+                                                                  InstanceName.from("default")) { };
 
     private static final Comparator<ApplicationId> comparator = Comparator.comparing(ApplicationId::tenant)
                                                                           .thenComparing(ApplicationId::application)
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 2016490d292..622fc2527bf 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
@@ -10,7 +10,9 @@ import java.util.List;
 import java.util.Set;
 
 import static com.yahoo.config.provision.ApplicationId.from;
+import static com.yahoo.config.provision.ApplicationId.global;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 
 /**
  * @author Ulf Lilleengen
@@ -111,6 +113,13 @@ public class ApplicationIdTest {
         assertEquals("c", applicationId.instance().value());
     }
 
+    @Test
+    public void require_that_global_is_special() {
+        assertEquals(global(), global());
+        assertNotEquals(global(), from("hosted-vespa", "routing", "default"));
+        assertEquals(global().serializedForm(), from("hosted-vespa", "routing", "default").serializedForm());
+    }
+
     private ApplicationId applicationId(String applicationName) {
         return from(TenantName.defaultName(), ApplicationName.from(applicationName), InstanceName.defaultName());
     }