Merge pull request #20112 from vespa-engine/ogronnesby/supported-plans

Show support pane in UI for tenants on plans w/support

5 files changed, 74 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index 0d12b283543..7e9ae036cc7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -25,6 +25,7 @@ import com.yahoo.vespa.flags.IntFlag;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.Plan;
 import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanId;
 import com.yahoo.vespa.hosted.controller.api.integration.user.Roles;
 import com.yahoo.vespa.hosted.controller.api.integration.user.User;
@@ -176,6 +177,7 @@ public class UserApiHandler extends LoggingRequestHandler {
                 .sorted()
                 .forEach(tenant -> {
                     Cursor tenantObject = tenants.setObject(tenant.value());
+                    tenantObject.setBool("supported", hasSupportedPlan(tenant));
 
                     Cursor tenantRolesObject = tenantObject.setArray("roles");
                     tenantRolesByTenantName.getOrDefault(tenant, List.of())
@@ -405,4 +407,11 @@ public class UserApiHandler extends LoggingRequestHandler {
                 .map(clazz::cast)
                 .orElseThrow(() -> new IllegalArgumentException("Attribute '" + attributeName + "' was not set on request"));
     }
+
+    private boolean hasSupportedPlan(TenantName tenantName) {
+        var planId = controller.serviceRegistry().billingController().getPlan(tenantName);
+        return controller.serviceRegistry().planRegistry().plan(planId)
+                .map(Plan::isSupported)
+                .orElse(false);
+    }
 }
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 1d41beb8a99..537f6c48bdf 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
@@ -8,6 +8,7 @@ import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.controller.ControllerTester;
+import com.yahoo.vespa.hosted.controller.api.integration.billing.PlanId;
 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.restapi.ContainerTester;
@@ -270,4 +271,27 @@ public class UserApiTest extends ControllerContainerCloudTest {
                     new File("user-without-trial-capacity-cloud.json"));
         }
     }
+
+    @Test
+    public void supportTenant() {
+        try (Flags.Replacer ignored = Flags.clearFlagsForTesting(PermanentFlags.MAX_TRIAL_TENANTS.id(), PermanentFlags.ENABLE_PUBLIC_SIGNUP_FLOW.id())) {
+            ContainerTester tester = new ContainerTester(container, responseFiles);
+            ((InMemoryFlagSource) tester.controller().flagSource())
+                    .withIntFlag(PermanentFlags.MAX_TRIAL_TENANTS.id(), 10)
+                    .withBooleanFlag(PermanentFlags.ENABLE_PUBLIC_SIGNUP_FLOW.id(), true);
+            ControllerTester controller = new ControllerTester(tester);
+            User user = new User("dev@domail", "Joe Developer", "dev", null);
+
+            var tenant1 = controller.createTenant("tenant1", Tenant.Type.cloud);
+            var tenant2 = controller.createTenant("tenant2", Tenant.Type.cloud);
+            controller.serviceRegistry().billingController().setPlan(tenant2, PlanId.from("paid"), false);
+
+            tester.assertResponse(
+                    request("/user/v1/user")
+                            .roles(Role.reader(tenant1), Role.reader(tenant2))
+                            .user(user),
+                    new File("user-with-supported-tenant.json"));
+        }
+
+    }
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json
index 006c3b98a4d..0211f595ce7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-athenz.json
@@ -10,6 +10,7 @@
   },
   "tenants": {
     "sandbox": {
+      "supported": (ignore),
       "roles": [
         "administrator",
         "developer",
@@ -17,6 +18,7 @@
       ]
     },
     "tenant1": {
+      "supported": (ignore),
       "roles": [
         "administrator",
         "developer",
@@ -24,6 +26,7 @@
       ]
     },
     "tenant2": {
+      "supported": (ignore),
       "roles": [
         "administrator",
         "developer",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json
index 4ae55e97baa..76904bf9bb4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-applications-cloud.json
@@ -10,17 +10,20 @@
   },
   "tenants": {
     "sandbox": {
+      "supported": false,
       "roles": [
         "developer",
         "reader"
       ]
     },
     "tenant1": {
+      "supported": false,
       "roles": [
         "administrator"
       ]
     },
     "tenant2": {
+      "supported": false,
       "roles": [
         "developer"
       ]
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json
new file mode 100644
index 00000000000..a40354a9e71
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/responses/user-with-supported-tenant.json
@@ -0,0 +1,35 @@
+{
+  "isPublic": true,
+  "isCd": false,
+  "hasTrialCapacity": true,
+  "user": {
+    "name": "Joe Developer",
+    "email": "dev@domail",
+    "nickname": "dev",
+    "verified": false
+  },
+  "tenants": {
+    "tenant1": {
+      "supported": false,
+      "roles": [
+        "reader"
+      ]
+    },
+    "tenant2": {
+      "supported": true,
+      "roles": [
+        "reader"
+      ]
+    }
+  },
+  "flags": [
+    {
+      "id": "enable-public-signup-flow",
+      "rules": [
+        {
+          "value": false
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file