diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-08-25 17:06:47 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-08-25 17:06:47 +0200 |
| commit | ab22c2320230889336f7ad5c3f642c6598d367cb (patch) | |
| tree | d9d33cefc7a54bfaeae821179becf30c8ae740c4 /controller-server/src/test/java/com | |
| parent | 1d5ffb9f0996c44f1b1fa29fd9773a14b477973c (diff) | |
Allow deployment of application package without deployOptions
Diffstat (limited to 'controller-server/src/test/java/com')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 57397cfd856..2f514bd05cd 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -1367,7 +1367,6 @@ public class ApplicationApiTest extends ControllerContainerTest { .data(entity) .userIdentity(userId), "{\"message\":\"Deployment started in run 1 of dev-us-east-1 for tenant1.application1.new-user. This may take about 15 minutes the first time.\",\"run\":1}"); - } @Test @@ -1426,6 +1425,20 @@ public class ApplicationApiTest extends ControllerContainerTest { "{\"message\":\"Deployment started in run 2 of dev-us-east-1 for sandbox.myapp. This may take about 15 minutes the first time.\",\"run\":2}", 200); + + // POST (deploy) an application package as content type application/zip — not multipart + tester.assertResponse(request("/application/v4/tenant/sandbox/application/myapp/instance/default/deploy/dev-us-east-1", POST) + .data(applicationPackageInstance1.zippedContent()) + .contentType("application/zip") + .userIdentity(developer2), + "{\"message\":\"Deployment started in run 3 of dev-us-east-1 for sandbox.myapp. This may take about 15 minutes the first time.\",\"run\":3}"); + + // POST (deploy) an application package not as content type application/zip — not multipart — is disallowed + tester.assertResponse(request("/application/v4/tenant/sandbox/application/myapp/instance/default/deploy/dev-us-east-1", POST) + .data(applicationPackageInstance1.zippedContent()) + .contentType("application/gzip") + .userIdentity(developer2), + "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Expected a multipart or application/zip message, but got Content-Type: application/gzip\"}", 400); } @Test |