Merge pull request #21211 from vespa-engine/olaa/subdomain-payload

Adds parent and adminUsers to subdomain creation payload

1 files changed, 5 insertions, 2 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 f58617a38f2..d83eab9e339 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
@@ -9,7 +9,6 @@ import com.yahoo.vespa.athenz.api.AthenzPolicy;
 import com.yahoo.vespa.athenz.api.AthenzResourceName;
 import com.yahoo.vespa.athenz.api.AthenzRole;
 import com.yahoo.vespa.athenz.api.AthenzService;
-import com.yahoo.vespa.athenz.api.AthenzUser;
 import com.yahoo.vespa.athenz.api.OktaAccessToken;
 import com.yahoo.vespa.athenz.api.OktaIdentityToken;
 import com.yahoo.vespa.athenz.client.ErrorHandler;
@@ -394,7 +393,11 @@ public class DefaultZmsClient extends ClientBase implements ZmsClient {
     @Override
     public void createSubdomain(AthenzDomain parent, String name) {
         URI uri = zmsUrl.resolve(String.format("subdomain/%s", parent.getName()));
-        StringEntity entity = toJsonStringEntity(Map.of("name", name));
+        StringEntity entity = toJsonStringEntity(
+                Map.of("name", name,
+                        "parent", parent.getName(),
+                        "adminUsers", List.of(identity.getFullName())) // TODO: createSubdomain should receive an adminUsers argument
+        );
         var request = RequestBuilder.post(uri)
                 .setEntity(entity)
                 .build();