diff options
author | Ola Aunronning <olaa@yahooinc.com> | 2023-01-19 14:24:11 +0100 |
---|---|---|
committer | Ola Aunronning <olaa@yahooinc.com> | 2023-01-19 14:24:11 +0100 |
commit | 323eebb89e67668f5175ca3c83f101b60202aaff (patch) | |
tree | 492e4fc5376083d2265e18279ca0fa64bf33725d /vespa-athenz/src/main | |
parent | cfa81f754d4a9584a6e0589b40e5436cc3a22d15 (diff) |
Include attributes when creating Athenz subdomain
Diffstat (limited to 'vespa-athenz/src/main')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java | 8 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java index 7b3388d1027..560bb8156c6 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java @@ -424,13 +424,15 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { } @Override - public void createSubdomain(AthenzDomain parent, String name) { + public void createSubdomain(AthenzDomain parent, String name, Map<String, Object> attributes) { URI uri = zmsUrl.resolve(String.format("subdomain/%s", parent.getName())); - StringEntity entity = toJsonStringEntity( - Map.of("name", name, + var metaData = new HashMap<String, Object>(); + metaData.putAll(attributes); + metaData.putAll(Map.of("name", name, "parent", parent.getName(), "adminUsers", List.of(identity.getFullName())) // TODO: createSubdomain should receive an adminUsers argument ); + var entity = toJsonStringEntity(metaData); var request = RequestBuilder.post(uri) .setEntity(entity) .build(); diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java index be4c6c7ba3b..4342b32e4c8 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java @@ -85,7 +85,11 @@ public interface ZmsClient extends Closeable { void deleteRole(AthenzRole athenzRole); - void createSubdomain(AthenzDomain parent, String name); + void createSubdomain(AthenzDomain parent, String name, Map<String, Object> attributes); + + default void createSubdomain(AthenzDomain parent, String name) { + createSubdomain(parent, name, Map.of()); + }; AthenzRoleInformation getFullRoleInformation(AthenzRole role); |