aboutsummaryrefslogtreecommitdiffstats
path: root/config-model-api/src/main/java/com/yahoo/config/application
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-06-12 11:16:48 +0200
committerjonmv <venstad@gmail.com>2023-06-12 11:16:48 +0200
commite2fd29c3d1b82448d04a14b099d591c29edd1f64 (patch)
tree29eeeca974b36bcc391a30ae3715fcd76cbbefdc /config-model-api/src/main/java/com/yahoo/config/application
parent3a8599c83c599032bbf708e8453a873e85488291 (diff)
Changing cloud accounts requires redeployment
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/application')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java5
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java3
2 files changed, 5 insertions, 3 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
index a4be547fe70..b6f934c8824 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java
@@ -344,7 +344,7 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps {
int deployableHashCode() {
List<DeploymentSpec.DeclaredZone> zones = zones().stream().filter(zone -> zone.concerns(prod)).toList();
- Object[] toHash = new Object[zones.size() + 6];
+ Object[] toHash = new Object[zones.size() + 7];
int i = 0;
toHash[i++] = name;
toHash[i++] = endpoints;
@@ -352,8 +352,9 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps {
toHash[i++] = globalServiceId;
toHash[i++] = tags;
toHash[i++] = bcp;
+ toHash[i++] = cloudAccounts;
for (DeploymentSpec.DeclaredZone zone : zones)
- toHash[i++] = Objects.hash(zone, zone.athenzService());
+ toHash[i++] = Objects.hash(zone, zone.athenzService(), zone.cloudAccounts());
return Arrays.hashCode(toHash);
}
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index f355a61fa8a..797be652ebc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -359,12 +359,13 @@ public class DeploymentSpec {
/** Computes a hash of all fields that influence what is deployed with this spec, i.e., not orchestration. */
public int deployableHashCode() {
- Object[] toHash = new Object[instances().size() + 4];
+ Object[] toHash = new Object[instances().size() + 5];
int i = 0;
toHash[i++] = majorVersion;
toHash[i++] = athenzDomain;
toHash[i++] = athenzService;
toHash[i++] = endpoints;
+ toHash[i++] = cloudAccounts;
for (DeploymentInstanceSpec instance : instances())
toHash[i++] = instance.deployableHashCode();