qontract-reconcile 0.10.1rc975__py3-none-any.whl → 0.10.1rc977__py3-none-any.whl

reconcile/test/test_saasherder.py

@@ -1487,39 +1487,39 @@ def test_render_templated_parameters(
     assert saas_file.resource_templates[0].targets[0].secret_parameters == [
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="no-template",
-            secret=dict(
-                path="path/to/secret",
-                field="secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/to/secret",
+                "field": "secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="ignore-go-template",
-            secret=dict(
-                path="path/{{ .GO_PARAM }}/secret",
-                field="{{ .GO_PARAM }}-secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/{{ .GO_PARAM }}/secret",
+                "field": "{{ .GO_PARAM }}-secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="template-param-1",
-            secret=dict(
-                path="path/appsres03ue1/test-namespace/secret",
-                field="secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/appsres03ue1/test-namespace/secret",
+                "field": "secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="template-param-2",
-            secret=dict(
-                path="path/appsres03ue1/test-namespace/secret",
-                field="App-SRE-stage-secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/appsres03ue1/test-namespace/secret",
+                "field": "App-SRE-stage-secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
     ]
 
@@ -1549,38 +1549,38 @@ def test_render_templated_parameters_in_init(
     assert saas_file.resource_templates[0].targets[0].secret_parameters == [
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="no-template",
-            secret=dict(
-                path="path/to/secret",
-                field="secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/to/secret",
+                "field": "secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="ignore-go-template",
-            secret=dict(
-                path="path/{{ .GO_PARAM }}/secret",
-                field="{{ .GO_PARAM }}-secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/{{ .GO_PARAM }}/secret",
+                "field": "{{ .GO_PARAM }}-secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="template-param-1",
-            secret=dict(
-                path="path/appsres03ue1/test-namespace/secret",
-                field="secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/appsres03ue1/test-namespace/secret",
+                "field": "secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
         SaasResourceTemplateTargetV2_SaasSecretParametersV1(
             name="template-param-2",
-            secret=dict(
-                path="path/appsres03ue1/test-namespace/secret",
-                field="App-SRE-stage-secret_key",
-                version=1,
-                format=None,
-            ),
+            secret={
+                "path": "path/appsres03ue1/test-namespace/secret",
+                "field": "App-SRE-stage-secret_key",
+                "version": 1,
+                "format": None,
+            },
         ),
     ]

reconcile/test/test_sql_query.py

@@ -107,7 +107,7 @@ def setup_mocks(
     mocked_queries.get_app_interface_settings.return_value = {}
     mocked_queries.get_app_interface_sql_queries.return_value = [sql_query]
     mocked_state = create_autospec(State)
-    mocked_state.ls.return_value = [f"/{k}" for k in state.keys()]
+    mocked_state.ls.return_value = [f"/{k}" for k in state]
     mocked_state.__getitem__.side_effect = lambda x: state[x]
     mocked_secret_reader = mocker.patch("reconcile.sql_query.SecretReader")
     mocked_secret_reader.return_value.read_all_secret.return_value = (

reconcile/test/test_terraform_cloudflare_resources.py

@@ -166,23 +166,23 @@ def mock_app_interface_vault_settings(mocker):
 
 
 def secret_reader_side_effect(*args):
-    if {
+    if args[0] == {
         "path": "aws-account-path",
         "field": "token",
         "version": 1,
         "q_format": "plain",
-    } == args[0]:
+    }:
         aws_acct_creds = {}
         aws_acct_creds["aws_access_key_id"] = "key_id"
         aws_acct_creds["aws_secret_access_key"] = "access_key"
         return aws_acct_creds
 
-    if {
+    if args[0] == {
         "path": "cf-account-path",
         "field": "key",
         "version": 1,
         "q_format": "plain",
-    } == args[0]:
+    }:
         cf_acct_creds = {}
         cf_acct_creds["api_token"] = "api_token"
         cf_acct_creds["account_id"] = "account_id"
@@ -289,8 +289,8 @@ def test_cloudflare_accounts_validation(
     with caplog.at_level(logging.INFO), pytest.raises(SystemExit) as sample:
         integ.run(True, None, False, 10)
     assert sample.value.code == 0
-    assert ["No Cloudflare accounts were detected, nothing to do."] == [
-        rec.message for rec in caplog.records
+    assert [rec.message for rec in caplog.records] == [
+        "No Cloudflare accounts were detected, nothing to do."
     ]
 
 
@@ -313,8 +313,8 @@ def test_namespace_validation(
     with caplog.at_level(logging.INFO), pytest.raises(SystemExit) as sample:
         integ.run(True, None, False, 10)
     assert sample.value.code == 0
-    assert ["No namespaces were detected, nothing to do."] == [
-        rec.message for rec in caplog.records
+    assert [rec.message for rec in caplog.records] == [
+        "No namespaces were detected, nothing to do."
     ]
 
 
@@ -356,27 +356,27 @@ def test_cloudflare_namespace_validation(
     with caplog.at_level(logging.INFO), pytest.raises(SystemExit) as sample:
         integ.run(True, None, False, 10)
     assert sample.value.code == 0
-    assert ["No cloudflare namespaces were detected, nothing to do."] == [
-        rec.message for rec in caplog.records
+    assert [rec.message for rec in caplog.records] == [
+        "No cloudflare namespaces were detected, nothing to do."
     ]
 
 
 def custom_ssl_secret_reader_side_effect(*args):
     """For use of secret_reader inside cloudflare client"""
-    if {
+    if args[0] == {
         "path": "certificate/secret/cert/path",
         "field": "certificate.crt",
         "version": 1,
         "q_format": "plain",
-    } == args[0]:
+    }:
         return "----- CERTIFICATE -----"
 
-    if {
+    if args[0] == {
         "path": "certificate/secret/cert/path",
         "field": "certificate.key",
         "version": 1,
         "q_format": "plain",
-    } == args[0]:
+    }:
         return "----- KEY -----"
 
 

reconcile/test/test_terraform_cloudflare_users.py

@@ -426,23 +426,23 @@ def app_interface_settings_cloudflare_and_vault():
 
 
 def secret_reader_side_effect(*args):
-    if {
+    if args[0] == {
         "path": "some-path",
         "field": "some-field",
         "version": None,
         "q_format": None,
-    } == args[0]:
+    }:
         aws_acct_creds = {}
         aws_acct_creds["aws_access_key_id"] = "key_id"
         aws_acct_creds["aws_secret_access_key"] = "access_key"
         return aws_acct_creds
 
-    if {
+    if args[0] == {
         "path": "creds",
         "field": "some-field",
         "version": None,
         "q_format": None,
-    } == args[0]:
+    }:
         cf_acct_creds = {}
         cf_acct_creds["api_token"] = "api_token"
         cf_acct_creds["account_id"] = "account_id"

reconcile/test/test_terraform_resources.py

@@ -449,22 +449,22 @@ def test_terraform_resources_runner_dry_run(
 
     defer = MagicMock()
 
-    runner_params = dict(
-        accounts=[{"name": "a"}],
-        account_names={"a"},
-        tf_namespaces=[],
-        tf=tf,
-        ts=ts,
-        secret_reader=secret_reader,
-        dry_run=True,
-        enable_deletion=False,
-        thread_pool_size=10,
-        internal=None,
-        use_jump_host=True,
-        light=False,
-        vault_output_path="",
-        defer=defer,
-    )
+    runner_params = {
+        "accounts": [{"name": "a"}],
+        "account_names": {"a"},
+        "tf_namespaces": [],
+        "tf": tf,
+        "ts": ts,
+        "secret_reader": secret_reader,
+        "dry_run": True,
+        "enable_deletion": False,
+        "thread_pool_size": 10,
+        "internal": None,
+        "use_jump_host": True,
+        "light": False,
+        "vault_output_path": "",
+        "defer": defer,
+    }
 
     result = integ.runner(**runner_params)
 
@@ -494,22 +494,22 @@ def test_terraform_resources_runner_no_dry_run(
     mocked_ob = mocker.patch("reconcile.terraform_resources.ob")
     mocked_ob.realize_data.return_value = [{"action": "applied"}]
 
-    runner_params = dict(
-        accounts=[{"name": "a"}],
-        account_names={"a"},
-        tf_namespaces=[],
-        tf=tf,
-        ts=ts,
-        secret_reader=secret_reader,
-        dry_run=False,
-        enable_deletion=False,
-        thread_pool_size=10,
-        internal=None,
-        use_jump_host=True,
-        light=False,
-        vault_output_path="",
-        defer=defer,
-    )
+    runner_params = {
+        "accounts": [{"name": "a"}],
+        "account_names": {"a"},
+        "tf_namespaces": [],
+        "tf": tf,
+        "ts": ts,
+        "secret_reader": secret_reader,
+        "dry_run": False,
+        "enable_deletion": False,
+        "thread_pool_size": 10,
+        "internal": None,
+        "use_jump_host": True,
+        "light": False,
+        "vault_output_path": "",
+        "defer": defer,
+    }
 
     result = integ.runner(**runner_params)
 

reconcile/test/test_terraform_tgw_attachments.py

@@ -1124,7 +1124,7 @@ def test_duplicate_tgw_connection_names(
     with pytest.raises(integ.ValidationError) as e:
         integ.run(True)
 
-    assert "duplicate tgw connection names found" == str(e.value)
+    assert str(e.value) == "duplicate tgw connection names found"
 
 
 def test_missing_vpc_id(
@@ -1149,7 +1149,7 @@ def test_missing_vpc_id(
     with pytest.raises(RuntimeError) as e:
         integ.run(True)
 
-    assert "Could not find VPC ID for cluster" == str(e.value)
+    assert str(e.value) == "Could not find VPC ID for cluster"
 
 
 def test_error_in_tf_plan(
@@ -1176,7 +1176,7 @@ def test_error_in_tf_plan(
     with pytest.raises(RuntimeError) as e:
         integ.run(True)
 
-    assert "Error running terraform plan" == str(e.value)
+    assert str(e.value) == "Error running terraform plan"
 
 
 def test_disabled_deletions_detected_in_tf_plan(
@@ -1203,7 +1203,7 @@ def test_disabled_deletions_detected_in_tf_plan(
     with pytest.raises(RuntimeError) as e:
         integ.run(True)
 
-    assert "Disabled deletions detected running terraform plan" == str(e.value)
+    assert str(e.value) == "Disabled deletions detected running terraform plan"
 
 
 def test_error_in_terraform_apply(
@@ -1230,7 +1230,7 @@ def test_error_in_terraform_apply(
     with pytest.raises(RuntimeError) as e:
         integ.run(False)
 
-    assert "Error running terraform apply" == str(e.value)
+    assert str(e.value) == "Error running terraform apply"
 
 
 def test_early_exit_desired_state(

reconcile/typed_queries/saas_files.py

@@ -235,7 +235,7 @@ class SaasFileList:
                 except JsonPathParserError as e:
                     raise ParameterError(
                         f"Invalid jsonpath expression in namespaceSelector '{selector}' :{e}"
-                    )
+                    ) from None
 
         return self._matching_namespaces_cache[selector]
 

reconcile/unleash_feature_toggles/integration.py

@@ -141,7 +141,7 @@ class UnleashTogglesIntegration(
             except KeyError:
                 raise ValueError(
                     f"[{instance.name}/{project_id}/{add.name}] Invalid feature toggle type '{add.unleash.q_type}', Possible values are: {', '.join(FeatureToggleType.__members__)}"
-                )
+                ) from None
             if not dry_run:
                 client.create_feature_toggle(
                     project_id=project_id,
@@ -161,7 +161,7 @@ class UnleashTogglesIntegration(
             except KeyError:
                 raise ValueError(
                     f"[{instance.name}/{project_id}/{change.current.name}] Invalid feature toggle type '{change.desired.unleash.q_type}', Possible values are: {', '.join(FeatureToggleType.__members__)}"
-                )
+                ) from None
             if not dry_run:
                 client.update_feature_toggle(
                     project_id=project_id,

reconcile/utils/aggregated_list.py

@@ -92,7 +92,7 @@ class AggregatedDiffRunner:
         self.actions = []
 
     def register(self, on, action, cond=None):
-        if on not in self.diff.keys():
+        if on not in self.diff:
             raise Exception(f"Unknown diff key for 'on': {on}")
         self.actions.append((on, action, cond))
 

reconcile/utils/aws_api.py

@@ -818,7 +818,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         assume_role may be None for ROSA (CCS) clusters where we own the account
         """
         required_keys = ["name", "assume_region"]
-        ok = all(elem in account.keys() for elem in required_keys)
+        ok = all(elem in account for elem in required_keys)
         if not ok:
             account_name = account.get("name")
             raise KeyError(f"[{account_name}] account is missing required keys")

reconcile/utils/aws_api_typed/iam.py

@@ -41,7 +41,9 @@ class AWSApiIam:
             user = self.client.create_user(UserName=user_name)
             return AWSUser(**user["User"])
         except self.client.exceptions.EntityAlreadyExistsException:
-            raise AWSEntityAlreadyExistsException(f"User {user_name} already exists")
+            raise AWSEntityAlreadyExistsException(
+                f"User {user_name} already exists"
+            ) from None
 
     def attach_user_policy(self, user_name: str, policy_arn: str) -> None:
         """Attach a policy to a user."""
@@ -62,4 +64,4 @@ class AWSApiIam:
             if self.get_account_alias() != account_alias:
                 raise ValueError(
                     "Account alias already exists for another AWS account. Choose another one!"
-                )
+                ) from None

reconcile/utils/aws_api_typed/service_quotas.py

@@ -64,7 +64,7 @@ class AWSApiServiceQuotas:
         except self.client.exceptions.ResourceAlreadyExistsException:
             raise AWSResourceAlreadyExistsException(
                 f"Service quota increase request {service_code=}, {quota_code=} already exists."
-            )
+            ) from None
 
     def get_service_quota(self, service_code: str, quota_code: str) -> AWSQuota:
         """Return the current value of the service quota."""
@@ -76,4 +76,4 @@ class AWSApiServiceQuotas:
         except self.client.exceptions.NoSuchResourceException:
             raise AWSNoSuchResourceException(
                 f"Service quota {service_code=}, {quota_code=} not found."
-            )
+            ) from None

reconcile/utils/binary.py

@@ -42,7 +42,7 @@ def binary_version(binary, version_args, search_regex, expected_versions):
                     f"Could not execute binary '{binary}' "
                     f"for binary version check: {e}"
                 )
-                raise Exception(msg)
+                raise Exception(msg) from e
 
             found = False
             match = None

reconcile/utils/clusterhealth/telemeter.py

@@ -1,4 +1,4 @@
-from functools import cache
+from functools import lru_cache
 
 from reconcile.utils.clusterhealth.providerbase import (
     ClusterHealth,
@@ -13,9 +13,11 @@ TELEMETER_SOURCE = "telemeter"
 class TelemeterClusterHealthProvider(ClusterHealthProvider):
     def __init__(self, querier: PrometheusQuerier):
         self.querier = querier
+        self.cluster_health_for_org = lru_cache(maxsize=None)(
+            self._cluster_health_for_org
+        )
 
-    @cache
-    def cluster_health_for_org(self, org_id: str) -> dict[str, ClusterHealth]:
+    def _cluster_health_for_org(self, org_id: str) -> dict[str, ClusterHealth]:
         vectors_by_cluster = group_by(
             self.querier.instant_vector_query(telemeter_alert_query(org_id)),
             lambda v: v.mandatory_label("_id"),

reconcile/utils/config.py

@@ -35,7 +35,7 @@ def read(secret):
             config = config[t]
         return config[field]
     except Exception as e:
-        raise SecretNotFound(f"key not found in config file {path}: {str(e)}")
+        raise SecretNotFound(f"key not found in config file {path}: {str(e)}") from None
 
 
 def read_all(secret):
@@ -47,4 +47,6 @@ def read_all(secret):
             config = config[t]
         return config
     except Exception as e:
-        raise SecretNotFound(f"secret {path} not found in config file: {str(e)}")
+        raise SecretNotFound(
+            f"secret {path} not found in config file: {str(e)}"
+        ) from None

reconcile/utils/expiration.py

@@ -39,6 +39,6 @@ def filter(roles: DictsOrRoles | None) -> DictsOrRoles:
         except ValueError:
             raise ValueError(
                 f"{key} field is not formatted as YYYY-MM-DD, currently set as {expiration_date}"
-            )
+            ) from None
 
     return cast(DictsOrRoles, filtered)

reconcile/utils/external_resources.py

@@ -62,10 +62,7 @@ def get_provision_providers(namespace_info: Mapping[str, Any]) -> set[str]:
 
 
 def managed_external_resources(namespace_info: Mapping[str, Any]) -> bool:
-    if namespace_info.get("managedExternalResources"):
-        return True
-
-    return False
+    return bool(namespace_info.get("managedExternalResources"))
 
 
 def get_inventory_count_combinations(
@@ -141,7 +138,7 @@ class ResourceValueResolver:
         resource = self._spec.resource
 
         keys_to_add = [
-            key for key in self._spec.resource.keys() if key not in self._IGNORE_KEYS
+            key for key in self._spec.resource if key not in self._IGNORE_KEYS
         ]
 
         defaults_path = resource.get("defaults", None)
@@ -176,7 +173,7 @@ class ResourceValueResolver:
             values.pop("$schema", None)
         except anymarkup.AnyMarkupError:
             e_msg = "Could not parse data. Skipping resource: {}"
-            raise FetchResourceError(e_msg.format(path))
+            raise FetchResourceError(e_msg.format(path)) from None
         return values
 
     @staticmethod
@@ -185,7 +182,7 @@ class ResourceValueResolver:
         try:
             raw_values = gqlapi.get_resource(path)
         except gql.GqlGetResourceError as e:
-            raise FetchResourceError(str(e))
+            raise FetchResourceError(str(e)) from e
         return raw_values
 
     @staticmethod

reconcile/utils/git.py

@@ -39,9 +39,7 @@ def has_uncommited_changes() -> bool:
     result = subprocess.run(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=True
     )
-    if result.stdout:
-        return True
-    return False
+    return bool(result.stdout)
 
 
 def show_uncommited_changes() -> str:

reconcile/utils/gitlab_api.py

@@ -239,10 +239,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
     def get_project_maintainers(
         self, repo_url: str | None = None, query: dict | None = None
     ) -> list[str] | None:
-        if repo_url is None:
-            project = self.project
-        else:
-            project = self.get_project(repo_url)
+        project = self.project if repo_url is None else self.get_project(repo_url)
         if project is None:
             return None
         if query:

reconcile/utils/glitchtip/client.py

@@ -181,7 +181,12 @@ class GlitchtipClient(ApiBase):
         return User(
             **self._post(
                 f"/api/0/organizations/{organization_slug}/members/",
-                data={"email": email, "role": role, "teams": []},
+                data={
+                    "email": email,
+                    "send_invite": False,
+                    "orgRole": role,
+                    "teamRoles": [],
+                },
             )
         )
 
@@ -194,7 +199,7 @@ class GlitchtipClient(ApiBase):
         return User(
             **self._put(
                 f"/api/0/organizations/{organization_slug}/members/{pk}/",
-                data={"role": role},
+                data={"orgRole": role},
             )
         )
 

reconcile/utils/gql.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import textwrap
 import threading
@@ -44,10 +45,8 @@ def capture_and_forget(error):
     :type error: Exception
     """
 
-    try:
+    with contextlib.suppress(Exception):
         capture_exception(error)
-    except Exception:
-        pass
 
 
 class GqlApiError(Exception):
@@ -142,11 +141,13 @@ class GqlApi:
                 gql(query), variables, get_execution_result=True
             ).formatted
         except requests.exceptions.ConnectionError as e:
-            raise GqlApiError(f"Could not connect to GraphQL server ({e})")
+            raise GqlApiError(f"Could not connect to GraphQL server ({e})") from None
         except TransportQueryError as e:
-            raise GqlApiError(f"`error` returned with GraphQL response {e}")
+            raise GqlApiError(f"`error` returned with GraphQL response {e}") from None
         except AssertionError:
-            raise GqlApiError("`data` field missing from GraphQL response payload")
+            raise GqlApiError(
+                "`data` field missing from GraphQL response payload"
+            ) from None
         except Exception as e:
             raise GqlApiError("Unexpected error occurred") from e
 
@@ -187,7 +188,7 @@ class GqlApi:
             if q_result:
                 templates = q_result["templates"]
         except GqlApiError:
-            raise GqlGetResourceError(path, "Template not found.")
+            raise GqlGetResourceError(path, "Template not found.") from None
 
         if len(templates) != 1:
             raise GqlGetResourceError(path, "Expecting one and only one template.")
@@ -212,7 +213,7 @@ class GqlApi:
                 "resources"
             ]
         except GqlApiError:
-            raise GqlGetResourceError(path, "Resource not found.")
+            raise GqlGetResourceError(path, "Resource not found.") from None
 
         if len(resources) != 1:
             raise GqlGetResourceError(path, "Expecting one and only one resource.")