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

reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py

@@ -78,7 +78,7 @@ class MRParser:
             attrs = mr.attributes
             desc = str(attrs.get("description", ""))
             parts = desc.split(PROMOTION_DATA_SEPARATOR)
-            if not len(parts) == 2:
+            if len(parts) != 2:
                 logging.info(
                     "Bad data separator format. Closing %s",
                     mr.attributes.get("web_url", "NO_WEBURL"),
@@ -202,7 +202,7 @@ class MRParser:
             is_batchable_str = self._apply_regex(
                 pattern=self._is_batchable_regex, promotion_data=promotion_data
             )
-            if is_batchable_str not in set(["True", "False"]):
+            if is_batchable_str not in {"True", "False"}:
                 logging.info(
                     "Bad %s format. Closing %s",
                     IS_BATCHABLE,

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -163,7 +163,7 @@ def _parse_expression(expression: str) -> Any:
     except JsonPathParserError as e:
         raise RuntimeError(
             f"Invalid jsonpath expression in namespaceSelector '{expression}' :{e}"
-        )
+        ) from None
 
 
 def is_namespace_addressed_by_selector(

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -102,7 +102,6 @@ class SaasFilesInventory:
                     soak_days = (
                         target.promotion.soak_days if target.promotion.soak_days else 0
                     )
-                    resource_template.url
                     subscriber = Subscriber(
                         uid=target.uid(
                             parent_saas_file_name=saas_file.name,

reconcile/skupper_network/integration.py

@@ -55,7 +55,9 @@ def load_site_controller_template(
             resource["content"], undefined=jinja2.StrictUndefined
         ).render(variables)
     except jinja2.exceptions.UndefinedError as e:
-        raise SkupperNetworkExcpetion(f"Failed to render template {path}: {e.message}")
+        raise SkupperNetworkExcpetion(
+            f"Failed to render template {path}: {e.message}"
+        ) from None
     return yaml.safe_load(body)
 
 

reconcile/skupper_network/site_controller.py

@@ -30,14 +30,14 @@ class SiteController:
         """Skupper site token secret."""
         _labels = copy.deepcopy(labels)
         _labels["skupper.io/type"] = "connection-token-request"
-        return dict(
-            apiVersion="v1",
-            kind="Secret",
-            metadata=dict(
-                name=name,
-                labels=_labels,
-            ),
-        )
+        return {
+            "apiVersion": "v1",
+            "kind": "Secret",
+            "metadata": {
+                "name": name,
+                "labels": _labels,
+            },
+        }
 
 
 def get_site_controller(site: SkupperSite) -> SiteController:

reconcile/slack_usergroups.py

@@ -560,7 +560,7 @@ def _update_usergroup_users_from_state(
             desired_ug_state.user_names
         ).items()
     ]
-    active_user_names = set(s.name for s in slack_user_objects)
+    active_user_names = {s.name for s in slack_user_objects}
 
     if len(active_user_names) != len(desired_ug_state.user_names):
         logging.info(
@@ -768,7 +768,7 @@ def run(
 
     gqlapi = gql.get_api()
     secret_reader = SecretReader(queries.get_secret_reader_settings())
-    init_users = False if usergroup_name else True
+    init_users = not usergroup_name
 
     # queries
     permissions = get_permissions(query_func=gqlapi.query)
@@ -804,14 +804,14 @@ def run(
     # merge the two desired states recursively
     desired_state = deep_update(desired_state, desired_state_cluster_usergroups)
 
-    runner_params: RunnerParams = dict(
-        dry_run=dry_run,
-        slack_map=slack_map,
-        desired_state=desired_state,
-        clusters=clusters,
-        workspace_name=workspace_name,
-        usergroup_name=usergroup_name,
-    )
+    runner_params: RunnerParams = {
+        "dry_run": dry_run,
+        "slack_map": slack_map,
+        "desired_state": desired_state,
+        "clusters": clusters,
+        "workspace_name": workspace_name,
+        "usergroup_name": usergroup_name,
+    }
 
     if enable_extended_early_exit:
         extended_early_exit_run(

reconcile/status_board.py

@@ -223,7 +223,7 @@ class StatusBoardExporterIntegration(QontractReconcileIntegration):
                     )
 
         # product is deleted entirely
-        for product_name in diff_result.delete.keys():
+        for product_name in diff_result.delete:
             for application in current_products[product_name].applications or []:
                 return_list.append(
                     StatusBoardHandler(action="delete", status_board_object=application)

reconcile/statuspage/status.py

@@ -73,9 +73,7 @@ class ManualStatusProvider(StatusProvider, BaseModel):
         now = datetime.now(UTC)
         if self.start and now < self.start:
             return False
-        if self.end and self.end < now:
-            return False
-        return True
+        return not (self.end and self.end < now)
 
 
 def build_status_provider_config(

reconcile/terraform_cloudflare_dns.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import sys
 from collections.abc import (
@@ -344,10 +345,8 @@ def build_cloudflare_terraform_config_collection(
             rps,
         )
 
-        try:
+        with contextlib.suppress(ClientAlreadyRegisteredError):
             cf_clients.register_client(f"{cf_account.name}-{zone.identifier}", client)
-        except ClientAlreadyRegisteredError:
-            pass
 
     return cf_clients
 

reconcile/terraform_cloudflare_users.py

@@ -1,3 +1,4 @@
+import contextlib
 from collections.abc import (
     Iterable,
     Mapping,
@@ -264,10 +265,8 @@ class TerraformCloudflareUsers(
                 False,
             )
 
-            try:
+            with contextlib.suppress(ClientAlreadyRegisteredError):
                 cf_clients.register_client(cf_account.name, client)
-            except ClientAlreadyRegisteredError:
-                pass
 
         return cf_clients
 

reconcile/terraform_repo.py

@@ -175,7 +175,9 @@ class TerraformRepoIntegration(
                         explicit_start=True,
                     )
             except FileNotFoundError:
-                raise ParameterError(f"Unable to write to '{self.params.output_file}'")
+                raise ParameterError(
+                    f"Unable to write to '{self.params.output_file}'"
+                ) from None
         else:
             print(yaml.safe_dump(data=output.dict(), explicit_start=True))
 
@@ -231,7 +233,7 @@ class TerraformRepoIntegration(
             except (KeyError, AttributeError):
                 raise ParameterError(
                     f'Invalid ref: "{ref}" on repo: "{repo_url}". Or the project repo is not reachable'
-                )
+                ) from None
 
     def merge_results(
         self,
@@ -284,7 +286,7 @@ class TerraformRepoIntegration(
                 # state.add already performs a json.dumps(key) so we export the
                 # pydantic model as a dict to avoid a double json dump with extra quotes
                 state.add(add_key, add_val.dict(by_alias=True), force=True)
-            for delete_key in diff_result.delete.keys():
+            for delete_key in diff_result.delete:
                 state.rm(delete_key)
             for change_key, change_val in diff_result.change.items():
                 if change_val.desired.delete:

reconcile/terraform_resources.py

@@ -399,22 +399,22 @@ def run(
     if print_to_file:
         return
 
-    runner_params: RunnerParams = dict(
-        accounts=accounts,
-        account_names=account_names,
-        tf_namespaces=tf_namespaces,
-        tf=tf,
-        ts=ts,
-        secret_reader=secret_reader,
-        dry_run=dry_run,
-        enable_deletion=enable_deletion,
-        thread_pool_size=thread_pool_size,
-        internal=internal,
-        use_jump_host=use_jump_host,
-        light=light,
-        vault_output_path=vault_output_path,
-        defer=defer,
-    )
+    runner_params: RunnerParams = {
+        "accounts": accounts,
+        "account_names": account_names,
+        "tf_namespaces": tf_namespaces,
+        "tf": tf,
+        "ts": ts,
+        "secret_reader": secret_reader,
+        "dry_run": dry_run,
+        "enable_deletion": enable_deletion,
+        "thread_pool_size": thread_pool_size,
+        "internal": internal,
+        "use_jump_host": use_jump_host,
+        "light": light,
+        "vault_output_path": vault_output_path,
+        "defer": defer,
+    }
 
     if enable_extended_early_exit and get_feature_toggle_state(
         "terraform-resources-extended-early-exit",

reconcile/terraform_tgw_attachments.py

@@ -528,12 +528,12 @@ def run(
         defer(tf.cleanup)
     if print_to_file:
         return
-    runner_params: RunnerParams = dict(
-        terraform_client=tf,
-        terrascript_client=ts,
-        enable_deletion=enable_deletion,
-        dry_run=dry_run,
-    )
+    runner_params: RunnerParams = {
+        "terraform_client": tf,
+        "terrascript_client": ts,
+        "enable_deletion": enable_deletion,
+        "dry_run": dry_run,
+    }
     if enable_extended_early_exit and get_feature_toggle_state(
         "terraform-tgw-attachments-extended-early-exit",
         default=False,

reconcile/terraform_vpc_peerings.py

@@ -44,7 +44,7 @@ def find_matching_peering(
     peering_info = to_cluster["peering"]
     peer_connections = peering_info["connections"]
     for peer_connection in peer_connections:
-        if not peer_connection["provider"] == desired_provider:
+        if peer_connection["provider"] != desired_provider:
             continue
         if not peer_connection["cluster"]:
             continue
@@ -318,7 +318,7 @@ def build_desired_state_vpc_mesh_single_cluster(
     for peer_connection in peer_connections:
         # We only care about account-vpc-mesh peering providers
         peer_connection_provider = peer_connection["provider"]
-        if not peer_connection_provider == "account-vpc-mesh":
+        if peer_connection_provider != "account-vpc-mesh":
             continue
         # filter on account
         account = peer_connection["account"]
@@ -443,7 +443,7 @@ def build_desired_state_vpc_single_cluster(
     for peer_connection in peer_connections:
         # We only care about account-vpc peering providers
         peer_connection_provider = peer_connection["provider"]
-        if not peer_connection_provider == "account-vpc":
+        if peer_connection_provider != "account-vpc":
             continue
         # requester is the cluster's AWS account
         requester = {
@@ -686,11 +686,11 @@ def run(
     if defer:
         defer(tf.cleanup)
 
-    runner_params: RunnerParams = dict(
-        tf=tf,
-        dry_run=dry_run,
-        enable_deletion=enable_deletion,
-    )
+    runner_params: RunnerParams = {
+        "tf": tf,
+        "dry_run": dry_run,
+        "enable_deletion": enable_deletion,
+    }
 
     if enable_extended_early_exit and get_feature_toggle_state(
         "terraform-vpc-peerings-extended-early-exit",

reconcile/terraform_vpc_resources/integration.py

@@ -74,7 +74,7 @@ class TerraformVpcResources(QontractReconcileIntegration[TerraformVpcResourcesPa
             # this happens because we are not filtering the requests
             # when running the integration for a single account with --account-name.
             # We also don't want to create outputs for deleted requets.
-            if request.account.name not in outputs.keys() or request.delete:
+            if request.account.name not in outputs or request.delete:
                 continue
 
             outputs_per_request[request.identifier] = []

reconcile/test/test_aws_cloudwatch_log_retention.py

@@ -1,8 +1,5 @@
 from collections.abc import Generator
-from datetime import (
-    datetime,
-    timedelta,
-)
+from datetime import UTC, datetime, timedelta
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -97,7 +94,7 @@ def setup_mocks(
     aws_accounts: list[dict],
     log_groups: list[dict],
     tags: dict[str, Any],
-    utcnow: datetime = datetime.utcnow(),
+    utcnow: datetime = datetime.now(UTC),  # noqa: B008
 ) -> MagicMock:
     mocker.patch(
         "reconcile.aws_cloudwatch_log_retention.integration.get_aws_accounts",

reconcile/test/test_github_org.py

@@ -85,22 +85,24 @@ class TestGithubOrg:
     def do_current_state_test(path):
         fixture = fxt.get_anymarkup(path)
 
-        with patch("reconcile.github_org.RawGithubApi") as m_rga:
-            with patch("reconcile.github_org.Github") as m_gh:
-                m_gh.return_value = GithubMock(fixture["gh_api"])
-                m_rga.return_value = RawGithubApiMock()
-
-                gh_api_store = github_org.GHApiStore(config.get_config())
-                current_state = github_org.fetch_current_state(gh_api_store)
-                current_state = current_state.dump()
-
-                expected_current_state = fixture["state"]
-
-                assert len(current_state) == len(expected_current_state)
-                for group in current_state:
-                    params = group["params"]
-                    items = sorted(group["items"])
-                    assert items == get_items_by_params(expected_current_state, params)
+        with (
+            patch("reconcile.github_org.RawGithubApi") as m_rga,
+            patch("reconcile.github_org.Github") as m_gh,
+        ):
+            m_gh.return_value = GithubMock(fixture["gh_api"])
+            m_rga.return_value = RawGithubApiMock()
+
+            gh_api_store = github_org.GHApiStore(config.get_config())
+            current_state = github_org.fetch_current_state(gh_api_store)
+            current_state = current_state.dump()
+
+            expected_current_state = fixture["state"]
+
+            assert len(current_state) == len(expected_current_state)
+            for group in current_state:
+                params = group["params"]
+                items = sorted(group["items"])
+                assert items == get_items_by_params(expected_current_state, params)
 
     @staticmethod
     def do_desired_state_test(path):

reconcile/test/test_github_repo_invites.py

@@ -47,15 +47,15 @@ def test_parse_valid_code_components():
         },
     ]
     expected = github_repo_invites.CodeComponents(
-        urls=set([
+        urls={
             "https://github.com/org1/project1",
             "https://github.com/org2/project1",
             "https://github.com/org2/project2",
-        ]),
-        known_orgs=set([
+        },
+        known_orgs={
             "https://github.com/org1",
             "https://github.com/org2",
-        ]),
+        },
     )
     assert github_repo_invites._parse_code_components(raw_code_components) == expected
 
@@ -84,8 +84,8 @@ def test_accept_invitations_no_dry_run(github):
         ]
     ]
     code_components = github_repo_invites.CodeComponents(
-        urls=set([f"{expected_org}/project1"]),
-        known_orgs=set([expected_org]),
+        urls={f"{expected_org}/project1"},
+        known_orgs={expected_org},
     )
     dry_run = False
     accepted_invitations = github_repo_invites._accept_invitations(
@@ -93,7 +93,7 @@ def test_accept_invitations_no_dry_run(github):
     )
 
     github.accept_repo_invitation.assert_called_once_with(expected_id)
-    assert accepted_invitations == set([expected_org])
+    assert accepted_invitations == {expected_org}
 
 
 def test_accept_invitations_dry_run(github):
@@ -107,8 +107,8 @@ def test_accept_invitations_dry_run(github):
         ],
     ]
     code_components = github_repo_invites.CodeComponents(
-        urls=set([f"{expected_org}/project1"]),
-        known_orgs=set([expected_org]),
+        urls={f"{expected_org}/project1"},
+        known_orgs={expected_org},
     )
     dry_run = True
     accepted_invitations = github_repo_invites._accept_invitations(
@@ -116,4 +116,4 @@ def test_accept_invitations_dry_run(github):
     )
 
     github.accept_repo_invitation.assert_not_called()
-    assert accepted_invitations == set([expected_org])
+    assert accepted_invitations == {expected_org}

reconcile/test/test_integrations_manager.py

@@ -71,18 +71,18 @@ def test_collect_parameters() -> None:
     template = {
         "parameters": [
             {
-                "name": "tplt_param",
+                "name": "TPLT_PARAM",
                 "value": "default",
             }
         ]
     }
-    os.environ["tplt_param"] = "override"
+    os.environ["TPLT_PARAM"] = "override"
     environment = EnvironmentV1(name="e", parameters='{"env_param": "test"}')
 
     parameters = intop.collect_parameters(template, environment, "", "", None)
     expected = {
         "env_param": "test",
-        "tplt_param": "override",
+        "TPLT_PARAM": "override",
     }
     assert parameters == expected
 
@@ -108,16 +108,16 @@ def test_collect_parameters_os_env_strongest() -> None:
     template = {
         "parameters": [
             {
-                "name": "env_param",
+                "name": "ENV_PARAM",
                 "value": "default",
             }
         ]
     }
-    os.environ["env_param"] = "strongest"
-    environment = EnvironmentV1(name="env", parameters='{"env_param": "override"}')
+    os.environ["ENV_PARAM"] = "strongest"
+    environment = EnvironmentV1(name="env", parameters='{"ENV_PARAM": "override"}')
     parameters = intop.collect_parameters(template, environment, "", "", None)
     expected = {
-        "env_param": "strongest",
+        "ENV_PARAM": "strongest",
     }
     assert parameters == expected
 
@@ -487,19 +487,19 @@ def shard_manager(
 def test_shard_manager_aws_account_filtering(
     aws_account_sharding_strategy: AWSAccountShardingStrategy,
 ) -> None:
-    assert ["acc-1", "acc-2", "acc-3", "acc-4"] == [
+    assert [
         a.name
         for a in aws_account_sharding_strategy.filter_objects("another-integration")
-    ]
+    ] == ["acc-1", "acc-2", "acc-3", "acc-4"]
 
 
 def test_shard_manager_aws_account_filtering_disabled(
     aws_account_sharding_strategy: AWSAccountShardingStrategy,
 ) -> None:
     # acc-4 is disabled for AWS_INTEGRATION
-    assert ["acc-1", "acc-2", "acc-3"] == [
+    assert [
         a.name for a in aws_account_sharding_strategy.filter_objects(AWS_INTEGRATION)
-    ]
+    ] == ["acc-1", "acc-2", "acc-3"]
 
 
 #

reconcile/test/test_ocm_additional_routers.py

@@ -50,14 +50,14 @@ class TestOCMAdditionalRouters(TestCase):
 
         router_create = ocm_act["create"]
         expected = []
-        for c in router_create.keys():
+        for c in router_create:
             expected.append(call(c, router_create[c]))
         calls = ocm.create_additional_router.call_args_list
         self.assertEqual(calls, expected)
 
         router_delete = ocm_act["delete"]
         expected = []
-        for c in router_delete.keys():
+        for c in router_delete:
             expected.append(call(c, router_delete[c]))
         calls = ocm.delete_additional_router.call_args_list
         self.assertEqual(calls, expected)
@@ -73,7 +73,7 @@ class TestOCMAdditionalRouters(TestCase):
 
         ocm_api = fixture["ocm_api"]
         clusters = []
-        for c in ocm_api.keys():
+        for c in ocm_api:
             clusters.append({"name": c})
         ocm = get.return_value
         ocm.get_additional_routers.side_effect = lambda x: fixture["ocm_api"][x]
@@ -108,7 +108,7 @@ class TestOCMAdditionalRouters(TestCase):
 
         ocm_api = fixture["ocm_api"]
         clusters = []
-        for c in ocm_api.keys():
+        for c in ocm_api:
             clusters.append({"name": c})
         ocm = get.return_value
 
@@ -120,14 +120,14 @@ class TestOCMAdditionalRouters(TestCase):
 
         router_create = ocm_act["create"]
         expected = []
-        for c in router_create.keys():
+        for c in router_create:
             expected.append(call(c, router_create[c]))
         calls = ocm.create_additional_router.call_args_list
         self.assertEqual(calls, expected)
 
         router_delete = ocm_act["delete"]
         expected = []
-        for c in router_delete.keys():
+        for c in router_delete:
             expected.append(call(c, router_delete[c]))
         calls = ocm.delete_additional_router.call_args_list
         self.assertEqual(calls, expected)

reconcile/test/test_ocm_clusters.py

@@ -1,3 +1,4 @@
+# ruff: noqa: SIM117
 import typing
 from unittest.mock import patch
 

reconcile/test/test_ocm_update_recommended_version.py

@@ -29,14 +29,14 @@ def test_get_highest(version_set):
     highest = get_highest(version_set)
     assert highest == "1.1.1"
 
-    assert get_highest(set(["1.1.1"])) == "1.1.1"
+    assert get_highest({"1.1.1"}) == "1.1.1"
 
 
 def test_get_majority(versions, version_set):
     majority = get_majority(version_set, versions)
     assert majority == "1.1.0"
 
-    assert get_majority(set(["1.1.1"]), ["1.1.1"]) == "1.1.1"
+    assert get_majority({"1.1.1"}, ["1.1.1"]) == "1.1.1"
 
 
 def test_recommended_version(versions, version_set):

reconcile/test/test_openshift_serviceaccount_tokens.py

@@ -125,7 +125,7 @@ def test_openshift_serviceaccount_tokens__write_outputs_to_vault(
         value=construct_sa_token_oc_resource("name", "token"),
     )
     write_outputs_to_vault(vault_client, "path/to/secrets", ri)
-    vault_client.write.call_count == 2
+    assert vault_client.write.call_count == 2
     vault_client.write.assert_has_calls([
         call({
             "path": "path/to/secrets/openshift-serviceaccount-tokens/cluster/namespace/name",
@@ -167,14 +167,14 @@ def test_openshift_serviceaccount_tokens__canonicalize_namespaces(
     assert nss[2].openshift_service_account_tokens is None
 
     # namespace with tokens or shared resources defined
-    nss[3].name == "with-shared-resources"
-    nss[3].cluster.name == "cluster"
+    assert nss[3].name == "with-shared-resources"
+    assert nss[3].cluster.name == "cluster"
     assert len(nss[3].openshift_service_account_tokens or []) == 1
 
-    nss[4].name == "with-openshift-serviceaccount-tokens"
+    assert nss[4].name == "with-openshift-serviceaccount-tokens"
     assert len(nss[4].openshift_service_account_tokens or []) == 2
 
-    nss[5].name == "with-openshift-serviceaccount-tokens-and-shared-resources"
+    assert nss[5].name == "with-openshift-serviceaccount-tokens-and-shared-resources"
     assert len(nss[5].openshift_service_account_tokens or []) == 2
 
 

reconcile/test/test_openshift_tekton_resources.py

@@ -121,7 +121,7 @@ class TestOpenshiftTektonResources:
         self.test_data.providers = [self.provider1, self.provider2_wr]
 
         tkn_providers = otr.fetch_tkn_providers(None)
-        keys_expected = set([self.provider1["name"], self.provider2_wr["name"]])
+        keys_expected = {self.provider1["name"], self.provider2_wr["name"]}
         assert tkn_providers.keys() == keys_expected
 
     def test_duplicate_providers(self) -> None:
@@ -146,10 +146,10 @@ class TestOpenshiftTektonResources:
         self.test_data.providers = [self.provider1]
         desired_resources = otr.fetch_desired_resources(otr.fetch_tkn_providers(None))
 
-        expected_task_names = set([
+        expected_task_names = {
             "o-push-gateway-openshift-saas-deploy-task-status-metric",
             "o-openshift-saas-deploy-saas1",
-        ])
+        }
         expected_pipeline_name = "o-saas-deploy-saas1"
 
         task_names = set()