Merge remote-tracking branch 'origin/master' into ogronnesby/persist-scaling-events

1 files changed, 6 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
index ffdd6da83a9..5d1a677bf51 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java
@@ -266,9 +266,14 @@ public class ApplicationPackageBuilder {
         StringBuilder xml = new StringBuilder();
         xml.append("<deployment version='1.0' ");
         majorVersion.ifPresent(v -> xml.append("major-version='").append(v).append("' "));
-        if(athenzIdentityAttributes != null) {
+        if (athenzIdentityAttributes != null) {
             xml.append(athenzIdentityAttributes);
         }
+        if (cloudAccount != null) {
+            xml.append(" cloud-account='");
+            xml.append(cloudAccount);
+            xml.append("'");
+        }
         xml.append(">\n");
         for (String instance : instances.split(",")) {
             xml.append("  <instance id='").append(instance).append("'>\n");
@@ -292,11 +297,6 @@ public class ApplicationPackageBuilder {
                 xml.append(globalServiceId);
                 xml.append("'");
             }
-            if (cloudAccount != null) {
-                xml.append(" cloud-account='");
-                xml.append(cloudAccount);
-                xml.append("'");
-            }
             xml.append(">\n");
             xml.append(prodBody);
             xml.append("    </prod>\n");