diff options
| author | Morten Tokle <morten.tokle@gmail.com> | 2022-01-03 12:53:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-03 12:53:32 +0100 |
| commit | 75f53faf74ad050c7c8fecb1162cf7de19da3bb6 (patch) | |
| tree | 69498e95e67c6a5e83a89a7c0df378b75174aa8d /controller-api | |
| parent | 68612ee4d57799be7dff7d309ffe473074260cbb (diff) | |
Revert "Allow developers to deploy application in manual zones"
Diffstat (limited to 'controller-api')
3 files changed, 1 insertions, 9 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java index 9fb6fa1501b..4679f660319 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/athenz/ZmsClientMock.java @@ -40,7 +40,7 @@ public class ZmsClientMock implements ZmsClient { private final AthenzDbMock athenz; private final AthenzIdentity controllerIdentity; private static final Pattern TENANT_RESOURCE_PATTERN = Pattern.compile("service\\.hosting\\.tenant\\.(?<tenantDomain>[\\w\\-_]+)\\..*"); - private static final Pattern APPLICATION_RESOURCE_PATTERN = Pattern.compile("service\\.hosting\\.tenant\\.[\\w\\-_]+\\.res_group\\.(?<resourceGroup>[\\w\\-_]+)\\.(?<environment>[.*]+)"); + private static final Pattern APPLICATION_RESOURCE_PATTERN = Pattern.compile("service\\.hosting\\.tenant\\.[\\w\\-_]+\\.res_group\\.(?<resourceGroup>[\\w\\-_]+)\\.wildcard"); public ZmsClientMock(AthenzDbMock athenz, AthenzIdentity controllerIdentity) { this.athenz = athenz; diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Role.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Role.java index c40c2d4db01..5cdd12ecb1c 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Role.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/Role.java @@ -52,11 +52,6 @@ public abstract class Role { return new TenantRole(RoleDefinition.developer, tenant); } - /** Returns a {@link RoleDefinition#hostedDeveloper} for the current system and given tenant. */ - public static TenantRole hostedDeveloper(TenantName tenant) { - return new TenantRole(RoleDefinition.hostedDeveloper, tenant); - } - /** Returns a {@link RoleDefinition#administrator} for the current system and given tenant. */ public static TenantRole administrator(TenantName tenant) { return new TenantRole(RoleDefinition.administrator, tenant); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java index aed5c08f0db..eeb3bae4431 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/role/RoleDefinition.java @@ -60,9 +60,6 @@ public enum RoleDefinition { Policy.billingInformationRead, Policy.secretStoreOperations), - /** Developer for manual deployments for a tenant */ - hostedDeveloper(Policy.developmentDeployment), - /** Admin — the administrative function for user management etc. */ administrator(Policy.tenantUpdate, Policy.tenantManager, |