Merge pull request #484 from pehala/reorg_kube

Reorganize kubernetes package

testsuite/gateway/envoy/route.py

@@ -7,7 +7,7 @@
 if typing.TYPE_CHECKING:
     from testsuite.kubernetes.client import KubernetesClient
     from testsuite.backend import Backend
-    from testsuite.policy.authorization.auth_config import AuthConfig
+    from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
 
 
 class EnvoyVirtualRoute(GatewayRoute):

testsuite/gateway/exposers.py

@@ -3,7 +3,7 @@
 from testsuite.certificates import Certificate
 from testsuite.gateway import Exposer, Gateway, Hostname
 from testsuite.httpx import KuadrantClient, ForceSNIClient
-from testsuite.kubernetes.route import OpenshiftRoute
+from testsuite.kubernetes.openshift.route import OpenshiftRoute
 
 
 class OpenShiftExposer(Exposer):

testsuite/gateway/gateway_api/gateway.py

@@ -8,7 +8,7 @@
 from testsuite.gateway import Gateway
 from testsuite.kubernetes.client import KubernetesClient
 from testsuite.kubernetes import KubernetesObject
-from testsuite.policy import Policy
+from testsuite.kuadrant.policy import Policy
 from testsuite.utils import check_condition
 
 

testsuite/gateway/gateway_api/route.py

@@ -8,7 +8,7 @@
 from testsuite.gateway import Gateway, GatewayRoute, PathMatch, MatchType, RouteMatch
 from testsuite.kubernetes.client import KubernetesClient
 from testsuite.kubernetes import KubernetesObject, modify
-from testsuite.policy import Policy
+from testsuite.kuadrant.policy import Policy
 from testsuite.utils import asdict, check_condition
 
 if typing.TYPE_CHECKING:

testsuite/kubernetes/kuadrant.py → testsuite/kuadrant/__init__.py

@@ -1,4 +1,4 @@
-"""Kuadrant CR object"""
+"""Kuadrant CR"""
 
 import dataclasses
 

testsuite/policy/authorization/sections.py → testsuite/kuadrant/policy/authorization/sections.py

@@ -2,7 +2,7 @@
 
 from typing import Literal, Iterable, TYPE_CHECKING, Union
 
