summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2019-10-10 12:43:34 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2019-10-10 12:43:34 +0200
commit8c3a57e8851fdec12d1202b1194276aa014a2585 (patch)
treeaa1c1ce89959b26e5c7b2db1235eb27de40ea075
parentb682654c786a94dc7dd564f4bc1047e1ed06500c (diff)
Do not expose the headless role in the APIs - only used for keys
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json18
2 files changed, 4 insertions, 16 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java
index 2147b4f98d3..c8c21c13fc1 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/user/Roles.java
@@ -27,7 +27,7 @@ public class Roles {
/** Returns the list of {@link ApplicationRole}s a {@link UserId} may be a member of. */
public static List<ApplicationRole> applicationRoles(TenantName tenant, ApplicationName application) {
- return List.of(Role.headless(tenant, application));
+ return List.of();
}
/** Returns the {@link Role} the given value represents. */
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json
index e05156e3eef..9bd66c16308 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/application-roles.json
@@ -1,29 +1,17 @@
{
"tenant": "my-tenant",
"application": "my-app",
- "roleNames": [
- "headless"
- ],
+ "roleNames": [],
"users": [
{
"name": "administrator@tenant",
"email": "administrator@tenant",
- "roles": {
- "headless": {
- "explicit": false,
- "implied": false
- }
- }
+ "roles": {}
},
{
"name": "developer@tenant",
"email": "developer@tenant",
- "roles": {
- "headless": {
- "explicit": false,
- "implied": false
- }
- }
+ "roles": {}
}
]
} \ No newline at end of file