summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@yahooinc.com>2022-12-19 13:16:36 +0100
committerHåkon Hallingstad <hakon@yahooinc.com>2022-12-19 13:16:36 +0100
commit15a940c9ff211786b125366ac59251f964647d43 (patch)
treecab5cc54e50dbeb91c4bb730e4ffce32c5347e47 /config-provisioning
parentb1d62841b71910ec8b43f7b35ff2c3e314053e6a (diff)
Avoid PTR verification when provisioning in Enclave
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/CloudAccount.java9
1 files changed, 8 insertions, 1 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 11fd352bcc9..974e5203e76 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
@@ -27,9 +27,16 @@ public class CloudAccount extends PatternedStringWrapper<CloudAccount> {
return this.equals(empty);
}
+ /** Returns true if this is an enclave account. */
+ public boolean isEnclave(Zone zone) {
+ return !isUnspecified() &&
+ zone.system().isPublic() &&
+ !equals(zone.cloud().account());
+ }
+
public static CloudAccount from(String cloudAccount) {
return switch (cloudAccount) {
- // TODO: Remove "default" as e.g. it is a valid GCP project ID
+ // Tenants are allowed to specify "default" in services.xml.
case "", "default" -> empty;
default -> new CloudAccount(cloudAccount, AWS_ACCOUNT_ID + "|" + GCP_PROJECT_ID, "cloud account");
};