Merge pull request #8679 from vespa-engine/hmusum/do-not-set-application-name-when-creating-session

Do not set application name when creating a session

3 files changed, 2 insertions, 25 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
index 26ef79ebe02..86b2b0d5887 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandler.java
@@ -11,7 +11,6 @@ import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.jdisc.application.UriPattern;
-import com.yahoo.log.LogLevel;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.server.ApplicationRepository;
 import com.yahoo.vespa.config.server.deploy.DeployHandlerLogger;
@@ -61,9 +60,8 @@ public class SessionCreateHandler extends SessionHandler {
             sessionId = applicationRepository.createSessionFromExisting(applicationId, logger, false, timeoutBudget);
         } else {
             validateDataAndHeader(request);
-            String name = getNameProperty(request, logger);
-            // TODO: we are always using instance name 'default' here, fix
-            ApplicationId applicationId = ApplicationId.from(tenantName, ApplicationName.from(name), InstanceName.defaultName());
+            // TODO: Avoid using application id here at all
+            ApplicationId applicationId = ApplicationId.from(tenantName, ApplicationName.defaultName(), InstanceName.defaultName());
             sessionId = applicationRepository.createSession(applicationId, timeoutBudget, request.getData(), request.getHeader(ApplicationApiHandler.contentTypeHeader));
         }
         return createResponse(request, tenantName, deployLog, sessionId);
@@ -93,16 +91,6 @@ public class SessionCreateHandler extends SessionHandler {
                                            new ApplicationId.Builder().tenant(tenant).applicationName("-").build());
     }
 
-    private static String getNameProperty(HttpRequest request, DeployLogger logger) {
-        String name = request.getProperty("name");
-        // TODO: Do we need validation of this parameter?
-        if (name == null) {
-            name = "default";
-            logger.log(LogLevel.INFO, "No application name given, using '" + name + "'");
-        }
-        return name;
-    }
-
     static void validateDataAndHeader(HttpRequest request) {
         if (request.getData() == null) {
             throw new BadRequestException("Request contains no data");
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
index cce8f8d18b2..b818c39d433 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
@@ -203,13 +203,11 @@ public class SessionHandlerTest {
         public boolean createFromCalled = false;
         public boolean doThrow = false;
         public File applicationPackage;
-        public String applicationName;
 
         @Override
         public LocalSession createSession(File applicationDirectory, ApplicationId applicationId,
                                           TimeoutBudget timeoutBudget) {
             createCalled = true;
-            this.applicationName = applicationId.application().value();
             if (doThrow) {
                 throw new RuntimeException("foo");
             }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
index 94d3b126bd7..927ac26b77d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/SessionCreateHandlerTest.java
@@ -108,15 +108,6 @@ public class SessionCreateHandlerTest extends SessionHandlerTest {
         HandlerTest.assertHttpStatusCodeErrorCodeAndMessage(response, BAD_REQUEST, HttpErrorResponse.errorCodes.BAD_REQUEST, "Request contains no Content-Type header");
     }
 
-    @Test
-    public void require_that_application_name_is_given_from_parameter() throws IOException {
-        Map<String, String> params = Collections.singletonMap("name", "ulfio");
-        File outFile = CompressedApplicationInputStreamTest.createTarFile();
-        createHandler().handle(post(outFile, postHeaders, params));
-        assertTrue(sessionFactory.createCalled);
-        assertThat(sessionFactory.applicationName, is("ulfio"));
-    }
-
     private void assertFromParameter(String expected, String from) throws IOException {
         HttpRequest request = post(Collections.singletonMap("from", from));
         sessionFactory.applicationPackage = testApp;