diff options
3 files changed, 6 insertions, 91 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java index 847a6c96a53..66cbf4d17ef 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java @@ -20,7 +20,6 @@ import com.yahoo.slime.SlimeStream; import com.yahoo.slime.SlimeUtils; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.LockedTenant; -import com.yahoo.vespa.hosted.controller.api.integration.ApplicationIdSnapshot; import com.yahoo.vespa.hosted.controller.api.integration.user.Roles; import com.yahoo.vespa.hosted.controller.api.integration.user.User; import com.yahoo.vespa.hosted.controller.api.integration.user.UserId; @@ -125,7 +124,6 @@ public class UserApiHandler extends LoggingRequestHandler { User user = getAttribute(request, User.ATTRIBUTE_NAME, User.class); Set<Role> roles = getAttribute(request, SecurityContext.ATTRIBUTE_NAME, SecurityContext.class).roles(); - ApplicationIdSnapshot snapshot = controller.applicationIdSnapshot(); Map<TenantName, List<TenantRole>> tenantRolesByTenantName = roles.stream() .flatMap(role -> filterTenantRoles(role).stream()) .distinct() @@ -156,17 +154,6 @@ public class UserApiHandler extends LoggingRequestHandler { Cursor tenantRolesObject = tenantObject.setArray("roles"); tenantRolesByTenantName.getOrDefault(tenant, List.of()) .forEach(role -> tenantRolesObject.addString(role.definition().name())); - - Cursor tenantApplicationsObject = tenantObject.setObject("applications"); - snapshot.applications(tenant).stream() - .sorted() - .forEach(application -> { - Cursor applicationObject = tenantApplicationsObject.setObject(application.value()); - Cursor applicationInstancesObject = applicationObject.setArray("instances"); - snapshot.instances(tenant, application).stream() - .sorted() - .forEach(instance -> applicationInstancesObject.addString(instance.value())); - }); }); if (!operatorRoles.isEmpty()) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json index 079e2c9c388..56108dce94f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json @@ -11,57 +11,21 @@ "administrator", "developer", "reader" - ], - "applications": { - "app1": { - "instances": [ - "default" - ] - }, - "app2": { - "instances": [ - "default", - "dev" - ] - } - } + ] }, "tenant1": { "roles": [ "administrator", "developer", "reader" - ], - "applications": { - "app1": { - "instances": [ - "default" - ] - }, - "app2": { - "instances": [ - "default", - "myinstance" - ] - }, - "app3": { - "instances": [] - } - } + ] }, "tenant2": { "roles": [ "administrator", "developer", "reader" - ], - "applications": { - "app2": { - "instances": [ - "test" - ] - } - } + ] } } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json index f0ea10ed888..ea76aa977ce 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json @@ -10,53 +10,17 @@ "roles": [ "developer", "reader" - ], - "applications": { - "app1": { - "instances": [ - "default" - ] - }, - "app2": { - "instances": [ - "default", - "dev" - ] - } - } + ] }, "tenant1": { "roles": [ "administrator" - ], - "applications": { - "app1": { - "instances": [ - "default" - ] - }, - "app2": { - "instances": [ - "default", - "myinstance" - ] - }, - "app3": { - "instances": [] - } - } + ] }, "tenant2": { "roles": [ "developer" - ], - "applications": { - "app2": { - "instances": [ - "test" - ] - } - } + ] } } } |