diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-05 11:41:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 11:41:07 +0200 |
| commit | 8702571fbdd28c75bb96ce3d388dff3d4917bd91 (patch) | |
| tree | 0194bb25e08c06d88c74868698fe2b097c89291d /config-provisioning | |
| parent | a811c1aac1f31e367932975c747305d00cc573be (diff) | |
| parent | 03e1df4c936fd34490294834885a5d5f78787bad (diff) | |
Merge pull request #23892 from vespa-engine/hakonhall/disallow-gcp-endpoints-in-global-routing
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 | 12 |
2 files changed, 5 insertions, 11 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..f7edce03525 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,20 +14,14 @@ 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])*"); - private static final CloudName defaultCloud = from("default"); + public static final CloudName AWS = from("aws"); + public static final CloudName GCP = from("gcp"); + public static final CloudName DEFAULT = from("default"); private CloudName(String cloud) { super(cloud, pattern, "cloud name"); } - public boolean isDefault() { - return equals(defaultCloud); - } - - public static CloudName defaultName() { - return defaultCloud; - } - public static CloudName from(String cloud) { return new CloudName(cloud); } |