diff options
10 files changed, 11 insertions, 11 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CloudAccountChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CloudAccountChangeValidatorTest.java index b84038ae9b8..46d0fcb3123 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CloudAccountChangeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/CloudAccountChangeValidatorTest.java @@ -57,7 +57,7 @@ class CloudAccountChangeValidatorTest { new ClusterResources(2, 1, nodeResources), false, false, - Optional.of(cloudAccount).filter(account -> !account.isEmpty())); + Optional.of(cloudAccount).filter(account -> !account.isUnspecified())); } private static VespaModel model(Provisioned provisioned) { 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 6220c73dfd5..b9f56ab02a7 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 @@ -21,7 +21,7 @@ public class Cloud { this.dynamicProvisioning = dynamicProvisioning; this.requireAccessControl = requireAccessControl; this.account = Objects.requireNonNull(account); - if (name.equals(CloudName.AWS) && account.isEmpty()) { + if (name.equals(CloudName.AWS) && account.isUnspecified()) { throw new IllegalArgumentException("Account must be non-empty in cloud '" + name + "'"); } } 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 f466e6f2ebb..0d58c2953b5 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 @@ -19,7 +19,7 @@ public class CloudAccount extends PatternedStringWrapper<CloudAccount> { super(value, Pattern.compile("^([0-9]{12})?$"), "cloud account"); } - public boolean isEmpty() { + public boolean isUnspecified() { return this.equals(empty); } @@ -32,7 +32,7 @@ public class CloudAccount extends PatternedStringWrapper<CloudAccount> { @Override public String toString() { - return isEmpty() ? "unspecified account" : "account '" + value() + "'"; + return isUnspecified() ? "unspecified account" : "account '" + value() + "'"; } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index cd6b590f22b..ae97a2ffa71 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -677,7 +677,7 @@ public class ApplicationController { .flatMap(instanceSpec -> instanceSpec.cloudAccount(zoneId.environment(), Optional.of(zoneId.region()))) .or(spec::cloudAccount); - if (requestedAccount.isEmpty() || requestedAccount.get().isEmpty()) { + if (requestedAccount.isEmpty() || requestedAccount.get().isUnspecified()) { return Optional.empty(); } TenantName tenant = deployment.applicationId().tenant(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 8f82faedeb9..3c0b2f36286 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -1335,7 +1335,7 @@ public class ControllerTest { .region(prodZone2.region(), "default") .build(); - // Allow use of custom account (zone 1) + // Allow use of custom account (test, staging and zone 1) tester.controllerTester().flagSource().withListFlag(PermanentFlags.CLOUD_ACCOUNTS.id(), List.of(cloudAccount), String.class); // Deployment to prod succeeds once all zones are configured in requested account diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java index 6667477cad1..bdc9f402d37 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java @@ -45,7 +45,7 @@ public class HostRetirer extends NodeRepositoryMaintainer { .not().deprovisioning(); List<CloudAccount> cloudAccounts = candidates.stream() .map(Node::cloudAccount) - .filter(cloudAccount -> !cloudAccount.isEmpty()) + .filter(cloudAccount -> !cloudAccount.isUnspecified()) .distinct() .collect(Collectors.toList()); Map<String, List<HostEvent>> eventsByHostId = hostProvisioner.hostEventsIn(cloudAccounts).stream() diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java index fd394e13f07..c0bf9926ae1 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/LoadBalancerSerializer.java @@ -72,7 +72,7 @@ public class LoadBalancerSerializer { })); loadBalancer.instance() .map(LoadBalancerInstance::cloudAccount) - .filter(cloudAccount -> !cloudAccount.isEmpty()) + .filter(cloudAccount -> !cloudAccount.isUnspecified()) .ifPresent(cloudAccount -> root.setString(cloudAccountField, cloudAccount.value())); try { return SlimeUtils.toJsonBytes(slime); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java index e924bd49949..ccc2f1e565e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java @@ -194,7 +194,7 @@ public class NodeSerializer { node.exclusiveToApplicationId().ifPresent(applicationId -> object.setString(exclusiveToApplicationIdKey, applicationId.serializedForm())); node.exclusiveToClusterType().ifPresent(clusterType -> object.setString(exclusiveToClusterTypeKey, clusterType.name())); trustedCertificatesToSlime(node.trustedCertificates(), object.setArray(trustedCertificatesKey)); - if (!node.cloudAccount().isEmpty()) { + if (!node.cloudAccount().isUnspecified()) { object.setString(cloudAccountKey, node.cloudAccount().value()); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java index 712797bb76e..879c8e6a9ee 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/LoadBalancersResponse.java @@ -77,7 +77,7 @@ public class LoadBalancersResponse extends SlimeJsonResponse { }); lb.instance() .map(LoadBalancerInstance::cloudAccount) - .filter(cloudAccount -> !cloudAccount.isEmpty()) + .filter(cloudAccount -> !cloudAccount.isUnspecified()) .ifPresent(cloudAccount -> lbObject.setString("cloudAccount", cloudAccount.value())); }); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java index 10f8816134c..e8410c6ec12 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodesResponse.java @@ -192,7 +192,7 @@ class NodesResponse extends SlimeJsonResponse { node.switchHostname().ifPresent(switchHostname -> object.setString("switchHostname", switchHostname)); nodeRepository.archiveUris().archiveUriFor(node).ifPresent(uri -> object.setString("archiveUri", uri)); trustedCertsToSlime(node.trustedCertificates(), object); - if (!node.cloudAccount().isEmpty()) { + if (!node.cloudAccount().isUnspecified()) { object.setString("cloudAccount", node.cloudAccount().value()); } } |