Merge with master

5 files changed, 76 insertions, 16 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
index 03b3d586b73..20469e6449a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ConfigServer.java
@@ -25,13 +25,11 @@ import java.util.Set;
 public interface ConfigServer {
 
     interface PreparedApplication {
-        // TODO: Remove the two methods below
-        void activate();
-        List<Log> messages();
         PrepareResponse prepareResponse();
     }
 
-    PreparedApplication deploy(DeploymentId deployment, DeployOptions deployOptions, Set<String> rotationCnames, Set<String> rotationNames, byte[] content);
+    PreparedApplication deploy(DeploymentId deployment, DeployOptions deployOptions, Set<String> rotationNames,
+                               List<ContainerEndpoint> containerEndpoints, byte[] content);
 
     void restart(DeploymentId deployment, Optional<Hostname> hostname);
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java
new file mode 100644
index 00000000000..2134320bdc1
--- /dev/null
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/ContainerEndpoint.java
@@ -0,0 +1,59 @@
+// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.hosted.controller.api.integration.configserver;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * This represents a list of one or more names for a container cluster.
+ *
+ * @author mpolden
+ */
+public class ContainerEndpoint {
+
+    private final String clusterId;
+    private final List<String> names;
+
+    public ContainerEndpoint(String clusterId, List<String> names) {
+        this.clusterId = nonEmpty(clusterId, "message must be non-empty");
+        this.names = List.copyOf(Objects.requireNonNull(names, "names must be non-null"));
+    }
+
+    /** ID of the cluster to which this points */
+    public String clusterId() {
+        return clusterId;
+    }
+
+    /**
+     * All valid DNS names for this endpoint. This can contain both proper DNS names and synthetic identifiers used for
+     * routing, such as a Host header value that is not necessarily a proper DNS name.
+     */
+    public List<String> names() {
+        return names;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ContainerEndpoint that = (ContainerEndpoint) o;
+        return clusterId.equals(that.clusterId) &&
+               names.equals(that.names);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(clusterId, names);
+    }
+
+    @Override
+    public String toString() {
+        return "container endpoint for " + clusterId + " " + names;
+    }
+
+    private static String nonEmpty(String s, String message) {
+        if (s == null || s.isBlank()) throw new IllegalArgumentException(message);
+        return s;
+    }
+
+}
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/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
index 276e19da8f6..f5c82018ac6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/routing/RoutingGenerator.java
@@ -1,9 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.routing;
 
+import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 
+import java.net.URI;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author bratseth
@@ -16,4 +19,8 @@ public interface RoutingGenerator {
      * @return List of endpoints for that deploymentId
      */
     List<RoutingEndpoint> endpoints(DeploymentId deploymentId);
+
+    /** Returns the endpoints of each cluster in the given deployment — nothing global. */
+    Map<ClusterSpec.Id, URI> clusterEndpoints(DeploymentId deploymentId);
+
 }
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