qontract-reconcile 0.10.1rc725__py3-none-any.whl → 0.10.1rc727__py3-none-any.whl

{qontract_reconcile-0.10.1rc725.dist-info → qontract_reconcile-0.10.1rc727.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc725
+Version: 0.10.1rc727
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc725.dist-info → qontract_reconcile-0.10.1rc727.dist-info}/RECORD

@@ -1,6 +1,6 @@
 reconcile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/acs_policies.py,sha256=e_kVyP4rGm3fJzq10Anr8scZoPenlmTcoS5REK0d2T0,9144
-reconcile/acs_rbac.py,sha256=YoKu5wTRTtb3EGT0PV3r279LDgvw2ECb-0_0j4suScg,23032
+reconcile/acs_policies.py,sha256=1iRYmMdz0YtqyQgA9O0uGQdmMKUCCe-ApRa6LIEAdps,8769
+reconcile/acs_rbac.py,sha256=JEDevU4AdhTjMW-fAnNG3iw6Od5tYxGuYSirmu9KurI,22657
 reconcile/aws_ami_share.py,sha256=eeu0TI3M5yyUaozyAq_aW3tir-9be4YFguOXvIvKHSo,3757
 reconcile/aws_ecr_image_pull_secrets.py,sha256=TGEc_0nv8oxV2HqA8VdcM4HHP-B1YqmNOOU6FPwVFTY,2328
 reconcile/aws_garbage_collector.py,sha256=ddwU8IKTueAJc0TzymcREr7hcoVui9kOGvdH1B2EcuM,450
@@ -9,7 +9,7 @@ reconcile/aws_iam_password_reset.py,sha256=NwErtrqgBiXr7eGCAHdtGGOx0S7-4JnSc29Ie
 reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=R2WFXUXLTB4sWMi4GeA4eegsuf_1-Q4vH8M0Toh3Ij4,5036
-reconcile/cli.py,sha256=HLfkpQXhNA9YDwNWJUYg8zjm03sCEUIVB6-Ly4FOh48,96572
+reconcile/cli.py,sha256=xAuxjbBPlIeFAnyOhhMYJTthVM_J26Sb6F2WNCb734M,96573
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=SMhkcQqprWvThrIJa3U_3uh5w1h-alleW1QnCJFY4Qw,4909
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=a5aPLVxyqPSbjdB0Ty-uliOtxwvEbbEljHJKxdK3-Zk,4813
@@ -372,7 +372,7 @@ reconcile/oum/models.py,sha256=0ZyCnULRxAbIEXX60BkkPZVg53DCD6ZJ6wnNT2ANROM,1743
 reconcile/oum/providers.py,sha256=3kEjXvsTPzXc7gzrdO7hWqgzcMmMZMpk2S0X7wQUTWU,1767
 reconcile/oum/standalone.py,sha256=bzyV8wz3SrERG9zJRFiJCBzSIGwDNj9sNqUytngDw94,7368
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/prometheus_rules_tester/integration.py,sha256=glzYgt9WXRoVFGaonmYxsQBJ5RNR3HTrgsmwhIWKhgk,9329
+reconcile/prometheus_rules_tester/integration.py,sha256=AahzQ0wEO8VEWqeT-xtmDmG6NMgMdr54jymlcqehwGM,9366
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/rhidp/common.py,sha256=suTh9T4dPOgrKi-rDALgjzCSL9JHGnkTYALFIIjNCJE,6801
 reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
@@ -425,7 +425,7 @@ reconcile/templating/lib/rendering.py,sha256=_BVQ2gqip8K1AgLYfaTWh8NKJFTW6VjUZ6r
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/conftest.py,sha256=rQousYrxUz-EwAIbsYO6bIwR1B4CrOz9y_zaUVo2lfI,4466
 reconcile/test/fixtures.py,sha256=9SDWAUlSd1rCx7z3GhULHcpr-I6FyCsXxaFAZIqYQsQ,591
