Revert "Bjorncs/controller authorization"

1 files changed, 10 insertions, 18 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
index 5e9de74fe1b..c52266dfacc 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java
@@ -5,12 +5,10 @@ import com.yahoo.application.container.handler.Request;
 import com.yahoo.application.container.handler.Request.Method;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
+import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.text.Utf8;
-import com.yahoo.vespa.athenz.api.AthenzIdentity;
-import com.yahoo.vespa.athenz.api.AthenzUser;
 import com.yahoo.vespa.hosted.controller.ConfigServerProxyMock;
 import com.yahoo.vespa.hosted.controller.ZoneRegistryMock;
-import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
 import com.yahoo.vespa.hosted.controller.restapi.ContainerControllerTester;
 import com.yahoo.vespa.hosted.controller.restapi.ControllerContainerTest;
 import org.junit.Before;
@@ -28,7 +26,6 @@ import static org.junit.Assert.assertFalse;
  */
 public class ZoneApiTest extends ControllerContainerTest {
 
-    private static final AthenzIdentity HOSTED_VESPA_OPERATOR = AthenzUser.fromUserId("johnoperator");
     private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/responses/";
     private static final List<ZoneId> zones = Arrays.asList(
             ZoneId.from(Environment.prod, RegionName.from("us-north-1")),
@@ -48,17 +45,16 @@ public class ZoneApiTest extends ControllerContainerTest {
                     .setZones(zones);
         this.tester = new ContainerControllerTester(container, responseFiles);
         this.proxy = (ConfigServerProxyMock) container.components().getComponent(ConfigServerProxyMock.class.getName());
-        addUserToHostedOperatorRole(HOSTED_VESPA_OPERATOR);
     }
 
     @Test
     public void test_requests() throws Exception {
         // GET /zone/v2
-        tester.containerTester().assertResponse(authenticatedRequest("http://localhost:8080/zone/v2"),
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2"),
                                                 new File("root.json"));
 
         // GET /zone/v2/prod/us-north-1
-        tester.containerTester().assertResponse(authenticatedRequest("http://localhost:8080/zone/v2/prod/us-north-1"),
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-1"),
                                                 "ok");
         assertEquals("prod", proxy.lastReceived().get().getEnvironment());
         assertEquals("us-north-1", proxy.lastReceived().get().getRegion());
@@ -66,7 +62,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         assertEquals("GET", proxy.lastReceived().get().getMethod());
 
         // GET /zone/v2/nodes/v2/node/?recursive=true
-        tester.containerTester().assertResponse(authenticatedRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/?recursive=true"),
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/?recursive=true"),
                                                 "ok");
 
         assertEquals("prod", proxy.lastReceived().get().getEnvironment());
@@ -75,7 +71,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         assertEquals("GET", proxy.lastReceived().get().getMethod());
 
         // POST /zone/v2/dev/us-north-2/nodes/v2/command/restart?hostname=node1
-        tester.containerTester().assertResponse(hostedOperatorRequest("http://localhost:8080/zone/v2/dev/us-north-2/nodes/v2/command/restart?hostname=node1",
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/dev/us-north-2/nodes/v2/command/restart?hostname=node1",
                                                             new byte[0], Method.POST),
                                                 "ok");
         assertEquals("dev", proxy.lastReceived().get().getEnvironment());
@@ -84,7 +80,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         assertEquals("POST", proxy.lastReceived().get().getMethod());
 
         // PUT /zone/v2/prod/us-north-1/nodes/v2/state/dirty/node1
-        tester.containerTester().assertResponse(hostedOperatorRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/state/dirty/node1",
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/state/dirty/node1",
                                                             new byte[0], Method.PUT), "ok");
         assertEquals("prod", proxy.lastReceived().get().getEnvironment());
         assertEquals("us-north-1", proxy.lastReceived().get().getRegion());
@@ -92,7 +88,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         assertEquals("PUT", proxy.lastReceived().get().getMethod());
 
         // DELETE /zone/v2/prod/us-north-1/nodes/v2/node/node1
-        tester.containerTester().assertResponse(hostedOperatorRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/node1",
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/node1",
                                                             new byte[0], Method.DELETE), "ok");
         assertEquals("prod", proxy.lastReceived().get().getEnvironment());
         assertEquals("us-north-1", proxy.lastReceived().get().getRegion());
@@ -100,7 +96,7 @@ public class ZoneApiTest extends ControllerContainerTest {
         assertEquals("DELETE", proxy.lastReceived().get().getMethod());
 
         // PATCH /zone/v2/prod/us-north-1/nodes/v2/node/node1
-        tester.containerTester().assertResponse(hostedOperatorRequest("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/node1",
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-1/nodes/v2/node/node1",
                                                             Utf8.toBytes("{\"currentRestartGeneration\": 1}"),
                                                             Method.PATCH), "ok");
         assertEquals("prod", proxy.lastReceived().get().getEnvironment());
@@ -112,15 +108,11 @@ public class ZoneApiTest extends ControllerContainerTest {
 
     @Test
     public void test_invalid_requests() throws Exception {
-        // POST /zone/v2/prod/us-north-34/nodes/v2
-        tester.containerTester().assertResponse(hostedOperatorRequest("http://localhost:8080/zone/v2/prod/us-north-42/nodes/v2",
+        // GET /zone/v2/prod/us-north-34/nodes/v2
+        tester.containerTester().assertResponse(new Request("http://localhost:8080/zone/v2/prod/us-north-42/nodes/v2",
                                                             new byte[0], Method.POST),
                                                 new File("unknown-zone.json"), 400);
         assertFalse(proxy.lastReceived().isPresent());
     }
 
-    private static Request hostedOperatorRequest(String uri, byte[] body, Request.Method method) {
-        return addIdentityToRequest(new Request(uri, body, method), HOSTED_VESPA_OPERATOR);
-    }
-
 }