-from testsuite.policy.authorization import (
+from testsuite.kuadrant.policy.authorization import (
     Credentials,
     Rule,
     Pattern,

testsuite/policy/dns_policy.py → testsuite/kuadrant/policy/dns.py

@@ -2,7 +2,7 @@
 
 from testsuite.gateway import Referencable
 from testsuite.kubernetes.client import KubernetesClient
-from testsuite.policy import Policy
+from testsuite.kuadrant.policy import Policy
 
 
 class DNSPolicy(Policy):

testsuite/policy/rate_limit_policy.py → testsuite/kuadrant/policy/rate_limit.py

@@ -7,8 +7,8 @@
 from testsuite.gateway import Referencable, RouteMatch
 from testsuite.kubernetes import modify
 from testsuite.kubernetes.client import KubernetesClient
-from testsuite.policy import Policy
-from testsuite.policy.authorization import Rule
+from testsuite.kuadrant.policy import Policy
+from testsuite.kuadrant.policy.authorization import Rule
 from testsuite.utils import asdict
 
 

testsuite/policy/tls_policy.py → testsuite/kuadrant/policy/tls.py

@@ -2,7 +2,7 @@
 
 from testsuite.gateway import Referencable
 from testsuite.kubernetes.client import KubernetesClient
-from testsuite.policy import Policy, has_condition
+from testsuite.kuadrant.policy import Policy, has_condition
 
 
 class TLSPolicy(Policy):

testsuite/kubernetes/client.py

@@ -6,7 +6,7 @@
 import openshift_client as oc
 from openshift_client import Context, OpenShiftPythonException
 
-from .route import OpenshiftRoute
+from testsuite.kubernetes.openshift.route import OpenshiftRoute
 from .secret import Secret
 
 

testsuite/kubernetes/route.py → testsuite/kubernetes/openshift/route.py

@@ -1,4 +1,4 @@
-"""Module containing Route related stuff"""
+"""Module containing OpenShift Route"""
 
 from functools import cached_property
 

testsuite/kubernetes/metrics/prometheus.py → testsuite/prometheus.py

@@ -7,7 +7,7 @@
 from apyproxy import ApyProxy
 from httpx import Client
 
-from .service_monitor import ServiceMonitor
+from testsuite.kubernetes.service_monitor import ServiceMonitor
 
 
 def _params(key: str = "", labels: dict[str, str] = None) -> dict[str, str]:

testsuite/tests/kuadrantctl/cli/test_simple_auth.py

@@ -4,7 +4,7 @@
 
 from testsuite.httpx.auth import HttpxOidcClientAuth
 from testsuite.oas import as_tmp_file
-from testsuite.policy.authorization.auth_policy import AuthPolicy
+from testsuite.kuadrant.policy.authorization.auth_policy import AuthPolicy
 
 
 @pytest.fixture(scope="module")

testsuite/tests/kuadrantctl/cli/test_simple_limit.py

@@ -6,7 +6,7 @@
 import pytest
 
 from testsuite.oas import as_tmp_file
-from testsuite.policy.rate_limit_policy import Limit, RateLimitPolicy
+from testsuite.kuadrant.policy.rate_limit import Limit, RateLimitPolicy
 from testsuite.utils import asdict
 
 

testsuite/tests/multicluster/conftest.py

@@ -13,9 +13,9 @@
 from testsuite.gateway.gateway_api.hostname import DNSPolicyExposer
 from testsuite.gateway.gateway_api.route import HTTPRoute
 from testsuite.kubernetes.client import KubernetesClient
-from testsuite.policy import Policy
-from testsuite.policy.dns_policy import DNSPolicy
-from testsuite.policy.tls_policy import TLSPolicy
+from testsuite.kuadrant.policy import Policy
+from testsuite.kuadrant.policy.dns import DNSPolicy
+from testsuite.kuadrant.policy.tls import TLSPolicy
 
 
 AnyPolicy = TypeVar("AnyPolicy", bound=Policy)

testsuite/tests/singlecluster/authorino/authorization/opa/test_authorization_services.py

@@ -14,7 +14,7 @@
 from keycloak import KeycloakOpenIDConnection, KeycloakUMA
 
 from testsuite.httpx.auth import HttpxOidcClientAuth
-from testsuite.policy.authorization import JsonResponse, ValueFrom, Pattern
+from testsuite.kuadrant.policy.authorization import JsonResponse, ValueFrom, Pattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/caching/metadata/test_caching.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import ValueFrom, Cache
+from testsuite.kuadrant.policy.authorization import ValueFrom, Cache
 from testsuite.utils import extract_response
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/caching/metadata/test_ttl.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import ValueFrom, Cache
+from testsuite.kuadrant.policy.authorization import ValueFrom, Cache
 from testsuite.utils import extract_response
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_authorization_condition.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern
+from testsuite.kuadrant.policy.authorization import Pattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_identity_condition.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern
+from testsuite.kuadrant.policy.authorization import Pattern
 from testsuite.httpx.auth import HeaderApiKeyAuth
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_metadata_condition.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern
+from testsuite.kuadrant.policy.authorization import Pattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/conditions/section_conditions/test_response_condition.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern, Value, JsonResponse
+from testsuite.kuadrant.policy.authorization import Pattern, Value, JsonResponse
 from testsuite.utils import extract_response
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/conditions/test_patternref_expressions.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern, PatternRef, AnyPattern, AllPattern
+from testsuite.kuadrant.policy.authorization import Pattern, PatternRef, AnyPattern, AllPattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/conditions/test_top_level_condition.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Pattern
+from testsuite.kuadrant.policy.authorization import Pattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/conftest.py

@@ -5,8 +5,8 @@
 from testsuite.httpx.auth import HttpxOidcClientAuth
 from testsuite.kubernetes.client import KubernetesClient
 from testsuite.kubernetes.api_key import APIKey
-from testsuite.policy.authorization.auth_config import AuthConfig
-from testsuite.kubernetes.authorino import AuthorinoCR, Authorino, PreexistingAuthorino
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
+from testsuite.kuadrant.authorino import AuthorinoCR, Authorino, PreexistingAuthorino
 
 
 @pytest.fixture(scope="session")

testsuite/tests/singlecluster/authorino/dinosaur/conftest.py

@@ -8,7 +8,7 @@
 from testsuite.httpx.auth import HttpxOidcClientAuth
 from testsuite.oidc.keycloak import Keycloak
 from testsuite.utils import ContentType
-from testsuite.policy.authorization import Pattern, PatternRef, Value, ValueFrom, DenyResponse
+from testsuite.kuadrant.policy.authorization import Pattern, PatternRef, Value, ValueFrom, DenyResponse
 
 
 @pytest.fixture(scope="session")

testsuite/tests/singlecluster/authorino/identity/api_key/test_auth_credentials.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Credentials
+from testsuite.kuadrant.policy.authorization import Credentials
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/identity/extended_properties/test_extended_properties.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Value, ValueFrom
+from testsuite.kuadrant.policy.authorization import Value, ValueFrom
 from testsuite.utils import extract_response
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/identity/extended_properties/test_overwriting.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Value
+from testsuite.kuadrant.policy.authorization import Value
 from testsuite.utils import extract_response
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/identity/extended_properties/test_token_normalization.py

@@ -1,7 +1,7 @@
 """https://github.com/Kuadrant/authorino/blob/main/docs/user-guides/token-normalization.md"""
 
 import pytest
-from testsuite.policy.authorization import Pattern, Value, ValueFrom
+from testsuite.kuadrant.policy.authorization import Pattern, Value, ValueFrom
 from testsuite.httpx.auth import HeaderApiKeyAuth, HttpxOidcClientAuth
 
 pytestmark = [pytest.mark.authorino]

testsuite/tests/singlecluster/authorino/identity/keycloak/test_auth_credentials.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Credentials
+from testsuite.kuadrant.policy.authorization import Credentials
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/identity/keycloak/test_keycloak_context.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import ValueFrom, JsonResponse
+from testsuite.kuadrant.policy.authorization import ValueFrom, JsonResponse
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/metadata/test_user_info.py

@@ -6,7 +6,7 @@
 import pytest
 
 from testsuite.httpx.auth import HttpxOidcClientAuth
-from testsuite.policy.authorization import Pattern
+from testsuite.kuadrant.policy.authorization import Pattern
 
 pytestmark = [pytest.mark.authorino]
 

testsuite/tests/singlecluster/authorino/metrics/conftest.py

@@ -8,7 +8,8 @@
 from testsuite.gateway.envoy import Envoy
 from testsuite.httpx import KuadrantClient
 from testsuite.kubernetes.config_map import ConfigMap
-from testsuite.kubernetes.metrics import ServiceMonitor, MetricsEndpoint, Prometheus
+from testsuite.kubernetes.service_monitor import ServiceMonitor, MetricsEndpoint
+from testsuite.prometheus import Prometheus
 
 
 @pytest.fixture(scope="module")

testsuite/tests/singlecluster/authorino/metrics/test_deep_metrics.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from testsuite.policy.authorization import Value, JsonResponse
+from testsuite.kuadrant.policy.authorization import Value, JsonResponse
 
 pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only]
 

testsuite/tests/singlecluster/authorino/operator/clusterwide/conftest.py

@@ -3,7 +3,7 @@
 import pytest
 
 from testsuite.gateway.envoy.route import EnvoyVirtualRoute
-from testsuite.policy.authorization.auth_config import AuthConfig
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
 
 
 @pytest.fixture(scope="module")

testsuite/tests/singlecluster/authorino/operator/clusterwide/test_wildcard_collision.py

@@ -4,8 +4,8 @@
 
 import pytest
 
-from testsuite.policy.authorization import Value, JsonResponse
-from testsuite.policy.authorization.auth_config import AuthConfig
+from testsuite.kuadrant.policy.authorization import Value, JsonResponse
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
 
 pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only]
 