-reconcile/test/test_acs_policies.py,sha256=hMnCX9KdLRKb53gYXK4JUR5yJwhczJRyyUPywDeLeLg,15716
+reconcile/test/test_acs_policies.py,sha256=pffUzH4IHKuXntvGMi-iV0Epg4YsCBF2G2-R9nYIt40,15699
 reconcile/test/test_acs_rbac.py,sha256=lvNd8GY0-GHzcOdOn13QWdrqbBXXKzNT7EEDHNH7cjM,28272
 reconcile/test/test_aggregated_list.py,sha256=iiWitQuNYC58aimWaiBoE4NROHjr1NCgQ91MnHEG_Ro,6412
 reconcile/test/test_amtool.py,sha256=vxRhGieeydMBOb9UI2ziMHjJa8puMeGNsUhGhy-yMnk,1032
@@ -472,7 +472,7 @@ reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn
 reconcile/test/test_openshift_saas_deploy_trigger_cleaner.py,sha256=cha3bUiXAWPCwrp8XwVC3RNJtJHLcsGTE-F8Zn6XxsU,2852
 reconcile/test/test_openshift_tekton_resources.py,sha256=RtRWsdm51S13OSkENC9nY_rOH0QELSCaO5tjF0XqIDI,11222
 reconcile/test/test_openshift_upgrade_watcher.py,sha256=0GDQ_YFHIX8DbkbDYSuLv9uZeeg4NwP1vlOqvSaZvN4,7183
-reconcile/test/test_prometheus_rules_tester.py,sha256=Qc9J4k0lSVie361lGr_cOy0EaBTD5LDqGZf7CYVFKr8,5677
+reconcile/test/test_prometheus_rules_tester.py,sha256=cgVkPM3KcAw69bOkJ6iR2Lfog_WgblyoqVRtXv4ly7o,5685
 reconcile/test/test_quay_membership.py,sha256=e29Giz5S9ckFgjpTO8PBo8qVPocIQmy4WqsRhgTFd9A,2643
 reconcile/test/test_quay_mirror.py,sha256=UBLQDtet5WkWnh98ev5cI3yAflQl07awg2dXTefqoUk,6311
 reconcile/test/test_quay_mirror_org.py,sha256=67XwB0WkqO6l9SeR9cSfjODyt-P587Kvqvam7hR8rLQ,3008
@@ -654,7 +654,7 @@ reconcile/utils/vault.py,sha256=S0eHqvZ9N3fya1E8YDaUffEvLk_fdtpzL4rvWn6f828,1499
 reconcile/utils/vaultsecretref.py,sha256=3Ed2uBy36TzSvL0B-l4FoWQqB2SbBKDKEuUPIO608Bo,931
 reconcile/utils/vcs.py,sha256=o1r0n_IrU2El75CED_6sjR2GZGM-exuWsj5F7jONaMU,6779
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/acs/base.py,sha256=9XvFQVIbo6JOl5NKN4Mx3_jJc2B7pV12hOnTasm_Emw,2434
+reconcile/utils/acs/base.py,sha256=8qZhCYteLCe3xSIeiNj-HXm6J0nBLFGBbZ7b7xXlA6I,2381
 reconcile/utils/acs/policies.py,sha256=_jAz6cv8KRYtDsXjGoJgNbD8_9PUa5LSwwVlpK4A_cQ,5505
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -764,8 +764,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc725.dist-info/METADATA,sha256=yALTJNiBAy2sBjcpLDBq3aVaZsZhlUKusvBps3BxlU0,2382
-qontract_reconcile-0.10.1rc725.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc725.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc725.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc725.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc727.dist-info/METADATA,sha256=lGusiFpOTOvJIK8nYP813fIHvezdgXL9ojNkgPvpgcU,2382
+qontract_reconcile-0.10.1rc727.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc727.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc727.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc727.dist-info/RECORD,,

reconcile/acs_policies.py

@@ -7,9 +7,6 @@ from reconcile.gql_definitions.acs.acs_policies import (
     AcsPolicyConditionsV1,
     AcsPolicyV1,
 )
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
 from reconcile.utils import gql
 from reconcile.utils.acs.policies import AcsPolicyApi, Policy, PolicyCondition, Scope
 from reconcile.utils.differ import diff_iterables
