diff options
author | jonmv <venstad@gmail.com> | 2023-07-05 11:41:02 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-07-05 11:41:02 +0200 |
commit | 404f3929e086cc56f56e428de2658b0961ffb28c (patch) | |
tree | 9365bda466107423afd05587ac8a130c19294246 /vespa-athenz | |
parent | 55e23eab171ca5ff62c9167c659a40091fa1dd2f (diff) |
Update domain meta with a dedicated main key
Diffstat (limited to 'vespa-athenz')
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java | 20 | ||||
-rw-r--r-- | vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/ZmsClient.java | 2 |
2 files changed, 10 insertions, 12 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 4500df6ff1b..7c6125c82e1 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 @@ -229,15 +229,13 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { } @Override - public void updateDomain(AthenzDomain domain, Map<String, Object> attributes) { - for (String attribute : attributes.keySet()) { - String domainMeta = uncheck(() -> new ObjectMapper().writeValueAsString(Map.of(attribute, attributes.get(attribute)))); - HttpUriRequest request = RequestBuilder.put() - .setUri(zmsUrl.resolve("domain/%s/meta/system/%s".formatted(domain.getName(), attribute))) - .setEntity(new StringEntity(domainMeta, ContentType.APPLICATION_JSON)) - .build(); - execute(request, response -> readEntity(response, Void.class)); - } + public void updateDomain(AthenzDomain domain, String mainKey, Map<String, Object> attributes) { + String domainMeta = uncheck(() -> new ObjectMapper().writeValueAsString(attributes)); + HttpUriRequest request = RequestBuilder.put() + .setUri(zmsUrl.resolve("domain/%s/meta/system/%s".formatted(domain.getName(), mainKey))) + .setEntity(new StringEntity(domainMeta, ContentType.APPLICATION_JSON)) + .build(); + execute(request, response -> readEntity(response, Void.class)); } @Override @@ -465,8 +463,8 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient { 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 + "parent", parent.getName(), + "adminUsers", List.of(identity.getFullName())) // TODO: createSubdomain should receive an adminUsers argument ); var entity = toJsonStringEntity(metaData); var request = RequestBuilder.post(uri) 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 edff7b517c4..33dac0dfb69 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 @@ -55,7 +55,7 @@ public interface ZmsClient extends Closeable { AthenzDomainMeta getDomainMeta(AthenzDomain domain); - void updateDomain(AthenzDomain domain, Map<String, Object> attributes); + void updateDomain(AthenzDomain domain, String mainKey, Map<String, Object> attributes); boolean hasAccess(AthenzResourceName resource, String action, AthenzIdentity identity); |