diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-06-07 15:35:22 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:32 +0200 |
commit | cf8562045b641389a7b728e1d8e5a586590c63c4 (patch) | |
tree | a46e5537179a5704c526f266fdb074b12606a7f6 | |
parent | 03b90ed087e37ddacd5bc2e31e6442111b90d61d (diff) |
Remove application folder support
2 files changed, 5 insertions, 21 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 75abf94bf0e..53557bafcb0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -811,14 +811,6 @@ public class ControllerTest { } @Test - public void testDeployApplicationPackageWithApplicationDir() { - ApplicationPackage applicationPackage = new ApplicationPackageBuilder() - .region("us-west-1") - .build(true); - tester.newDeploymentContext().submit(applicationPackage); - } - - @Test public void testDeployApplicationWithWarnings() { var context = tester.newDeploymentContext(); ApplicationPackage applicationPackage = new ApplicationPackageBuilder() diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java index 490731ca06a..b0ba4287e89 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/ApplicationPackageBuilder.java @@ -337,23 +337,15 @@ public class ApplicationPackageBuilder { } public ApplicationPackage build() { - return build(false); - } - - public ApplicationPackage build(boolean useApplicationDir) { - String dir = ""; - if (useApplicationDir) { - dir = "application/"; - } ByteArrayOutputStream zip = new ByteArrayOutputStream(); try (ZipOutputStream out = new ZipOutputStream(zip)) { out.setLevel(Deflater.NO_COMPRESSION); // This is for testing purposes so we skip compression for performance - writeZipEntry(out, dir + "deployment.xml", deploymentSpec()); - writeZipEntry(out, dir + "validation-overrides.xml", validationOverrides()); - writeZipEntry(out, dir + "search-definitions/test.sd", searchDefinition()); - writeZipEntry(out, dir + "build-meta.json", buildMeta(compileVersion)); + writeZipEntry(out, "deployment.xml", deploymentSpec()); + writeZipEntry(out, "validation-overrides.xml", validationOverrides()); + writeZipEntry(out, "search-definitions/test.sd", searchDefinition()); + writeZipEntry(out, "build-meta.json", buildMeta(compileVersion)); if (!trustedCertificates.isEmpty()) { - writeZipEntry(out, dir + "security/clients.pem", X509CertificateUtils.toPem(trustedCertificates).getBytes(UTF_8)); + writeZipEntry(out, "security/clients.pem", X509CertificateUtils.toPem(trustedCertificates).getBytes(UTF_8)); } } catch (IOException e) { throw new UncheckedIOException(e); |