Disallow GCP endpoints in global routing

2 files changed, 5 insertions, 6 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
index 2e62a0decbe..80e33fee874 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
@@ -45,7 +45,7 @@ public class Cloud {
 
     /** For testing purposes only */
     public static Cloud defaultCloud() {
-        return new Builder().name(CloudName.defaultName()).build();
+        return new Builder().name(CloudName.DEFAULT).build();
     }
 
     public static Builder builder() {
@@ -54,7 +54,7 @@ public class Cloud {
 
     public static class Builder {
 
-        private CloudName name = CloudName.defaultName();
+        private CloudName name = CloudName.DEFAULT;
         private boolean dynamicProvisioning = false;
         private boolean reprovisionToUpgradeOs = false;
         private boolean requireAccessControl = false;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudName.java
index 417e381587e..71bb1a07150 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/CloudName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/CloudName.java
@@ -14,16 +14,15 @@ import java.util.regex.Pattern;
 public class CloudName extends PatternedStringWrapper<CloudName> {
 
     private static final Pattern pattern = Pattern.compile("[a-z]([a-z0-9-]*[a-z0-9])*");
+    public static final CloudName AWS = new CloudName("aws");
+    public static final CloudName GCP = new CloudName("gcp");
+    public static final CloudName DEFAULT = from("default");
     private static final CloudName defaultCloud = from("default");
 
     private CloudName(String cloud) {
         super(cloud, pattern, "cloud name");
     }
 
-    public boolean isDefault() {
-        return equals(defaultCloud);
-    }
-
     public static CloudName defaultName() {
         return defaultCloud;
     }