Inject AthenzClientFactory

2 files changed, 4 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java
index f25deb11a52..8e397366203 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilter.java
@@ -15,6 +15,7 @@ import com.yahoo.vespa.athenz.api.AthenzPrincipal;
 import com.yahoo.vespa.athenz.client.zms.ZmsClientException;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.TenantController;
+import com.yahoo.vespa.hosted.controller.api.integration.athenz.AthenzClientFactory;
 import com.yahoo.vespa.hosted.controller.api.role.Role;
 import com.yahoo.vespa.hosted.controller.api.role.Roles;
 import com.yahoo.vespa.hosted.controller.athenz.ApplicationAction;
@@ -46,9 +47,9 @@ public class AthenzRoleFilter extends CorsRequestFilterBase { // TODO: No need f
     private final Roles roles;
 
     @Inject
-    public AthenzRoleFilter(CorsFilterConfig config, AthenzFacade athenz, Controller controller) {
+    public AthenzRoleFilter(CorsFilterConfig config, AthenzClientFactory athenzClientFactory, Controller controller) {
         super(Set.copyOf(config.allowedUrls()));
-        this.athenz = athenz;
+        this.athenz = new AthenzFacade(athenzClientFactory);
         this.tenants = controller.tenants();
         this.roles = new Roles(controller.system());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilterTest.java
index dc4235e52bf..b48cb4bff50 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/filter/AthenzRoleFilterTest.java
@@ -13,7 +13,6 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.ScrewdriverId;
 import com.yahoo.vespa.hosted.controller.api.role.Roles;
 import com.yahoo.vespa.hosted.controller.athenz.ApplicationAction;
 import com.yahoo.vespa.hosted.controller.athenz.HostedAthenzIdentities;
-import com.yahoo.vespa.hosted.controller.athenz.impl.AthenzFacade;
 import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzClientFactoryMock;
 import com.yahoo.vespa.hosted.controller.athenz.mock.AthenzDbMock;
 import org.junit.Before;
@@ -51,7 +50,7 @@ public class AthenzRoleFilterTest {
     public void setup() {
         tester = new ControllerTester();
         filter = new AthenzRoleFilter(new CorsFilterConfig.Builder().build(),
-                                      new AthenzFacade(new AthenzClientFactoryMock(tester.athenzDb())),
+                                      new AthenzClientFactoryMock(tester.athenzDb()),
                                       tester.controller());
 
         tester.athenzDb().hostedOperators.add(HOSTED_OPERATOR.getIdentity());