diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-02-06 14:45:07 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-02-06 14:45:07 +0100 |
| commit | 6be3c25da892ab3cbd036fb99d9c31beed6ac6b3 (patch) | |
| tree | ab87c2af9049aa04941bee558cb84accce0e0b0e /controller-server | |
| parent | c06239a6c424d82280737d821ffe741f55a4cd24 (diff) | |
Ignore deployment spec for non-prod applications (without project ID)
Diffstat (limited to 'controller-server')
2 files changed, 3 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index 3a60c480100..35ec6c8d769 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -52,7 +52,8 @@ import static java.util.stream.Collectors.toUnmodifiableMap; public class DeploymentStatus { public static List<JobId> jobsFor(Application application, SystemName system) { - if (DeploymentSpec.empty.equals(application.deploymentSpec())) + if ( DeploymentSpec.empty.equals(application.deploymentSpec()) + || application.projectId().isEmpty()) return List.of(); return application.deploymentSpec().instances().stream() 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 51c9f51f9b9..ae483d1188e 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 @@ -1997,7 +1997,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse submit(String tenant, String application, HttpRequest request) { Map<String, byte[]> dataParts = parseDataParts(request); Inspector submitOptions = SlimeUtils.jsonToSlime(dataParts.get(EnvironmentResource.SUBMIT_OPTIONS)).get(); - long projectId = Math.max(1, submitOptions.field("projectId").asLong()); + long projectId = Math.max(1, submitOptions.field("projectId").asLong()); // Absence of this means it's not a prod app :/ Optional<String> repository = optional("repository", submitOptions); Optional<String> branch = optional("branch", submitOptions); Optional<String> commit = optional("commit", submitOptions); |