Test against public system

6 files changed, 71 insertions, 19 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDbTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDbTest.java
index 19b56c2d39e..ab669d6fe14 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDbTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/archive/CuratorArchiveBucketDbTest.java
@@ -5,7 +5,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket;
-import com.yahoo.vespa.hosted.controller.integration.ZoneRegistryMock;
 import org.apache.curator.shaded.com.google.common.collect.Streams;
 import org.junit.Test;
 
@@ -22,8 +21,7 @@ public class CuratorArchiveBucketDbTest {
 
     @Test
     public void archiveUriFor() {
-        ControllerTester tester = new ControllerTester();
-        ((ZoneRegistryMock) tester.controller().zoneRegistry()).setSystemName(SystemName.Public);
+        ControllerTester tester = new ControllerTester(SystemName.Public);
         CuratorArchiveBucketDb bucketDb = new CuratorArchiveBucketDb(tester.controller());
 
         tester.curator().writeArchiveBuckets(ZoneId.defaultId(),
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
index 73e9362eaf8..b17e35089ed 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveAccessMaintainerTest.java
@@ -1,17 +1,14 @@
 // Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.jdisc.test.MockMetric;
-import com.yahoo.vespa.flags.Flags;
-import com.yahoo.vespa.flags.InMemoryFlagSource;
-import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.MockArchiveService;
-import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerCloudTest;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import org.junit.Test;
@@ -31,24 +28,21 @@ public class ArchiveAccessMaintainerTest extends ControllerContainerCloudTest {
 
     @Test
     public void grantsRoleAccess() {
-        var containerTester = new ContainerTester(container, "");
-        ((InMemoryFlagSource) containerTester.controller().flagSource())
-                .withBooleanFlag(PermanentFlags.ENABLE_PUBLIC_SIGNUP_FLOW.id(), true);
-        var tester = new ControllerTester(containerTester);
+        var tester = new ControllerTester(SystemName.Public);
 
         String tenant1role = "arn:aws:iam::123456789012:role/my-role";
         String tenant2role = "arn:aws:iam::210987654321:role/my-role";
         var tenant1 = createTenantWithAccessRole(tester, "tenant1", tenant1role);
         createTenantWithAccessRole(tester, "tenant2", tenant2role);
 
-        ZoneId testZone = ZoneId.from("prod.us-east-3");
+        ZoneId testZone = ZoneId.from("prod.aws-us-east-1c");
         tester.controller().archiveBucketDb().archiveUriFor(testZone, tenant1);
         var testBucket = new ArchiveBucket("bucketName", "keyArn").withTenant(tenant1);
 
         MockArchiveService archiveService = (MockArchiveService) tester.controller().serviceRegistry().archiveService();
         assertNull(archiveService.authorizedIamRoles.get(testBucket));
         MockMetric metric = new MockMetric();
-        new ArchiveAccessMaintainer(containerTester.controller(), metric, Duration.ofMinutes(10)).maintain();
+        new ArchiveAccessMaintainer(tester.controller(), metric, Duration.ofMinutes(10)).maintain();
         assertEquals(Map.of(tenant1, tenant1role), archiveService.authorizedIamRoles.get(testBucket));
 
         var expected = Map.of("archive.bucketCount",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
index 2bcedf6b659..d7934f08fee 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
@@ -5,6 +5,7 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
+import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
@@ -27,7 +28,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class ArchiveUriUpdaterTest {
 
-    private final DeploymentTester tester = new DeploymentTester();
+    private final DeploymentTester tester = new DeploymentTester(new ControllerTester(SystemName.Public));
 
     @Test
     public void archive_uri_test() {
@@ -37,7 +38,7 @@ public class ArchiveUriUpdaterTest {
         var tenant2 = TenantName.from("tenant2");
         var tenantInfra = SystemApplication.TENANT;
         var application = tester.newDeploymentContext(tenant1.value(), "app1", "instance1");
-        ZoneId zone = ZoneId.from("prod", "ap-northeast-1");
+        ZoneId zone = ZoneId.from("prod", "aws-us-east-1c");
 
         // Initially we should not set any archive URIs as the archive service does not return any
         updater.maintain();
@@ -79,6 +80,6 @@ public class ArchiveUriUpdaterTest {
     }
 
     private void deploy(DeploymentContext application, ZoneId zone) {
-        application.runJob(JobType.from(SystemName.main, zone).orElseThrow(), new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(JobType.from(SystemName.Public, zone).orElseThrow(), new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
     }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 7074d0d7354..5f76a30bf45 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -3,9 +3,11 @@ package com.yahoo.vespa.hosted.controller.restapi.application;
 
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
+import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
+import com.yahoo.vespa.hosted.controller.ControllerTester;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanId;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
@@ -13,6 +15,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretSto
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
+import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerCloudTest;
 import com.yahoo.vespa.hosted.controller.security.Auth0Credentials;
@@ -23,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import javax.ws.rs.ForbiddenException;
+import java.io.File;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
@@ -198,6 +202,11 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
 
     @Test
     public void archive_uri_test() {
+        new DeploymentTester(new ControllerTester(tester))
+                .newDeploymentContext(ApplicationId.from(tenantName, applicationName, InstanceName.defaultName()))
+                .submit()
+                .deploy();
+
         tester.assertResponse(request("/application/v4/tenant/scoober", GET).roles(Role.reader(tenantName)),
                 (response) -> assertFalse(response.getBodyAsString().contains("archiveAccessRole")),
                 200);
@@ -212,6 +221,10 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
                 (response) -> assertTrue(response.getBodyAsString().contains("\"archiveAccessRole\":\"arn:aws:iam::123456789012:role/my-role\"")),
                 200);
 
+        tester.assertResponse(request("/application/v4/tenant/scoober/application/albums/environment/prod/region/aws-us-east-1c/instance/default", GET)
+                        .roles(Role.reader(tenantName)),
+                new File("deployment-cloud.json"));
+
         tester.assertResponse(request("/application/v4/tenant/scoober/archive-access", DELETE).roles(Role.administrator(tenantName)),
                 "{\"message\":\"Archive access role removed for tenant scoober.\"}", 200);
         tester.assertResponse(request("/application/v4/tenant/scoober", GET).roles(Role.reader(tenantName)),
@@ -222,7 +235,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
     private ApplicationPackageBuilder prodBuilder() {
         return new ApplicationPackageBuilder()
                 .instances("default")
-                .region("aws-us-east-1a");
+                .region("aws-us-east-1c");
     }
 
     private void setupTenantAndApplication() {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json
new file mode 100644
index 00000000000..acb3a48f612
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-cloud.json
@@ -0,0 +1,47 @@
+{
+  "tenant": "scoober",
+  "application": "albums",
+  "instance": "default",
+  "environment": "prod",
+  "region": "aws-us-east-1c",
+  "endpoints": [
+    {
+      "cluster": "default",
+      "tls": true,
+      "url": "https://albums.scoober.aws-us-east-1c.public.vespa.oath.cloud/",
+      "scope": "zone",
+      "routingMethod": "exclusive"
+    }
+  ],
+  "clusters": "http://localhost:8080/application/v4/tenant/scoober/application/albums/instance/default/environment/prod/region/aws-us-east-1c/clusters",
+  "nodes": "http://localhost:8080/zone/v2/prod/aws-us-east-1c/nodes/v2/node/?recursive=true&application=scoober.albums.default",
+  "yamasUrl": "http://monitoring-system.test/?environment=prod&region=aws-us-east-1c&application=scoober.albums",
+  "version": "7.164.0",
+  "revision": "1.0.1-commit1",
+  "deployTimeEpochMs": "(ignore)",
+  "screwdriverId": "1000",
+  "gitRepository": "repository1",
+  "gitBranch": "master",
+  "gitCommit": "commit1",
+  "applicationVersion": {
+    "hash": "1.0.1-commit1",
+    "build": 1,
+    "source": {
+      "gitRepository": "repository1",
+      "gitBranch": "master",
+      "gitCommit": "commit1"
+    },
+    "sourceUrl": "repository1/tree/commit1",
+    "commit": "commit1"
+  },
+  "status": "complete",
+  "archiveUri": "s3://bucketName/scoober/",
+  "activity": {},
+  "metrics": {
+    "queriesPerSecond": 0.0,
+    "writesPerSecond": 0.0,
+    "documentCount": 0.0,
+    "queryLatencyMillis": 0.0,
+    "writeLatencyMillis": 0.0
+  }
+}
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index d03dec06753..bfb749eb681 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -32,7 +32,6 @@ import com.yahoo.vespa.hosted.controller.application.SystemApplication;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentContext;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
-import com.yahoo.vespa.hosted.controller.integration.ServiceRegistryMock;
 import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
 import com.yahoo.vespa.hosted.controller.maintenance.NameServiceDispatcher;
 import com.yahoo.vespa.hosted.rotation.config.RotationsConfig;
@@ -721,7 +720,7 @@ public class RoutingPoliciesTest {
         }
 
         public RoutingPoliciesTester(SystemName system) {
-            this(new DeploymentTester(new ControllerTester(new ServiceRegistryMock(system))), true);
+            this(new DeploymentTester(new ControllerTester(system)), true);
         }
 
         public RoutingPolicies routingPolicies() {