Merge pull request #633 from emmaaroche/gateway-policy-attach-fix

Fix AuthPolicy attachment to Gateway instead of HTTPRoute

testsuite/tests/singlecluster/gateway/conftest.py

@@ -6,6 +6,7 @@
 from testsuite.gateway.gateway_api.gateway import KuadrantGateway
 from testsuite.gateway.gateway_api.hostname import DNSPolicyExposer
 from testsuite.httpx.auth import HttpxOidcClientAuth
+from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy
 from testsuite.kuadrant.policy.dns import DNSPolicy
 from testsuite.kuadrant.policy.tls import TLSPolicy
 
@@ -27,11 +28,12 @@ def gateway(request, cluster, blame, wildcard_domain, module_label):
 
 
 @pytest.fixture(scope="module")
-def authorization(authorization, oidc_provider):
+def authorization(blame, gateway, module_label, cluster, oidc_provider, route):
     # pylint: disable=unused-argument
     """Create AuthPolicy attached to gateway"""
-    authorization.identity.add_oidc("default", oidc_provider.well_known["issuer"])
-    return authorization
+    policy = AuthPolicy.create_instance(cluster, blame("authz"), gateway, labels={"app": module_label})
+    policy.identity.add_oidc("default", oidc_provider.well_known["issuer"])
+    return policy
 
 
 @pytest.fixture(scope="module")

testsuite/tests/singlecluster/gateway/reconciliation/change_targetref/test_update_authpolicy_target_ref.py

@@ -4,19 +4,9 @@
 
 import pytest
 
-from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy
-
 pytestmark = [pytest.mark.kuadrant_only, pytest.mark.dnspolicy]
 
 
-@pytest.fixture(scope="module")
-def authorization(oidc_provider, gateway, cluster, blame, module_label, route):  # pylint: disable=unused-argument
-    """Overwrite the authorization fixture and attach it to the gateway"""
-    policy = AuthPolicy.create_instance(cluster, blame("authz"), gateway, labels={"testRun": module_label})
-    policy.identity.add_oidc("default", oidc_provider.well_known["issuer"])
-    return policy
-
-
 def test_update_auth_policy_target_ref(
     gateway2, authorization, client, client2, auth, dns_policy, dns_policy2, change_target_ref
 ):  # pylint: disable=unused-argument