Merge pull request #27251 from vespa-engine/freva/serialize-cloud-account

Update CloudAccount serialization

2 files changed, 6 insertions, 3 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java
index 8026e4c5205..5e14e287a12 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java
@@ -35,7 +35,10 @@ public class CloudAccount implements Comparable<CloudAccount> {
     public CloudName cloudName() { return cloudName; }
 
     /** Returns the serialized value of this account that can be deserialized with {@link CloudAccount#from} */
-    public final String value() { return account; } // TODO (freva): Change to cloudName:account
+    public final String value() {
+        if (isUnspecified()) return account;
+        return cloudName.value() + ':' + account;
+    }
 
     public boolean isUnspecified() {
         return this.equals(empty);
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/CloudAccountTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/CloudAccountTest.java
index 4eee52def6c..2a994ac607e 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/CloudAccountTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/CloudAccountTest.java
@@ -26,7 +26,7 @@ class CloudAccountTest {
             assertEquals(account, CloudAccount.from(account.value()));
             assertEquals("123456789012", account.account());
             assertEquals(CloudName.AWS, account.cloudName());
-            assertEquals("123456789012", account.value());
+            assertEquals("aws:123456789012", account.value());
         }
     }
 
@@ -41,7 +41,7 @@ class CloudAccountTest {
             assertEquals(account, CloudAccount.from(account.value()));
             assertEquals("my-project", account.account());
             assertEquals(CloudName.GCP, account.cloudName());
-            assertEquals("my-project", account.value());
+            assertEquals("gcp:my-project", account.value());
         }
     }