diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2022-09-01 15:47:45 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2022-09-01 15:47:45 +0200 |
commit | fa2d3e1f0a0bae315bf89769dae04d037d715b99 (patch) | |
tree | f886d2fab63f02a31d2946942506a9d511457b8f /config-provisioning | |
parent | 20633e83f7c64cde7d46579406b3c86a330d5718 (diff) |
Disallow GCP endpoints in global routing
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/CloudName.java | 7 |
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; } |