Remove unused token and make tests comply

5 files changed, 11 insertions, 24 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index f368a17bd10..50d95c232c4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -269,12 +269,11 @@ public class ApplicationController {
     // TODO: Get rid of the options arg
     public ActivateResult deployApplication(ApplicationId applicationId, ZoneId zone,
                                             Optional<ApplicationPackage> applicationPackageFromDeployer,
-                                            DeployOptions options,
-                                            Optional<NToken> token) {
+                                            DeployOptions options) {
         try (Lock lock = lock(applicationId)) {
             LockedApplication application = get(applicationId)
                     .map(app -> new LockedApplication(app, lock))
-                    .orElseGet(() -> new LockedApplication(createApplication(applicationId, token), lock));
+                    .orElseGet(() -> new LockedApplication(createApplication(applicationId, Optional.empty()), lock));
 
             // Determine Vespa version to use
             Version version;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 443c9964cdd..77e0fb1ef05 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -783,7 +783,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
                                                                   .map(ApplicationPackage::new);
         DeployAuthorizer deployAuthorizer = new DeployAuthorizer(controller.zoneRegistry(), athenzClientFactory);
         Tenant tenant = controller.tenants().tenant(new TenantId(tenantName)).orElseThrow(() -> new NotExistsException(new TenantId(tenantName)));
-        AthenzPrincipal principal = authorizer.getPrincipal(request);
+        Principal principal = authorizer.getPrincipal(request);
         deployAuthorizer.throwIfUnauthorizedForDeploy(principal, Environment.from(environment), tenant, applicationId, applicationPackage);
 
         // TODO: get rid of the json object
@@ -794,8 +794,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
         ActivateResult result = controller.applications().deployApplication(applicationId,
                                                                             zone,
                                                                             applicationPackage,
-                                                                            deployOptionsJsonClass,
-                                                                            principal.getNToken());
+                                                                            deployOptionsJsonClass);
         return new SlimeJsonResponse(toSlime(result));
     }
 
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 d28cc305610..46f045df215 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
@@ -842,8 +842,7 @@ public class ControllerTest {
         // Same options as used in our integration tests
         DeployOptions options = new DeployOptions(Optional.empty(), Optional.empty(), false,
                                                   false);
-        tester.controller().applications().deployApplication(app.id(), zone, Optional.of(applicationPackage), options,
-                                                             Optional.of(TestIdentities.userNToken));
+        tester.controller().applications().deployApplication(app.id(), zone, Optional.of(applicationPackage), options);
 
         assertTrue("Application deployed and activated",
                    tester.controllerTester().configServer().activated().getOrDefault(app.id(), false));
@@ -913,7 +912,7 @@ public class ControllerTest {
 
         // Deploy an application which doesn't yet exist, and which has an illegal application name.
         try {
-            tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "123"), zone, Optional.empty(), options, Optional.of(TestIdentities.userNToken));
+            tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "123"), zone, Optional.empty(), options);
             fail("Illegal application name should cause validation exception.");
         }
         catch (IllegalArgumentException e) {
@@ -923,17 +922,9 @@ public class ControllerTest {
         // Sneak an illegal application in the back door.
         tester.createApplication(new ApplicationSerializer().toSlime(new Application(ApplicationId.from("tenant", application, "default"))));
 
-        // Deploy a PR instance for the application, with an NToken.
-        tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "123"), zone, Optional.empty(), options, Optional.of(TestIdentities.userNToken));
-
-        try {
-            // Deploy a different PR instance for the application, with no NToken.
-            tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "456"), zone, Optional.empty(), options, Optional.empty());
-            fail("Athens tenant should not accept a new application to be created without an NToken.");
-        }
-        catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("No NToken provided"));
-        }
+        // Deploy a PR instance for the application, with no NToken.
+        tester.controller().applications().deployApplication(ApplicationId.from("tenant", application, "456"), zone, Optional.empty(), options);
+        assertTrue(tester.controller().applications().get(ApplicationId.from("tenant", application, "456")).isPresent());
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
index 4adc6713358..ccc1798358d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java
@@ -221,8 +221,7 @@ public final class ControllerTester {
         controller().applications().deployApplication(application.id(),
                                                       zone,
                                                       applicationPackage,
-                                                      new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, deployCurrentVersion),
-                                                      Optional.of(TestIdentities.userNToken));
+                                                      new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, deployCurrentVersion));
     }
 
     // Used by ApplicationSerializerTest to avoid breaking encapsulation. Should not be used by anything else
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
index 4a92d671210..5b806d580e2 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerControllerTester.java
@@ -82,8 +82,7 @@ public class ContainerControllerTester {
         controller().applications().deployApplication(application.id(),
                                                     zone,
                                                     Optional.of(applicationPackage),
-                                                    new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, false),
-                                                      Optional.of(TestIdentities.userNToken));
+                                                    new DeployOptions(Optional.of(new ScrewdriverBuildJob(app1ScrewdriverId, app1RevisionId)), Optional.empty(), false, false));
         return application;
     }