From 53e6bdcf00450f44c287a8a4d0427629f266e60c Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@yahooinc.com>
Date: Thu, 11 May 2023 10:51:22 +0200
Subject: Require cloudAccount in GCP

---
 .../src/main/java/com/yahoo/vespa/hosted/provision/Node.java       | 7 -------
 .../com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java  | 4 ----
 .../src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 7 +------
 .../hosted/provision/provisioning/LoadBalancerProvisioner.java     | 7 +------
 4 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'node-repository')

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index a77b198cfe4..3b518728607 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -341,13 +341,6 @@ public final class Node implements Nodelike {
                         trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
-    /** Returns a node with the cloud account assigned to the given value */
-    public Node with(CloudAccount cloudAccount) {
-        return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history, type,
-                reports, modelName, reservedTo, exclusiveToApplicationId, exclusiveToClusterType, switchHostname,
-                trustStoreItems, cloudAccount, wireguardPubKey);
-    }
-
     /** Returns a node with the flavor assigned to the given value */
     public Node with(Flavor flavor, Agent agent, Instant instant) {
         if (flavor.equals(this.flavor)) return this;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java
index 5284511af47..e228d31384c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerInstance.java
@@ -119,10 +119,6 @@ public class LoadBalancerInstance {
                                         cloudAccount);
     }
 
-    public LoadBalancerInstance with(CloudAccount cloudAccount) {
-        return new LoadBalancerInstance(hostname, ipAddress, dnsZone, ports, networks, reals, settings, serviceIds, cloudAccount);
-    }
-
     /** Prepends the given service IDs, possibly changing the order of those we have in this. */
     public LoadBalancerInstance withServiceIds(List<PrivateServiceId> serviceIds) {
         List<PrivateServiceId> ids = new ArrayList<>(serviceIds);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index 478d49d67d4..fd6b15609d6 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -79,12 +79,7 @@ public class Nodes {
     /** Read and write all nodes to make sure they are stored in the latest version of the serialized format */
     public void rewrite() {
         Instant start = clock.instant();
-        int nodesWritten = performOn(list(), (node, mutex) -> {
-            // TODO (valerijf): Remove after 8.162
-            if (node.cloudAccount().isUnspecified() && !zone.getCloud().account().isUnspecified())
-                node = node.with(zone.getCloud().account());
-            return write(node, mutex);
-        }).size();
+        int nodesWritten = performOn(list(), this::write).size();
         Instant end = clock.instant();
         log.log(Level.INFO, String.format("Rewrote %d nodes in %s", nodesWritten, Duration.between(start, end)));
     }
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 488ffe25ec2..61b0ae80c98 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
@@ -71,15 +71,10 @@ public class LoadBalancerProvisioner {
         this.deactivateRouting = PermanentFlags.DEACTIVATE_ROUTING.bindTo(nodeRepository.flagSource());
         // Read and write all load balancers to make sure they are stored in the latest version of the serialization format
 
-        CloudAccount zoneAccount = nodeRepository.zone().cloud().account();
         for (var id : db.readLoadBalancerIds()) {
             try (var lock = db.lock(id.application())) {
                 var loadBalancer = db.readLoadBalancer(id);
-                loadBalancer.ifPresent(lb -> {
-                    if (!zoneAccount.isUnspecified() && lb.instance().isPresent() && lb.instance().get().cloudAccount().isUnspecified())
-                        lb = lb.with(Optional.of(lb.instance().get().with(zoneAccount)));
-                    db.writeLoadBalancer(lb, lb.state());
-                });
+                loadBalancer.ifPresent(lb -> db.writeLoadBalancer(lb, lb.state()));
             }
         }
     }
-- 
cgit v1.2.3