diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2023-01-02 09:25:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-02 09:25:20 +0100 |
commit | 6f57128414995c8fad752dc7e20bd4ed98eaea16 (patch) | |
tree | 6d6fb9a06624a1fe2a2dca6963f6f18994e2ebe5 /config-provisioning | |
parent | 3f1f34a3a32ef7df98597619b9b26265a9a2dcce (diff) | |
parent | 87806f4ac68e19c44b1b16f513b3c4998a3ae57c (diff) |
Merge pull request #25289 from vespa-engine/hakonhall/avoid-ptr-verification-when-provisioning-in-enclave
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.java | 9 |
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"); }; |