Require GCP cloud account explicitly prefixed with cloud name

2 files changed, 6 insertions, 13 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 91da7866603..9f6e9b37c0a 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
@@ -83,8 +83,6 @@ public class CloudAccount implements Comparable<CloudAccount> {
                 return empty;
             if (META_BY_CLOUD.get("aws").matches(cloudAccount))
                 return new CloudAccount(cloudAccount, CloudName.AWS);
-            if (META_BY_CLOUD.get("gcp").matches(cloudAccount)) // TODO (freva): Remove July 2023
-                return new CloudAccount(cloudAccount, CloudName.GCP);
             throw illegal(cloudAccount, "Must be on format '<cloud-name>:<account>' or 'default'");
         }
 
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 2a994ac607e..fafea04c9ec 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
@@ -32,17 +32,12 @@ class CloudAccountTest {
 
     @Test
     void gcp_accounts() {
-        CloudAccount oldFormat = CloudAccount.from("my-project");
-        CloudAccount newFormat = CloudAccount.from("gcp:my-project");
-        assertEquals(oldFormat, newFormat);
-
-        for (CloudAccount account : List.of(oldFormat, newFormat)) {
-            assertFalse(account.isUnspecified());
-            assertEquals(account, CloudAccount.from(account.value()));
-            assertEquals("my-project", account.account());
-            assertEquals(CloudName.GCP, account.cloudName());
-            assertEquals("gcp:my-project", account.value());
-        }
+        CloudAccount account = CloudAccount.from("gcp:my-project");
+        assertFalse(account.isUnspecified());
+        assertEquals(account, CloudAccount.from(account.value()));
+        assertEquals("my-project", account.account());
+        assertEquals(CloudName.GCP, account.cloudName());
+        assertEquals("gcp:my-project", account.value());
     }
 
     @Test