Validate file extension for files in application package

Start validating file extension for files application package subdirectories,
only a subset of subdirectories handled for now

1 files changed, 18 insertions, 15 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
index 9071b12507e..cb4b0e9d5bd 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandlerTest.java
@@ -29,7 +29,6 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -123,7 +122,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_that_activate_url_is_returned_on_success() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertNotNull(response);
         assertEquals(OK, response.getStatus());
@@ -141,7 +140,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_verbose() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         HttpResponse response = createHandler().handle(
                 createTestRequest(pathPrefix, HttpRequest.Method.PUT, Cmd.PREPARED, sessionId, "?verbose=true"));
         System.out.println(getRenderedString(response));
@@ -151,7 +150,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_get_response_activate_url_on_ok() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         request(HttpRequest.Method.PUT, sessionId);
         HttpResponse getResponse = request(HttpRequest.Method.GET, sessionId);
         assertResponseContains(getResponse, "\"activate\":\"http://foo:1337" + pathPrefix +
@@ -160,7 +159,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_get_response_error_on_not_prepared() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
 
         HttpResponse getResponse = request(HttpRequest.Method.GET, sessionId);
         assertHttpStatusCodeErrorCodeAndMessage(getResponse, BAD_REQUEST,
@@ -186,7 +185,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_that_tenant_is_in_response() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertNotNull(response);
         assertEquals(OK, response.getStatus());
@@ -200,7 +199,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         TenantName defaultTenant = TenantName.from("test2");
         tenantRepository.addTenant(defaultTenant);
         ApplicationId applicationId1 = ApplicationId.from(defaultTenant, ApplicationName.from("app"), InstanceName.defaultName());
-        long sessionId = applicationRepository.createSession(applicationId1, timeoutBudget, app);
+        long sessionId = createSession(applicationId1);
 
         pathPrefix = "/application/v2/tenant/" + defaultTenant + "/session/";
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
@@ -209,7 +208,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
         String applicationName = "myapp";
         ApplicationId applicationId2 = ApplicationId.from(tenant.value(), applicationName, "default");
-        long sessionId2 = applicationRepository.createSession(applicationId2, timeoutBudget, app);
+        long sessionId2 = createSession(applicationId2);
         assertEquals(sessionId, sessionId2);  // Want to test when they are equal (but for different tenants)
 
         pathPrefix = "/application/v2/tenant/" + tenant + "/session/" + sessionId2 +
@@ -219,7 +218,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         assertEquals(SessionHandlerTest.getRenderedString(response), OK, response.getStatus());
 
         ApplicationId applicationId3 = ApplicationId.from(tenant.value(), applicationName, "quux");
-        long sessionId3 = applicationRepository.createSession(applicationId3, timeoutBudget, app);
+        long sessionId3 = createSession(applicationId3);
         pathPrefix = "/application/v2/tenant/" + tenant + "/session/" + sessionId3 +
                 "/prepared?applicationName=" + applicationName + "&instance=quux";
         response = handler.handle(SessionHandlerTest.createTestRequest(pathPrefix));
@@ -229,14 +228,14 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void require_that_config_change_actions_are_in_response() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertResponseContains(response, "\"configChangeActions\":{\"restart\":[],\"refeed\":[],\"reindex\":[]}");
     }
 
     @Test
     public void require_that_config_change_actions_are_not_logged_if_not_existing() throws Exception {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         HttpResponse response = request(HttpRequest.Method.PUT, sessionId);
         assertResponseNotContains(response, "Change(s) between active and new application that may require restart");
         assertResponseNotContains(response, "Change(s) between active and new application that may require re-feed");
@@ -245,7 +244,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void test_out_of_capacity_response() throws IOException {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         String exceptionMessage = "Node allocation failure";
         FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(),
                                                                                 applicationRepository,
@@ -260,7 +259,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void test_that_nullpointerexception_gives_internal_server_error() throws IOException {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         String exceptionMessage = "nullpointer thrown in test handler";
         FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(),
                                                                                 applicationRepository,
@@ -276,7 +275,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
     @Test
     public void test_application_lock_failure() throws IOException {
         String exceptionMessage = "Timed out after waiting PT1M to acquire lock '/provision/v1/locks/foo/bar/default'";
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         FailingSessionPrepareHandler handler = new FailingSessionPrepareHandler(SessionPrepareHandler.testContext(),
                                                                                 applicationRepository,
                                                                                 configserverConfig,
@@ -290,7 +289,7 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
 
     @Test
     public void test_docker_image_repository() {
-        long sessionId = applicationRepository.createSession(applicationId(), timeoutBudget, app);
+        long sessionId = createSession(applicationId());
         String dockerImageRepository = "foo.bar.com:4443/baz";
         request(HttpRequest.Method.PUT, sessionId, Map.of("dockerImageRepository", dockerImageRepository,
                                                           "applicationName", applicationId().application().value()));
@@ -329,6 +328,10 @@ public class SessionPrepareHandlerTest extends SessionHandlerTest {
         return ApplicationId.from(tenant.value(), "app", "default");
     }
 
+    private long createSession(ApplicationId applicationId) {
+        return applicationRepository.createSession(applicationId, timeoutBudget, app);
+    }
+
     private static class FailingSessionPrepareHandler extends SessionPrepareHandler {
 
         private final RuntimeException exceptionToBeThrown;