Update CloudAccount serialization

2 files changed, 13 insertions, 16 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 693a74f8651..8e3ccca0dd1 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
@@ -56,6 +56,7 @@ import com.yahoo.vespa.hosted.controller.routing.rotation.RotationLock;
 import com.yahoo.vespa.hosted.controller.versions.VespaVersion.Confidence;
 import com.yahoo.vespa.hosted.rotation.config.RotationsConfig;
 import org.junit.jupiter.api.Test;
+
 import java.io.InputStream;
 import java.time.Duration;
 import java.time.Instant;
@@ -1467,29 +1468,29 @@ public class ControllerTest {
         DeploymentContext context = tester.newDeploymentContext();
         ZoneId devZone = devUsEast1.zone();
         ZoneId prodZone = productionUsWest1.zone();
-        String cloudAccount = "012345678912";
+        String cloudAccount = "aws:012345678912";
         var applicationPackage = new ApplicationPackageBuilder()
                 .cloudAccount(cloudAccount)
                 .region(prodZone.region())
                 .build();
 
         // Submission fails because cloud account is not declared for this tenant
-        assertEquals("cloud accounts [012345678912] are not valid for tenant tenant",
+        assertEquals("cloud accounts [aws:012345678912] are not valid for tenant tenant",
                      assertThrows(IllegalArgumentException.class,
                                   () -> context.submit(applicationPackage))
                              .getMessage());
-        assertEquals("cloud accounts [012345678912] are not valid for tenant tenant",
+        assertEquals("cloud accounts [aws:012345678912] are not valid for tenant tenant",
                      assertThrows(IllegalArgumentException.class,
                                   () -> context.runJob(devUsEast1, applicationPackage))
                              .getMessage());
 
         // Deployment fails because zone is not configured in requested cloud account
         tester.controllerTester().flagSource().withListFlag(PermanentFlags.CLOUD_ACCOUNTS.id(), List.of(cloudAccount), String.class);
-        assertEquals("Zone test.us-east-1 is not configured in requested cloud account '012345678912'",
+        assertEquals("Zone test.us-east-1 is not configured in requested cloud account 'aws:012345678912'",
                      assertThrows(IllegalArgumentException.class,
                                   () -> context.submit(applicationPackage))
                              .getMessage());
-        assertEquals("Zone dev.us-east-1 is not configured in requested cloud account '012345678912'",
+        assertEquals("Zone dev.us-east-1 is not configured in requested cloud account 'aws:012345678912'",
                      assertThrows(IllegalArgumentException.class,
                                   () -> context.runJob(devUsEast1, applicationPackage))
                              .getMessage());
@@ -1518,7 +1519,7 @@ public class ControllerTest {
         var context = tester.newDeploymentContext();
         var prodZone1 = productionUsEast3.zone();
         var prodZone2 = productionUsWest1.zone();
-        var cloudAccount = "012345678912";
+        var cloudAccount = "aws:012345678912";
         var application = new ApplicationPackageBuilder()
                 .cloudAccount(cloudAccount)
                 .region(prodZone1.region())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
index 2bfd081914b..ccce8c2f4b9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/TestPackageTest.java
@@ -21,9 +21,6 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.Function;
-import java.util.function.UnaryOperator;
 import java.util.jar.JarOutputStream;
 import java.util.zip.ZipEntry;
 
@@ -35,7 +32,6 @@ import static com.yahoo.vespa.hosted.controller.application.pkg.ApplicationPacka
 import static com.yahoo.vespa.hosted.controller.application.pkg.TestPackage.validateTests;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author jonmv
@@ -156,7 +152,7 @@ public class TestPackageTest {
         DeploymentSpec spec = DeploymentSpec.fromXml("""
                                                      <deployment version='1.0' athenz-domain='domain' athenz-service='service' cloud-account='123123123123' empty-host-ttl='1h'>
                                                          <test empty-host-ttl='1d' />
-                                                         <staging cloud-account='321321321321'/>
+                                                         <staging cloud-account='aws:321321321321'/>
                                                          <prod>
                                                              <region>us-east-3</region>
                                                              <test>us-east-3</test>
@@ -167,11 +163,11 @@ public class TestPackageTest {
                                                          </prod>
                                                      </deployment>
                                                      """);
-        verifyAttributes("123123123123", 1440, ZoneId.from("test", "us-east-1"), spec);
-        verifyAttributes("321321321321", 60, ZoneId.from("staging", "us-east-2"), spec);
-        verifyAttributes("123123123123", 60, ZoneId.from("prod", "us-east-3"), spec);
-        verifyAttributes("123123123123", 0, ZoneId.from("prod", "us-west-1"), spec);
-        verifyAttributes("123123123123", 60, ZoneId.from("prod", "us-central-1"), spec);
+        verifyAttributes("aws:123123123123", 1440, ZoneId.from("test", "us-east-1"), spec);
+        verifyAttributes("aws:321321321321", 60, ZoneId.from("staging", "us-east-2"), spec);
+        verifyAttributes("aws:123123123123", 60, ZoneId.from("prod", "us-east-3"), spec);
+        verifyAttributes("aws:123123123123", 0, ZoneId.from("prod", "us-west-1"), spec);
+        verifyAttributes("aws:123123123123", 60, ZoneId.from("prod", "us-central-1"), spec);
     }
 
     private void verifyAttributes(String expectedAccount, int expectedTTL, ZoneId zone, DeploymentSpec spec) {