@@ -17,7 +14,6 @@ from reconcile.utils.runtime.integration import (
     NoParams,
     QontractReconcileIntegration,
 )
-from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 
 # proceeding constants map schema enum values to corresponding acs api defaults
@@ -225,13 +221,8 @@ class AcsPoliciesIntegration(QontractReconcileIntegration[NoParams]):
     ) -> None:
         gqlapi = gql.get_api()
         instance = AcsPolicyApi.get_acs_instance(gqlapi.query)
-
-        vault_settings = get_app_interface_vault_settings()
-        secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-        token = secret_reader.read_all_secret(instance.credentials)
-
         with AcsPolicyApi(
-            instance={"url": instance.url, "token": token[instance.credentials.field]}
+            url=instance.url, token=self.secret_reader.read_secret(instance.credentials)
         ) as acs_api:
             notifiers = acs_api.list_notifiers()
             clusters = acs_api.list_clusters()

reconcile/acs_rbac.py

@@ -10,9 +10,6 @@ from pydantic import BaseModel
 
 from reconcile.gql_definitions.acs.acs_rbac import OidcPermissionAcsV1
 from reconcile.gql_definitions.acs.acs_rbac import query as acs_rbac_query
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
 from reconcile.utils import gql
 from reconcile.utils.acs.rbac import AcsRbacApi, Group, RbacResources
 from reconcile.utils.differ import (
@@ -23,7 +20,6 @@ from reconcile.utils.runtime.integration import (
     NoParams,
     QontractReconcileIntegration,
 )
-from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 
 DEFAULT_ADMIN_SCOPE_NAME = "Unrestricted"
@@ -582,15 +578,10 @@ class AcsRbacIntegration(QontractReconcileIntegration[NoParams]):
     ) -> None:
         gqlapi = gql.get_api()
         instance = AcsRbacApi.get_acs_instance(gqlapi.query)
-
-        vault_settings = get_app_interface_vault_settings()
-        secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-        token = secret_reader.read_all_secret(instance.credentials)
-
         desired = self.get_desired_state(gqlapi.query)
 
         with AcsRbacApi(
-            instance={"url": instance.url, "token": token[instance.credentials.field]}
+            url=instance.url, token=self.secret_reader.read_secret(instance.credentials)
         ) as acs_api:
             rbac_api_resources = acs_api.get_rbac_resources()
             current = self.get_current_state(

reconcile/cli.py

@@ -3019,7 +3019,7 @@ def prometheus_rules_tester(ctx, thread_pool_size, cluster_name):
         reconcile.prometheus_rules_tester.integration,
         ctx.obj,
         thread_pool_size,
-        cluster_name=cluster_name,
+        cluster_names=cluster_name,
     )
 
 

reconcile/prometheus_rules_tester/integration.py

