1 files changed, 3 insertions, 31 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
index 6c603a1da7b..2afe7417787 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/PathGroup.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.role;
 
 import com.yahoo.restapi.Path;
@@ -72,22 +72,6 @@ enum PathGroup {
                        "/application/v4/tenant/{tenant}/archive-access/aws",
                        "/application/v4/tenant/{tenant}/archive-access/gcp"),
 
-
-    billingToken(Matcher.tenant,
-                 "/billing/v1/tenant/{tenant}/token"),
-
-    billingInstrument(Matcher.tenant,
-                      "/billing/v1/tenant/{tenant}/instrument/{*}"),
-
-    billingPlan(Matcher.tenant,
-            "/billing/v1/tenant/{tenant}/plan/{*}"),
-
-    billingCollection(Matcher.tenant,
-            "/billing/v1/tenant/{tenant}/collection/{*}"),
-
-    billingList(Matcher.tenant,
-                "/billing/v1/tenant/{tenant}/billing/{*}"),
-
     billing(Matcher.tenant,
             "/billing/v2/tenant/{tenant}/{*}"),
 
@@ -234,6 +218,7 @@ enum PathGroup {
                "/badge/v1/{*}",     // Badges for deployment jobs.
                "/zone/v1/{*}",      // Lists environment and regions.
                "/cli/v1/{*}",       // Public information for Vespa CLI.
+               "/pricing/v1/{*}",   // Pricing information
                "/.well-known/{*}"),
 
     /** Paths used for deploying system-wide feature flags. */
@@ -246,11 +231,6 @@ enum PathGroup {
     /** Paths used for receiving payment callbacks */
     paymentProcessor("/payment/notification"),
 
-    /** Paths used for invoice management */
-    hostedAccountant("/billing/v1/invoice/{*}",
-                     "/billing/v1/billing",
-                     "/billing/v1/plans"),
-
     /** Path used for listing endpoint certificate request and re-requesting endpoint certificates */
     endpointCertificates("/endpointcertificates/"),
 
@@ -321,20 +301,12 @@ enum PathGroup {
 
     static Set<PathGroup> operatorRestrictedPaths() {
         var paths = billingPathsNoToken();
-        paths.add(PathGroup.billingToken);
         paths.add(accessRequestApproval);
         return paths;
     }
 
     static Set<PathGroup> billingPathsNoToken() {
-        return EnumSet.of(
-                PathGroup.billingCollection,
-                PathGroup.billingInstrument,
-                PathGroup.billingList,
-                PathGroup.billingPlan,
-                PathGroup.billing,
-                PathGroup.hostedAccountant
-        );
+        return EnumSet.of(PathGroup.billing);
     }
 
     /** Returns whether this group matches path in given context */