Revert "Revert "Remove vaas""

2 files changed, 8 insertions, 12 deletions

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 585a8f84fb2..94e111455ac 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,7 +15,6 @@ 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 {
@@ -88,9 +87,6 @@ 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 4c11da3b697..d141ef6c73e 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 vaasEnforcer = new Enforcer(SystemName.vaas);
+    private static final Enforcer publicEnforcer = new Enforcer(SystemName.Public);
 
     @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(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")));
+        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")));
     }
 
     @Test
     public void build_service_membership() {
         Role role = Role.tenantPipeline(TenantName.from("t1"), ApplicationName.from("a1"));
-        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")));
+        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")));
     }
 
     @Test