testsuite/tests/singlecluster/authorino/operator/conftest.py

@@ -3,7 +3,7 @@
 import pytest
 
 from testsuite.gateway.envoy import Envoy
-from testsuite.kubernetes.authorino import AuthorinoCR, Authorino
+from testsuite.kuadrant.authorino import AuthorinoCR, Authorino
 
 
 @pytest.fixture(scope="module")

testsuite/tests/singlecluster/authorino/operator/raw_http/conftest.py

@@ -3,10 +3,10 @@
 import pytest
 
 from testsuite.gateway.exposers import LoadBalancerServiceExposer
-from testsuite.policy.authorization import Value, JsonResponse
+from testsuite.kuadrant.policy.authorization import Value, JsonResponse
 from testsuite.httpx import KuadrantClient
-from testsuite.policy.authorization.auth_config import AuthConfig
-from testsuite.kubernetes.route import OpenshiftRoute
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
+from testsuite.kubernetes.openshift.route import OpenshiftRoute
 
 
 @pytest.fixture(scope="module")

testsuite/tests/singlecluster/authorino/operator/sharding/conftest.py

@@ -2,9 +2,9 @@
 
 import pytest
 
-from testsuite.policy.authorization import Value, JsonResponse
+from testsuite.kuadrant.policy.authorization import Value, JsonResponse
 from testsuite.gateway.envoy import Envoy
-from testsuite.policy.authorization.auth_config import AuthConfig
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
 from testsuite.gateway.envoy.route import EnvoyVirtualRoute
 
 

testsuite/tests/singlecluster/authorino/operator/sharding/test_preexisting_auth.py

@@ -3,7 +3,7 @@
 import pytest
 from weakget import weakget
 
-from testsuite.kubernetes.authorino import AuthorinoCR
+from testsuite.kuadrant.authorino import AuthorinoCR
 
 pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only]
 

testsuite/tests/singlecluster/authorino/operator/test_wildcard.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from testsuite.policy.authorization.auth_config import AuthConfig
+from testsuite.kuadrant.policy.authorization.auth_config import AuthConfig
 
 pytestmark = [pytest.mark.authorino, pytest.mark.standalone_only]