Remove tenant-pipeline API path (and clean up after athensDomains)

6 files changed, 7 insertions, 50 deletions

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 664a310c966..d4ef127348a 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
@@ -168,7 +168,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         if (path.matches("/application/v4/")) return root(request);
         if (path.matches("/application/v4/user")) return authenticatedUser(request);
         if (path.matches("/application/v4/tenant")) return tenants(request);
-        if (path.matches("/application/v4/tenant-pipeline")) return tenantPipelines();
         if (path.matches("/application/v4/property")) return properties();
         if (path.matches("/application/v4/tenant/{tenant}")) return tenant(path.get("tenant"), request);
         if (path.matches("/application/v4/tenant/{tenant}/application")) return applications(path.get("tenant"), request);
@@ -256,7 +255,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
     private HttpResponse root(HttpRequest request) {
         return recurseOverTenants(request)
                 ? recursiveRoot(request)
-                : new ResourceResponse(request, "user", "tenant", "tenant-pipeline", "athensDomain", "property");
+                : new ResourceResponse(request, "user", "tenant", "property");
     }
 
     private HttpResponse authenticatedUser(HttpRequest request) {
@@ -286,24 +285,6 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         return new SlimeJsonResponse(slime);
     }
 
-    /** Lists the screwdriver project id for each application */
-    private HttpResponse tenantPipelines() {
-        Slime slime = new Slime();
-        Cursor response = slime.setObject();
-        Cursor pipelinesArray = response.setArray("tenantPipelines");
-        for (Application application : controller.applications().asList()) {
-            if ( ! application.deploymentJobs().projectId().isPresent()) continue;
-
-            Cursor pipelineObject = pipelinesArray.addObject();
-            pipelineObject.setString("screwdriverId", String.valueOf(application.deploymentJobs().projectId().getAsLong()));
-            pipelineObject.setString("tenant", application.id().tenant().value());
-            pipelineObject.setString("application", application.id().application().value());
-            pipelineObject.setString("instance", application.id().instance().value());
-        }
-        response.setArray("brokenTenantPipelines"); // not used but may need to be present
-        return new SlimeJsonResponse(slime);
-    }
-
     private HttpResponse properties() {
         Slime slime = new Slime();
         Cursor response = slime.setObject();
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java
index 1640cb8f5ba..be77c7ed337 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/PathGroup.java
@@ -32,11 +32,11 @@ public enum PathGroup {
     onboardingUser("/application/v4/user"),
 
     /** Paths used for creating tenants with access control */
-    onboardingTenant("/application/v4/tenant/{ignored}"),
+    onboarding("/application/v4/tenant/{ignored}"),
 
     /** Read-only paths used when onboarding tenants */
-    onboardingTenantInformation("/athenz/v1/",
-                                "/athenz/v1/domains"),
+    onboardingInfo("/athenz/v1/",
+                   "/athenz/v1/domains"),
 
     /** Paths used for user management */
     userManagement("/user/v1/{*}"), // TODO probably add tenant and application levels.
@@ -44,8 +44,7 @@ public enum PathGroup {
     /** Paths used by tenant administrators */
     tenantInfo("/application/v4/",
                "/application/v4/property/",
-               "/application/v4/tenant/",
-               "/application/v4/tenant-pipeline/"),
+               "/application/v4/tenant/"),
 
     /** Paths used by tenant administrators */
     tenant(Matcher.tenant,
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/Policy.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/Policy.java
index 62d87355387..9c09cb193da 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/Policy.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/role/Policy.java
@@ -35,10 +35,10 @@ public enum Policy {
                           .on(PathGroup.onboardingUser)
                           .in(SystemName.main, SystemName.cd, SystemName.dev),
                  Privilege.grant(Action.create)
-                          .on(PathGroup.onboardingTenant)
+                          .on(PathGroup.onboarding)
                           .in(SystemName.main, SystemName.cd, SystemName.dev), // TODO System.all()
                  Privilege.grant(Action.read)
-                          .on(PathGroup.onboardingTenantInformation)
+                          .on(PathGroup.onboardingInfo)
                           .in(SystemName.main, SystemName.cd, SystemName.dev),
                  Privilege.grant(Action.read)
                           .on(PathGroup.all())
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 6b7da3d2458..57a05e602cc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -351,10 +351,6 @@ public class ApplicationApiTest extends ControllerContainerTest {
                                       .oktaAccessToken(OKTA_AT),
                               "");
 
-        // GET tenant screwdriver projects
-        tester.assertResponse(request("/application/v4/tenant-pipeline/", GET)
-                                      .userIdentity(USER_ID),
-                              new File("tenant-pipelines.json"));
         setDeploymentMaintainedInfo(controllerTester);
         // GET tenant application deployments
         tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1", GET)
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json
index 233d35ceb2e..38b54dd9efa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/root.json
@@ -7,12 +7,6 @@
       "url":"http://localhost:8080/application/v4/tenant/"
     },
     {
-      "url":"http://localhost:8080/application/v4/tenant-pipeline/"
-    },
-    {
-      "url":"http://localhost:8080/application/v4/athensDomain/"
-    },
-    {
       "url":"http://localhost:8080/application/v4/property/"
     }
   ]
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-pipelines.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-pipelines.json
deleted file mode 100644
index 4e6fef1b994..00000000000
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/tenant-pipelines.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "tenantPipelines": [
-    {
-      "screwdriverId": "123",
-      "tenant": "tenant1",
-      "application": "application1",
-      "instance": "default"
-    }
-  ],
-  "brokenTenantPipelines": [
-
-  ]
-}
\ No newline at end of file