Merge branch 'master' into bjormel/aws-main-controller

1 files changed, 9 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 46c81fc073f..16d862a66ef 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2915,6 +2915,15 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
             }
         }
         tenantMetaDataToSlime(tenant, applications, object.setObject("metaData"));
+
+        if (!tenant.cloudAccounts().isEmpty()) {
+            Cursor cloudAccounts = object.setArray("cloudAccounts");
+            tenant.cloudAccounts().forEach(accountInfo -> {
+                Cursor accountObject = cloudAccounts.addObject();
+                accountObject.setString("cloudAccount", accountInfo.cloudAccount().value());
+                accountObject.setString("templateVersion", accountInfo.templateVersion().toFullString());
+            });
+        }
     }
 
     private void toSlime(ArchiveAccess archiveAccess, Cursor object) {