@@ -122,12 +122,12 @@ def fetch_rule_and_tests(
 def get_rules_and_tests(
     vault_settings: AppInterfaceSettingsV1,
     thread_pool_size: int,
-    cluster_name: Optional[str] = None,
+    cluster_names: Optional[Iterable[str]] = None,
 ) -> list[Test]:
     """Iterates through all namespaces and returns a list of tests to run"""
     namespace_with_prom_rules, _ = orb.get_namespaces(
         PROVIDERS,
-        cluster_names=[cluster_name] if cluster_name else [],
+        cluster_names=cluster_names if cluster_names else [],
         namespace_name=NAMESPACE_NAME,
     )
 
@@ -225,14 +225,14 @@ def check_rules_and_tests(
     vault_settings: AppInterfaceSettingsV1,
     alerting_services: Iterable[str],
     thread_pool_size: int,
-    cluster_name: Optional[str] = None,
+    cluster_names: Optional[Iterable[str]] = None,
 ) -> list[Test]:
     """Fetch rules and associated tests, run checks on rules and tests if they exist
     and return a list of failed checks/tests"""
     tests = get_rules_and_tests(
         vault_settings=vault_settings,
         thread_pool_size=thread_pool_size,
-        cluster_name=cluster_name,
+        cluster_names=cluster_names,
     )
     threaded.run(
         func=run_test,
@@ -247,14 +247,14 @@ def check_rules_and_tests(
 
 
 def run(
-    dry_run: bool, thread_pool_size: int, cluster_name: Optional[str] = None
+    dry_run: bool, thread_pool_size: int, cluster_names: Optional[Iterable[str]] = None
 ) -> None:
     """Check prometheus rules syntax and run the tests associated to them"""
     orb.QONTRACT_INTEGRATION = QONTRACT_INTEGRATION
     orb.QONTRACT_INTEGRATION_VERSION = QONTRACT_INTEGRATION_VERSION
 
     failed_tests = check_rules_and_tests(
-        cluster_name=cluster_name,
+        cluster_names=cluster_names,
         vault_settings=get_app_interface_vault_settings(),
         alerting_services=get_alerting_services(),
         thread_pool_size=thread_pool_size,

reconcile/test/test_acs_policies.py

@@ -311,7 +311,7 @@ def test_get_current_state(
             specific_custom_policy_2,
         ],
     )
-    with AcsPolicyApi(instance={"url": "foo", "token": "bar"}) as acs:
+    with AcsPolicyApi(url="foo", token="bar") as acs:
         assert sorted(acs.get_custom_policies(), key=lambda p: p.name) == sorted(
             modeled_acs_policies, key=lambda p: p.name
         )

reconcile/test/test_prometheus_rules_tester.py

@@ -69,7 +69,7 @@ class TestPrometheusRulesTester:
             vault_settings=self.vault_settings,
             alerting_services=self.alerting_services,
             thread_pool_size=THREAD_POOL_SIZE,
-            cluster_name=cluster_name,
+            cluster_names=cluster_name,
         )
 
     def test_ok_non_templated(self) -> None:
@@ -136,16 +136,16 @@ class TestPrometheusRulesTester:
         self.ns_data = self.fxt.get_anymarkup("ns-bad-test.yaml")
         mocker_alerting_services.return_value = {"yak-shaver"}
         mocker_vault_settings.return_value = AppInterfaceSettingsV1(vault=False)
-        cluster_name = "appint-ex-01"
+        cluster_name = ("appint-ex-01",)
 
         with pytest.raises(SystemExit) as exc:
-            run(False, THREAD_POOL_SIZE, cluster_name=cluster_name)
+            run(False, THREAD_POOL_SIZE, cluster_names=cluster_name)
 
         assert exc.value.code == ExitCodes.ERROR
 
         error_msg = (
             "Error checking rule bad-test.prometheusrules.yaml "
             "from namespace openshift-customer-monitoring in "
-            f"cluster {cluster_name}: Error running promtool command"
+            f"cluster {cluster_name[0]}: Error running promtool command"
         )
         assert error_msg in caplog.text

reconcile/utils/acs/base.py

@@ -7,22 +7,21 @@ from typing import (
 )
 
 import requests
+from pydantic import BaseModel
 
 from reconcile.gql_definitions.acs.acs_instances import AcsInstanceV1
 from reconcile.gql_definitions.acs.acs_instances import query as acs_instances_query
 from reconcile.utils.exceptions import AppInterfaceSettingsError
 
 
-class AcsBaseApi:
-    def __init__(
-        self,
-        instance: Any,
-        timeout: int = 30,
-    ) -> None:
-        self.base_url = instance["url"]
-        self.token = instance["token"]
-        self.timeout = timeout
-        self.session = requests.Session()
+class AcsBaseApi(BaseModel):
+    url: str
+    token: str
+    timeout: int = 30
+    session: requests.Session = requests.Session()
+
+    class Config:
+        arbitrary_types_allowed = True
 
     def __enter__(self) -> Self:
         return self
@@ -58,7 +57,7 @@ class AcsBaseApi:
     def generic_request(
         self, path: str, verb: str, json: Optional[Any] = None
     ) -> requests.Response:
-        url = f"{self.base_url}{path}"
+        url = f"{self.url}{path}"
         headers = {
             "Authorization": f"Bearer {self.token}",
         }