diff options
author | jonmv <venstad@gmail.com> | 2023-05-16 09:56:32 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-05-16 09:56:32 +0200 |
commit | c25de505eda05b6252c1dc71f933b3e1a536df94 (patch) | |
tree | 121e5e799bad5714ff4fa80f4d029e44bb4b7f18 /controller-server | |
parent | 0d21043fd9b6f1182daf53a4ff0464cba7daa92d (diff) |
Verify tenant has an acceptable plan when deploying to manual zones too
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 7 |
1 files changed, 5 insertions, 2 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 f911bde9535..b16fadfd230 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 @@ -2428,6 +2428,8 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { if ( ! type.environment().isManuallyDeployed() && ! (isOperator(request) || controller.system().isCd())) throw new IllegalArgumentException("Direct deployments are only allowed to manually deployed environments."); + controller.applications().verifyPlan(id.tenant()); + Map<String, byte[]> dataParts = parseDataParts(request); if ( ! dataParts.containsKey("applicationZip")) throw new IllegalArgumentException("Missing required form part 'applicationZip'"); @@ -3047,6 +3049,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { } private HttpResponse submit(String tenant, String application, HttpRequest request) { + TenantName tenantName = TenantName.from(tenant); + controller.applications().verifyPlan(tenantName); + Map<String, byte[]> dataParts = parseDataParts(request); Inspector submitOptions = SlimeUtils.jsonToSlime(dataParts.get(EnvironmentResource.SUBMIT_OPTIONS)).get(); long projectId = submitOptions.field("projectId").asLong(); // Absence of this means it's not a prod app :/ @@ -3072,8 +3077,6 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { byte[] testPackage = dataParts.getOrDefault(APPLICATION_TEST_ZIP, new byte[0]); Submission submission = new Submission(applicationPackage, testPackage, sourceUrl, sourceRevision, authorEmail, description, controller.clock().instant(), risk); - TenantName tenantName = TenantName.from(tenant); - controller.applications().verifyPlan(tenantName); controller.applications().verifyApplicationIdentityConfiguration(tenantName, Optional.empty(), Optional.empty(), |