Revert "Remove vaas"

7 files changed, 25 insertions, 13 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 18f4d317019..aa9b196c0e4 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -790,7 +790,8 @@
       "public static final enum com.yahoo.config.provision.SystemName main",
       "public static final enum com.yahoo.config.provision.SystemName Public",
       "public static final enum com.yahoo.config.provision.SystemName PublicCd",
-      "public static final enum com.yahoo.config.provision.SystemName dev"
+      "public static final enum com.yahoo.config.provision.SystemName dev",
+      "public static final enum com.yahoo.config.provision.SystemName vaas"
     ]
   },
   "com.yahoo.config.provision.TenantName": {
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
index 45962fc596a..ba462b9eb64 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
@@ -27,7 +27,10 @@ public enum SystemName {
     PublicCd(true, true),
 
     /** Local development system */
-    dev(false, false); // TODO: Remove this and use public everywhere
+    dev(false, false),
+
+    /** VaaS */
+    vaas(true, true); // TODO: Remove this and use public everywhere
 
     private final boolean isPublic;
     private final boolean isCd;
@@ -48,6 +51,7 @@ public enum SystemName {
             case "main": return main;
             case "public": return Public;
             case "publiccd": return PublicCd;
+            case "vaas": return vaas;
             default: throw new IllegalArgumentException(String.format("'%s' is not a valid system", value));
         }
     }
@@ -59,6 +63,7 @@ public enum SystemName {
             case main: return "main";
             case Public: return "public";
             case PublicCd: return "publiccd";
+            case vaas: return "vaas";
             default : throw new IllegalStateException();
         }
     }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
index f50005edd52..eb066958254 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
@@ -20,7 +20,7 @@ public class SystemNameTest {
 
     @Test
     public void allOf() {
-        assertEquals(Set.of(SystemName.cd, SystemName.PublicCd), SystemName.allOf(SystemName::isCd));
-        assertEquals(Set.of(SystemName.PublicCd, SystemName.Public), SystemName.allOf(SystemName::isPublic));
+        assertEquals(Set.of(SystemName.cd, SystemName.PublicCd, SystemName.vaas), SystemName.allOf(SystemName::isCd));
+        assertEquals(Set.of(SystemName.PublicCd, SystemName.Public, SystemName.vaas), SystemName.allOf(SystemName::isPublic));
     }
 }
\ No newline at end of file
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
index 94e111455ac..585a8f84fb2 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
@@ -15,6 +15,7 @@ import java.util.stream.Stream;
 import static com.yahoo.config.provision.SystemName.PublicCd;
 import static com.yahoo.config.provision.SystemName.cd;
 import static com.yahoo.config.provision.SystemName.main;
+import static com.yahoo.config.provision.SystemName.vaas;
 
 /** Job types that exist in the build system */
 public enum JobType {
@@ -87,6 +88,9 @@ public enum JobType {
     devCdUsCentral1        ("dev-cd-us-central-1",
                             Map.of(cd  , ZoneId.from("dev"    , "cd-us-central-1"))),
 
+    devAwsUsEast1b         ("dev-aws-us-east-1b",
+                            Map.of(vaas, ZoneId.from("dev"    , "vaas-aws-us-east-1b"))),
+
     devAwsUsEast1c         ("dev-aws-us-east-1c",
                             Map.of(PublicCd, ZoneId.from("dev", "aws-us-east-1c"))),
 
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java
index d141ef6c73e..4c11da3b697 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/role/RoleTest.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue;
 public class RoleTest {
 
     private static final Enforcer mainEnforcer = new Enforcer(SystemName.main);
-    private static final Enforcer publicEnforcer = new Enforcer(SystemName.Public);
+    private static final Enforcer vaasEnforcer = new Enforcer(SystemName.vaas);
 
     @Test
     public void operator_membership() {
@@ -40,18 +40,18 @@ public class RoleTest {
         assertTrue(mainEnforcer.allows(role, Action.update, URI.create("/application/v4/tenant/t1/application/a1")));
 
         Role publicSystem = Role.athenzTenantAdmin(TenantName.from("t1"));
-        assertFalse(publicEnforcer.allows(publicSystem, Action.read, URI.create("/controller/v1/foo")));
-        assertTrue(publicEnforcer.allows(publicSystem, Action.read, URI.create("/badge/v1/badge")));
-        assertTrue(publicEnforcer.allows(publicSystem, Action.update, URI.create("/application/v4/tenant/t1/application/a1")));
+        assertFalse(vaasEnforcer.allows(publicSystem, Action.read, URI.create("/controller/v1/foo")));
+        assertTrue(vaasEnforcer.allows(publicSystem, Action.read, URI.create("/badge/v1/badge")));
+        assertTrue(vaasEnforcer.allows(publicSystem, Action.update, URI.create("/application/v4/tenant/t1/application/a1")));
     }
 
     @Test
     public void build_service_membership() {
         Role role = Role.tenantPipeline(TenantName.from("t1"), ApplicationName.from("a1"));
-        assertFalse(publicEnforcer.allows(role, Action.create, URI.create("/not/explicitly/defined")));
-        assertFalse(publicEnforcer.allows(role, Action.update, URI.create("/application/v4/tenant/t1/application/a1")));
-        assertTrue(publicEnforcer.allows(role, Action.create, URI.create("/application/v4/tenant/t1/application/a1/jobreport")));
-        assertFalse("No global read access", publicEnforcer.allows(role, Action.read, URI.create("/controller/v1/foo")));
+        assertFalse(vaasEnforcer.allows(role, Action.create, URI.create("/not/explicitly/defined")));
+        assertFalse(vaasEnforcer.allows(role, Action.update, URI.create("/application/v4/tenant/t1/application/a1")));
+        assertTrue(vaasEnforcer.allows(role, Action.create, URI.create("/application/v4/tenant/t1/application/a1/jobreport")));
+        assertFalse("No global read access", vaasEnforcer.allows(role, Action.read, URI.create("/controller/v1/foo")));
     }
 
     @Test
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
index 5026ca75a83..6c9b8dd0784 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Endpoint.java
@@ -152,6 +152,7 @@ public class Endpoint {
                 if (legacy) return YAHOO_DNS_SUFFIX;
                 return OATH_DNS_SUFFIX;
             case Public:
+            case vaas:
                 return PUBLIC_DNS_SUFFIX;
             case PublicCd:
                 return PUBLIC_CD_DNS_SUFFIX;
diff --git a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
index d59eb166e2b..421d946c5db 100644
--- a/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
+++ b/hosted-api/src/main/java/ai/vespa/hosted/api/ControllerHttpClient.java
@@ -201,8 +201,9 @@ public abstract class ControllerHttpClient {
                             + URLEncoder.encode(name, UTF_8) + "=" + URLEncoder.encode(value, UTF_8));
     }
 
+    // TODO jvenstad: remove when vaas is no longer part of region names.
     private static String jobNameOf(ZoneId zone) {
-        return zone.environment().value() + "-" + zone.region().value();
+        return zone.environment().value() + "-" + zone.region().value().replaceAll("vaas-", "");
     }
 
     private HttpResponse<byte[]> send(HttpRequest request) {