Change JSON to use accounts/integrations instead of secret stores

4 files changed, 23 insertions, 17 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 6472b7820a5..b6fe0c93554 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
@@ -1978,7 +1978,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                 // TODO: remove this once console is updated
                 toSlime(object, cloudTenant.tenantSecretStores());
 
-                toSlime(object.setObject("secretStore"),
+                toSlime(object.setObject("integrations").setObject("aws"),
                         controller.serviceRegistry().roleService().getTenantRole(tenant.name()),
                         cloudTenant.tenantSecretStores());
 
@@ -2261,7 +2261,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private void toSlime(Cursor object, TenantRoles tenantRoles, List<TenantSecretStore> tenantSecretStores) {
         object.setString("tenantRole", tenantRoles.containerRole());
-        var stores = object.setArray("stores");
+        var stores = object.setArray("accounts");
         tenantSecretStores.forEach(secretStore -> {
             toSlime(stores.addObject(), secretStore);
         });
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
index 36fb03d76b2..03e5eb2b7a8 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
@@ -11,9 +11,11 @@
       "user": "developer@tenant"
     }],
   "secretStores": [],
-  "secretStore": {
-    "tenantRole": "my-tenant-tenant-role",
-    "stores": []
+  "integrations": {
+    "aws": {
+      "tenantRole": "my-tenant-tenant-role",
+      "accounts": []
+    }
   },
   "quota": {
     "budget": null,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
index 952e9575d63..dc717b5cac0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
@@ -14,15 +14,17 @@
       "role": "secret-role"
     }
   ],
-  "secretStore": {
-    "tenantRole": "my-tenant-tenant-role",
-    "stores": [
-      {
-        "name": "secret-foo",
-        "awsId": "123",
-        "role": "secret-role"
-      }
-    ]
+  "integrations": {
+    "aws": {
+      "tenantRole": "my-tenant-tenant-role",
+      "accounts": [
+        {
+          "name": "secret-foo",
+          "awsId": "123",
+          "role": "secret-role"
+        }
+      ]
+    }
   },
   "quota": {
     "budget": null,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json
index f0b7bf52d43..14b900caf50 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json
@@ -4,9 +4,11 @@
   "creator": "administrator@tenant",
   "pemDeveloperKeys": [],
   "secretStores": [],
-  "secretStore": {
-    "tenantRole": "my-tenant-tenant-role",
-    "stores": []
+  "integrations": {
+    "aws": {
+      "tenantRole": "my-tenant-tenant-role",
+      "accounts": []
+    }
   },
   "quota": {
     "budget": null,