aboutsummaryrefslogtreecommitdiffstats
path: root/vespa-athenz
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-09-10 12:45:02 +0200
committerGitHub <noreply@github.com>2021-09-10 12:45:02 +0200
commit03e533bfe216d3afe9492c5a9a4da478f5301b43 (patch)
tree06e745a4628795ed3f2924fc03a3e9ea20e098d4 /vespa-athenz
parent082b102583408178ea87e8373a0193e056c4f53f (diff)
Add policy name in body (#19066)
Diffstat (limited to 'vespa-athenz')
-rw-r--r--vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zms/DefaultZmsClient.java10
1 files changed, 9 insertions, 1 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 51887141646..54f2b2fd9e3 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
@@ -1,6 +1,7 @@
// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.athenz.client.zms;
+import com.yahoo.io.IOUtils;
import com.yahoo.vespa.athenz.api.AthenzDomain;
import com.yahoo.vespa.athenz.api.AthenzGroup;
import com.yahoo.vespa.athenz.api.AthenzIdentity;
@@ -28,10 +29,13 @@ import com.yahoo.vespa.athenz.utils.AthenzIdentities;
import org.apache.http.Header;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.entity.StringEntity;
import org.apache.http.message.BasicHeader;
import javax.net.ssl.SSLContext;
+import java.io.IOException;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
@@ -190,7 +194,11 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
public void createPolicy(AthenzDomain athenzDomain, String athenzPolicy) {
URI uri = zmsUrl.resolve(String.format("domain/%s/policy/%s",
athenzDomain.getName(), athenzPolicy));
- execute(RequestBuilder.put(uri).build(), response -> readEntity(response, Void.class));
+ StringEntity entity = toJsonStringEntity(Map.of("name", athenzPolicy, "assertions", List.of()));
+ HttpUriRequest request = RequestBuilder.put(uri)
+ .setEntity(entity)
+ .build();
+ execute(request, response -> readEntity(response, Void.class));
}
@Override