diff options
5 files changed, 7 insertions, 8 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java index 0424b1dae16..7c5c15e23e6 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java @@ -8,7 +8,7 @@ import java.util.Objects; /** * Unique identifier for a Zone; use when referencing them. - * + * <p> * Serialised form is 'environment.region'. * * @author jonmv diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java index d26ebb62181..70eaca5ce7e 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneRegistry.java @@ -110,7 +110,7 @@ public interface ZoneRegistry { /** IAM tenant developer role ARN */ Optional<String> tenantDeveloperRoleArn(TenantName tenant); - /** Returns athenz domain tied to the given cloud account */ - AthenzDomain cloudAccountAthenzDomain(CloudAccount cloudAccount); + /** Returns athenz domain tied to the given cloud account, if any */ + Optional<AthenzDomain> cloudAccountAthenzDomain(CloudAccount cloudAccount); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 210c5793939..afd44c8e3a4 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1869,7 +1869,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { controller.applications().decideCloudAccountOf(deploymentId, application.deploymentSpec()).ifPresent(cloudAccount -> { Cursor enclave = response.setObject("enclave"); enclave.setString("cloudAccount", cloudAccount.value()); - enclave.setString("athensDomain", controller.zoneRegistry().cloudAccountAthenzDomain(cloudAccount).value()); + controller.zoneRegistry().cloudAccountAthenzDomain(cloudAccount).ifPresent(domain -> enclave.setString("athensDomain", domain.value())); }); var instance = application.instances().get(deploymentId.applicationId().instance()); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java index 6fd0bba46a0..11dcfa3680e 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/api/AthenzService.java @@ -24,11 +24,10 @@ public class AthenzService implements AthenzIdentity { public AthenzService(String fullName) { AthenzIdentity identity = AthenzIdentities.from(fullName); - if (!(identity instanceof AthenzService)) { + if ( ! (identity instanceof AthenzService service)) { throw new IllegalArgumentException(String.format("'%s' is not an Athenz service", fullName)); } - AthenzService service = (AthenzService) identity; - this.domain = service.getDomain(); + this.domain = service.domain; this.serviceName = service.serviceName; } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java index 05e872e6e8e..253897f2e3d 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java @@ -37,7 +37,7 @@ public class AthenzIdentities { throw new IllegalArgumentException("Invalid Athenz identity: " + fullName); } AthenzDomain domain = new AthenzDomain(fullName.substring(0, domainIdentityNameSeparatorIndex)); - String identityName = fullName.substring(domainIdentityNameSeparatorIndex + 1, fullName.length()); + String identityName = fullName.substring(domainIdentityNameSeparatorIndex + 1); return from(domain, identityName); } |