Merge pull request #27486 from vespa-engine/hakonhall/isenclave---isexclavev8.180.18

isEnclave -> isExclave

7 files changed, 9 insertions, 10 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 5e14e287a12..91da7866603 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
@@ -44,8 +44,8 @@ public class CloudAccount implements Comparable<CloudAccount> {
         return this.equals(empty);
     }
 
-    /** Returns true if this is an enclave account. */
-    public boolean isEnclave(Zone zone) {
+    /** Returns true if this is an exclave account. */
+    public boolean isExclave(Zone zone) {
         return !isUnspecified() &&
                zone.system().isPublic() &&
                !equals(zone.cloud().account());
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java
index ed4cab5137c..e3bb768a9c2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/archive/ArchiveUriManager.java
@@ -42,7 +42,7 @@ public class ArchiveUriManager {
         if (node.allocation().isEmpty()) return Optional.empty();
         ApplicationId app = node.allocation().get().owner();
 
-        return Optional.ofNullable(node.cloudAccount().isEnclave(zone) ?
+        return Optional.ofNullable(node.cloudAccount().isExclave(zone) ?
                 archiveUris.get().accountArchiveUris().get(node.cloudAccount()) :
                 archiveUris.get().tenantArchiveUris().get(app.tenant()))
                 .map(uri -> {
@@ -68,7 +68,7 @@ public class ArchiveUriManager {
 
     /** Set (or remove, if archiveURI is empty) archive URI to use for given account */
     public void setArchiveUri(CloudAccount account, Optional<String> archiveUri) {
-        if (!account.isEnclave(zone) || account.isUnspecified())
+        if (!account.isExclave(zone) || account.isUnspecified())
             throw new IllegalArgumentException("Cannot set archive URI for non-enclave account: " + account);
         setArchiveUri(au -> au.with(account, archiveUri));
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
index e0012ed0b9d..e9e3fd5179a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostCapacityMaintainer.java
@@ -270,7 +270,7 @@ public class HostCapacityMaintainer extends NodeRepositoryMaintainer {
 
         NodePrioritizer prioritizer = new NodePrioritizer(allNodes, applicationId, clusterSpec, nodeSpec, wantedGroups,
                 true, nodeRepository().nameResolver(), nodeRepository().nodes(), nodeRepository().resourcesCalculator(),
-                nodeRepository().spareCount(), nodeSpec.cloudAccount().isEnclave(nodeRepository().zone()));
+                nodeRepository().spareCount(), nodeSpec.cloudAccount().isExclave(nodeRepository().zone()));
         List<NodeCandidate> nodeCandidates = prioritizer.collect(List.of());
         MutableInteger index = new MutableInteger(0);
         return nodeCandidates
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
index f5ea5f7d20b..3b846351b36 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
@@ -19,7 +19,6 @@ import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.Node.State;
 import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
-import com.yahoo.vespa.hosted.provision.applications.Cluster;
 import com.yahoo.vespa.hosted.provision.node.Allocation;
 import com.yahoo.vespa.hosted.provision.node.ClusterId;
 import com.yahoo.vespa.hosted.provision.persistence.CacheStats;
@@ -196,7 +195,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
             boolean converged = currentVersion.isPresent() &&
                     currentVersion.get().equals(wantedVersion);
             metric.set(ConfigServerMetrics.WANT_TO_CHANGE_VESPA_VERSION.baseName(), converged ? 0 : 1, context);
-            if (node.cloudAccount().isEnclave(nodeRepository().zone())) {
+            if (node.cloudAccount().isExclave(nodeRepository().zone())) {
                 metric.set(ConfigServerMetrics.HAS_WIRE_GUARD_KEY.baseName(), node.wireguardPubKey().isPresent() ? 1 : 0, context);
             }
         } else {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
index 7a2508729ed..cc7db3c138a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java
@@ -431,7 +431,7 @@ public record IP() {
     public static void verifyDns(String hostname, String ipAddress, NodeType nodeType, NameResolver resolver,
                                  CloudAccount cloudAccount, Zone zone) {
         boolean ipv6 = isV6(ipAddress);
-        Set<DnsRecordType> recordTypes = dnsRecordTypesFor(ipv6, nodeType, zone.cloud().name(), cloudAccount.isEnclave(zone));
+        Set<DnsRecordType> recordTypes = dnsRecordTypesFor(ipv6, nodeType, zone.cloud().name(), cloudAccount.isExclave(zone));
 
         if (recordTypes.contains(DnsRecordType.FORWARD)) {
             RecordType recordType = ipv6 ? RecordType.AAAA : RecordType.A;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 07e645025c0..0c4838abe4d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -168,7 +168,7 @@ public class GroupPreparer {
                                                           nodeRepository.nodes(),
                                                           nodeRepository.resourcesCalculator(),
                                                           nodeRepository.spareCount(),
-                                                          requestedNodes.cloudAccount().isEnclave(nodeRepository.zone()));
+                                                          requestedNodes.cloudAccount().isExclave(nodeRepository.zone()));
         allocation.offer(prioritizer.collect(surplusActiveNodes));
         return allocation;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index ae1edab7fad..10aae94a986 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -324,7 +324,7 @@ public class LoadBalancerProvisioner {
     private Set<String> reachableIpAddresses(Node node) {
         Set<String> reachable = new LinkedHashSet<>(node.ipConfig().primary());
         // Remove addresses unreachable by the load balancer service
-        switch (service.protocol(node.cloudAccount().isEnclave(nodeRepository.zone()))) {
+        switch (service.protocol(node.cloudAccount().isExclave(nodeRepository.zone()))) {
             case ipv4 -> reachable.removeIf(IP::isV6);
             case ipv6 -> reachable.removeIf(IP::isV4);
         }