summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-11-08 11:42:05 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-11-08 11:44:58 +0100
commit4b632e8a210a6487975ffd9b2959c4f4af673b5d (patch)
tree0409aaeaa8c45d5e739bb9bdad8789a4aec52380 /controller-server
parent95bda19dcb52647c5b8fa84fa9b6e244987c9021 (diff)
Move dryrun deploy to separate path
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
index 8e5376f9b9c..08bb7628080 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
@@ -49,18 +49,19 @@ class SystemFlagsHandler extends LoggingRequestHandler {
private HttpResponse put(HttpRequest request) {
Path path = new Path(request.getUri());
- if (path.matches(API_PREFIX + "/deploy")) return deploy(request);
+ if (path.matches(API_PREFIX + "/deploy")) return deploy(request, /*dryRun*/false);
+ if (path.matches(API_PREFIX + "/dryrun")) return deploy(request, /*dryRun*/true);
return ErrorResponse.notFoundError("Nothing at " + path);
}
- private HttpResponse deploy(HttpRequest request) {
+ private HttpResponse deploy(HttpRequest request, boolean dryRun) {
// TODO Error handling
String contentType = request.getHeader("Content-Type");
if (!contentType.equalsIgnoreCase("application/zip")) {
return ErrorResponse.badRequest("Invalid content type: " + contentType);
}
SystemFlagsDataArchive archive = SystemFlagsDataArchive.fromZip(request.getData());
- SystemFlagsDeployResult result = deployer.deployFlags(archive, request.getBooleanProperty("dry-run"));
+ SystemFlagsDeployResult result = deployer.deployFlags(archive, dryRun);
return new JacksonJsonResponse<>(200, result.toWire());
}