Revert "Merge pull request #10923 from vespa-engine/revert-10912-bratseth/instances-in-deployment-xml-rebased-take-2"

This reverts commit 72ae113d501035bc51a25045d3d916aa7bb5507a, reversing
changes made to 0514a2a133a194f5e9454fcc60e56d01730f9019.

3 files changed, 44 insertions, 19 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 37746ad4d35..dad4b80de68 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -72,7 +72,6 @@ public class ControllerTest {
     @Test
     public void testDeployment() {
         // Setup system
-        ApplicationController applications = tester.controller().applications();
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
                 .environment(Environment.prod)
                 .region("us-west-1")
@@ -753,7 +752,7 @@ public class ControllerTest {
             tester.deployCompletely(application, applicationPackage);
             fail("Expected exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Endpoint 'default' cannot contain regions in different clouds: [aws-us-east-1, us-west-1]", e.getMessage());
+            assertEquals("Endpoint 'default' in instance 'default' cannot contain regions in different clouds: [aws-us-east-1, us-west-1]", e.getMessage());
         }
 
         var applicationPackage2 = new ApplicationPackageBuilder()
@@ -766,7 +765,7 @@ public class ControllerTest {
             tester.deployCompletely(application, applicationPackage2);
             fail("Expected exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Endpoint 'foo' cannot contain regions in different clouds: [aws-us-east-1, us-west-1]", e.getMessage());
+            assertEquals("Endpoint 'foo' in instance 'default' cannot contain regions in different clouds: [aws-us-east-1, us-west-1]", e.getMessage());
         }
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index 25e562ed046..9449f2b0854 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -47,6 +47,7 @@ public class ApplicationPackageBuilder {
     private final List<X509Certificate> trustedCertificates = new ArrayList<>();
 
     private OptionalInt majorVersion = OptionalInt.empty();
+    private String instances = "default";
     private String upgradePolicy = null;
     private Environment environment = Environment.prod;
     private String globalServiceId = null;
@@ -58,6 +59,11 @@ public class ApplicationPackageBuilder {
         return this;
     }
 
+    public ApplicationPackageBuilder instances(String instances) {
+        this.instances = instances;
+        return this;
+    }
+
     public ApplicationPackageBuilder upgradePolicy(String upgradePolicy) {
         this.upgradePolicy = upgradePolicy;
         return this;
@@ -90,7 +96,7 @@ public class ApplicationPackageBuilder {
     }
 
     public ApplicationPackageBuilder region(String regionName) {
-        environmentBody.append("    <region active='true'>");
+        environmentBody.append("      <region active='true'>");
         environmentBody.append(regionName);
         environmentBody.append("</region>\n");
         return this;
@@ -112,7 +118,7 @@ public class ApplicationPackageBuilder {
 
     public ApplicationPackageBuilder blockChange(boolean revision, boolean version, String daySpec, String hourSpec,
                                                  String zoneSpec) {
-        blockChange.append("  <block-change");
+        blockChange.append("    <block-change");
         blockChange.append(" revision='").append(revision).append("'");
         blockChange.append(" version='").append(version).append("'");
         blockChange.append(" days='").append(daySpec).append("'");
@@ -166,14 +172,15 @@ public class ApplicationPackageBuilder {
             xml.append(athenzIdentityAttributes);
         }
         xml.append(">\n");
+        xml.append("  <instance id='").append(instances).append("'>\n");
         if (upgradePolicy != null) {
-            xml.append("<upgrade policy='");
+            xml.append("    <upgrade policy='");
             xml.append(upgradePolicy);
             xml.append("'/>\n");
         }
         xml.append(notifications);
         xml.append(blockChange);
-        xml.append("  <");
+        xml.append("    <");
         xml.append(environment.value());
         if (globalServiceId != null) {
             xml.append(" global-service-id='");
@@ -182,13 +189,14 @@ public class ApplicationPackageBuilder {
         }
         xml.append(">\n");
         xml.append(environmentBody);
-        xml.append("  </");
+        xml.append("    </");
         xml.append(environment.value());
         xml.append(">\n");
-        xml.append("  <endpoints>\n");
+        xml.append("    <endpoints>\n");
         xml.append(endpointsBody);
-        xml.append("  </endpoints>\n");
-        xml.append("</deployment>");
+        xml.append("    </endpoints>\n");
+        xml.append("  </instance>\n");
+        xml.append("</deployment>\n");
         return xml.toString().getBytes(UTF_8);
     }
     
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index f56b1c4ae9b..629c7cc4cdd 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -113,7 +113,18 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                                "-----END PUBLIC KEY-----\n";
     private static final String quotedPemPublicKey = pemPublicKey.replaceAll("\\n", "\\\\n");
 
-    private static final ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+    private static final ApplicationPackage applicationPackageDefault = new ApplicationPackageBuilder()
+            .instances("default")
+            .environment(Environment.prod)
+            .globalServiceId("foo")
+            .region("us-central-1")
+            .region("us-east-3")
+            .region("us-west-1")
+            .blockChange(false, true, "mon-fri", "0-8", "UTC")
+            .build();
+
+    private static final ApplicationPackage applicationPackageInstance1 = new ApplicationPackageBuilder()
+            .instances("instance1")
             .environment(Environment.prod)
             .globalServiceId("foo")
             .region("us-central-1")
@@ -228,7 +239,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         addUserToHostedOperatorRole(HostedAthenzIdentities.from(HOSTED_VESPA_OPERATOR));
 
         // POST (deploy) an application to a zone - manual user deployment (includes a content hash for verification)
-        MultiPartStreamer entity = createApplicationDeployData(applicationPackage, true);
+        MultiPartStreamer entity = createApplicationDeployData(applicationPackageInstance1, true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/instance1/deploy", POST)
                                       .data(entity)
                                       .header("X-Content-Hash", Base64.getEncoder().encodeToString(Signatures.sha256Digest(entity::data)))
@@ -248,7 +259,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         controllerTester.jobCompletion(JobType.component)
                         .application(id)
                         .projectId(screwdriverProjectId)
-                        .uploadArtifact(applicationPackage)
+                        .uploadArtifact(applicationPackageInstance1)
                         .submit();
 
         // ... systemtest
@@ -312,6 +323,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // POST (create) another application
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .environment(Environment.prod)
                 .region("us-west-1")
                 .build();
@@ -588,6 +600,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // Second attempt has a service under a different domain than the tenant of the application, and fails.
         ApplicationPackage packageWithServiceForWrongDomain = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .environment(Environment.prod)
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from(ATHENZ_TENANT_DOMAIN_2.getName()), AthenzService.from("service"))
                 .region("us-west-1")
@@ -600,6 +613,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // Third attempt finally has a service under the domain of the tenant, and succeeds.
         ApplicationPackage packageWithService = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .environment(Environment.prod)
                 .athenzIdentity(com.yahoo.config.provision.AthenzDomain.from(ATHENZ_TENANT_DOMAIN.getName()), AthenzService.from("service"))
                 .region("us-west-1")
@@ -713,6 +727,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         tester.computeVersionStatus();
         createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID);
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .globalServiceId("foo")
                 .region("us-west-1")
                 .region("us-east-3")
@@ -721,7 +736,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         // Create tenant and deploy
         ApplicationId id = createTenantAndApplication();
         long projectId = 1;
-        MultiPartStreamer deployData = createApplicationDeployData(Optional.empty(), false);
+        MultiPartStreamer deployData = createApplicationDeployData(Optional.of(applicationPackage), false);
         startAndTestChange(controllerTester, id, projectId, applicationPackage, deployData, 100);
 
         // us-west-1
@@ -784,6 +799,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         tester.computeVersionStatus();
         createAthenzDomainWithAdmin(ATHENZ_TENANT_DOMAIN, USER_ID);
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .region("us-west-1")
                 .region("us-east-3")
                 .region("eu-west-1")
@@ -860,7 +876,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                        new com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId("application1"));
 
         // POST (deploy) an application to a prod zone - allowed when project ID is not specified
-        MultiPartStreamer entity = createApplicationDeployData(applicationPackage, true);
+        MultiPartStreamer entity = createApplicationDeployData(applicationPackageInstance1, true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-central-1/instance/instance1/deploy", POST)
                                       .data(entity)
                                       .screwdriverIdentity(SCREWDRIVER_ID),
@@ -892,6 +908,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // Deploy
         ApplicationPackage applicationPackage = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .region("us-east-3")
                 .build();
         ApplicationId id = createTenantAndApplication();
@@ -911,6 +928,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
 
         // New zone is added before us-east-3
         applicationPackage = new ApplicationPackageBuilder()
+                .instances("instance1")
                 .globalServiceId("foo")
                 // These decides the ordering of deploymentJobs and instances in the response
                 .region("us-west-1")
@@ -1063,7 +1081,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         configServer.throwOnNextPrepare(new ConfigServerException(new URI("server-url"), "Failed to prepare application", ConfigServerException.ErrorCode.INVALID_APPLICATION_PACKAGE, null));
         
         // POST (deploy) an application with an invalid application package
-        MultiPartStreamer entity = createApplicationDeployData(applicationPackage, true);
+        MultiPartStreamer entity = createApplicationDeployData(applicationPackageInstance1, true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/dev/region/us-west-1/instance/instance1/deploy", POST)
                                       .data(entity)
                                       .userIdentity(USER_ID),
@@ -1194,7 +1212,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
                               200);
 
         // Deploy to an authorized zone by a user tenant is disallowed
-        MultiPartStreamer entity = createApplicationDeployData(applicationPackage, true);
+        MultiPartStreamer entity = createApplicationDeployData(applicationPackageDefault, true);
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/environment/prod/region/us-west-1/instance/default/deploy", POST)
                                       .data(entity)
                                       .userIdentity(USER_ID),
@@ -1607,7 +1625,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
     }
 
     private MultiPartStreamer createApplicationDeployData(Optional<ApplicationPackage> applicationPackage,
-                                                   Optional<ApplicationVersion> applicationVersion, boolean deployDirectly) {
+                                                          Optional<ApplicationVersion> applicationVersion, boolean deployDirectly) {
         MultiPartStreamer streamer = new MultiPartStreamer();
         streamer.addJson("deployOptions", deployOptions(deployDirectly, applicationVersion));
         applicationPackage.ifPresent(ap -> streamer.addBytes("applicationZip", ap.zippedContent()));