diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-12-03 11:11:47 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-12-03 11:11:47 +0100 |
| commit | c72b660a41a79d4c10c0dfcfab06708f58867467 (patch) | |
| tree | f10554059f4aee9ece9b50d777f9f7a2535055bf /controller-server | |
| parent | a16e506b94e2ebdf693acbc66e077e1c6abe32a2 (diff) | |
Include isPublic in response
Diffstat (limited to 'controller-server')
4 files changed, 5 insertions, 0 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 d26cba516e0..375d57febd8 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 @@ -142,6 +142,8 @@ public class UserApiHandler extends LoggingRequestHandler { Slime slime = new Slime(); Cursor root = slime.setObject(); + root.setBool("isPublic", controller.system().isPublic()); + toSlime(root.setObject("user"), user); Cursor tenants = root.setObject("tenants"); 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 797ce098938..9f39825ba9e 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 @@ -1,4 +1,5 @@ { + "isPublic": false, "user": { "name": "Joe Developer", "email": "dev@domail", 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 bfc522d3933..f0ea10ed888 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 @@ -1,4 +1,5 @@ { +"isPublic": true, "user": { "name": "Joe Developer", "email": "dev@domail", diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json index c7558f92080..17489bb15d8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-without-applications.json @@ -1,4 +1,5 @@ { + "isPublic": (ignore), "user": { "name": "Joe Developer", "email": "dev@domail", |