aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2021-03-23 10:07:07 +0100
committerØyvind Grønnesby <oyving@verizonmedia.com>2021-03-23 10:07:07 +0100
commitddbe7fbd37a4794295278db1f7e9e43d8bfa2d64 (patch)
tree811a16a99721735d3d0b73d6d2883b81f6411e87 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user
parentbd073bcd6e51fc134d33e61bb8fafa9f356007ef (diff)
Update API to show secret store information
- Add information about the IAM role - Put everything inside its own object - TODO to remove the old structure after console update
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json10
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-without-applications.json4
3 files changed, 18 insertions, 0 deletions
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 f94dc7c562b..36fb03d76b2 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,6 +11,10 @@
"user": "developer@tenant"
}],
"secretStores": [],
+ "secretStore": {
+ "tenantRole": "my-tenant-tenant-role",
+ "stores": []
+ },
"quota": {
"budget": null,
"budgetUsed": 0.0,
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 25891755323..952e9575d63 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,6 +14,16 @@
"role": "secret-role"
}
],
+ "secretStore": {
+ "tenantRole": "my-tenant-tenant-role",
+ "stores": [
+ {
+ "name": "secret-foo",
+ "awsId": "123",
+ "role": "secret-role"
+ }
+ ]
+ },
"quota": {
"budget": null,
"budgetUsed": 0.0,
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 5965d4b5b00..f0b7bf52d43 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,6 +4,10 @@
"creator": "administrator@tenant",
"pemDeveloperKeys": [],
"secretStores": [],
+ "secretStore": {
+ "tenantRole": "my-tenant-tenant-role",
+ "stores": []
+ },
"quota": {
"budget": null,
"budgetUsed": 0.0,