Update contact in tenant info when creating a tenant

7 files changed, 33 insertions, 11 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedTenant.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedTenant.java
index 3f4ce7cc49b..bcc3b9b54c7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedTenant.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedTenant.java
@@ -141,7 +141,7 @@ public abstract class LockedTenant {
         }
 
         private Cloud(CloudTenant tenant) {
-            this(tenant.name(), tenant.createdAt(), tenant.lastLoginInfo(), Optional.empty(), tenant.developerKeys(), tenant.info(), tenant.tenantSecretStores(), tenant.archiveAccessRole());
+            this(tenant.name(), tenant.createdAt(), tenant.lastLoginInfo(), tenant.creator(), tenant.developerKeys(), tenant.info(), tenant.tenantSecretStores(), tenant.archiveAccessRole());
         }
 
         @Override
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index b170a1cbb68..18c2dd49514 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -70,6 +70,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.resource.MeteringData;
 import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceAllocation;
 import com.yahoo.vespa.hosted.controller.api.integration.resource.ResourceSnapshot;
 import com.yahoo.vespa.hosted.controller.api.integration.secrets.TenantSecretStore;
+import com.yahoo.vespa.hosted.controller.api.integration.user.User;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.api.role.RoleDefinition;
 import com.yahoo.vespa.hosted.controller.api.role.SecurityContext;
@@ -1718,7 +1719,19 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         TenantName tenant = TenantName.from(tenantName);
         Inspector requestObject = toSlime(request.getData()).get();
         controller.tenants().create(accessControlRequests.specification(tenant, requestObject),
-                                    accessControlRequests.credentials(tenant, requestObject, request.getJDiscRequest()));
+                accessControlRequests.credentials(tenant, requestObject, request.getJDiscRequest()));
+        if (controller.system().isPublic()) {
+            User user = getAttribute(request, User.ATTRIBUTE_NAME, User.class);
+            TenantInfo info = controller.tenants().require(tenant, CloudTenant.class)
+                    .info()
+                    .withContactName(user.name())
+                    .withContactEmail(user.email());
+            // Store changes
+            controller.tenants().lockOrThrow(tenant, LockedTenant.Cloud.class, lockedTenant -> {
+                lockedTenant = lockedTenant.withInfo(info);
+                controller.tenants().store(lockedTenant);
+            });
+        }
         return tenant(controller.tenants().require(TenantName.from(tenantName)), request);
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java
index a6d061e7c80..2fd8026319b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerCloudTest.java
@@ -92,15 +92,7 @@ public class ControllerContainerCloudTest extends ControllerContainerTest {
             Request request = new Request("http://localhost:8080" + path, data, method, principal);
             request.getAttributes().put(SecurityContext.ATTRIBUTE_NAME, new SecurityContext(principal, roles));
             if (user != null) {
-                Map<String, String> userAttributes = new HashMap<>();
-                userAttributes.put("email", user.email());
-                if (user.name() != null)
-                    userAttributes.put("name", user.name());
-                if (user.nickname() != null)
-                    userAttributes.put("nickname", user.nickname());
-                if (user.picture() != null)
-                    userAttributes.put("picture", user.picture());
-                request.getAttributes().put(User.ATTRIBUTE_NAME, Map.copyOf(userAttributes));
+                request.getAttributes().put(User.ATTRIBUTE_NAME, user);
             }
             request.getHeaders().put("Content-Type", contentType);
             return request;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
index 537f6c48bdf..a93e9f55e30 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
@@ -67,9 +67,16 @@ public class UserApiTest extends ControllerContainerCloudTest {
         tester.assertResponse(request("/application/v4/tenant/my-tenant", POST)
                                       .roles(operator)
                                       .principal("administrator@tenant")
+                                      .user(new User("administrator@tenant", "administrator", "admin", "picture"))
                                       .data("{\"token\":\"hello\"}"),
                               new File("tenant-without-applications.json"));
 
+        // GET at tenant/info with contact information.
+        tester.assertResponse(request("/application/v4/tenant/my-tenant/info")
+                        .roles(operator)
+                        .principal("administrator@tenant"),
+                new File("tenant-info-after-created.json"));
+
         // GET at user/v1 root fails as no access control is defined there.
         tester.assertResponse(request("/user/v1/"),
                               accessDenied, 403);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json
new file mode 100644
index 00000000000..942b5c1db45
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-info-after-created.json
@@ -0,0 +1,8 @@
+{
+  "name": "",
+  "email": "",
+  "website":"",
+  "invoiceEmail":"",
+  "contactName": "administrator",
+  "contactEmail": "administrator@tenant"
+}
\ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
index 7cc1a51a114..54585767d51 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-keys.json
@@ -1,6 +1,7 @@
 {
   "tenant": "my-tenant",
   "type": "CLOUD",
+  "creator": "administrator@tenant",
   "pemDeveloperKeys": [
     {
       "key": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuKVFA8dXk43kVfYKzkUqhEY2rDT9\nz/4jKSTHwbYR8wdsOSrJGVEUPbS2nguIJ64OJH7gFnxM6sxUVj+Nm2HlXw==\n-----END PUBLIC KEY-----\n",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
index 1662484ade8..1cd2fb41263 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/tenant-with-secrets.json
@@ -1,6 +1,7 @@
 {
   "tenant": "my-tenant",
   "type": "CLOUD",
+  "creator": "administrator@tenant",
   "pemDeveloperKeys": [
     {
       "key": "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEFELzPyinTfQ/sZnTmRp5E4Ve/sbE\npDhJeqczkyFcT2PysJ5sZwm7rKPEeXDOhzTPCyRvbUqc2SGdWbKUGGa/Yw==\n-----END PUBLIC KEY-----\n",