qontract-reconcile 0.10.1rc461__py3-none-any.whl → 0.10.1rc462__py3-none-any.whl

reconcile/utils/openshift_resource.py

@@ -104,7 +104,7 @@ class OpenshiftResource:
             for obj1_k, obj1_v in obj1.items():
                 obj2_v = obj2.get(obj1_k, None)
                 if obj2_v is None:
-                    if obj1_v not in [None, ""]:
+                    if obj1_v:
                         return False
                 if self.ignorable_field(obj1_k):
                     pass
@@ -123,7 +123,7 @@ class OpenshiftResource:
                     ]
                     if diff or not self.obj_intersect_equal(obj1_v, obj2_v, depth + 1):
                         return False
-                elif obj1_k in ["data", "matchLabels"]:
+                elif obj1_k in {"data", "matchLabels"}:
                     diff = [
                         k
                         for k in obj2_v
@@ -244,12 +244,12 @@ class OpenshiftResource:
             )
             raise ConstructResourceError(msg)
 
-        if self.kind not in [
+        if self.kind not in {
             "Role",
             "RoleBinding",
             "ClusterRole",
             "ClusterRoleBinding",
-        ] and (
+        } and (
             not DNS_SUBDOMAIN_RE.match(self.name)
             or not len(self.name) <= DNS_SUBDOMAIN_MAX_LENGTH
         ):
@@ -414,7 +414,7 @@ class OpenshiftResource:
 
         # Default fields for specific resource types
         # ConfigMaps and Secrets are by default Opaque
-        if body["kind"] in ("ConfigMap", "Secret") and body.get("type") == "Opaque":
+        if body["kind"] in {"ConfigMap", "Secret"} and body.get("type") == "Opaque":
             body.pop("type")
 
         if body["kind"] == "Secret":
@@ -444,7 +444,7 @@ class OpenshiftResource:
                     tls.pop("key", None)
                     tls.pop("certificate", None)
             subdomain = body["spec"].get("subdomain", None)
-            if subdomain == "":
+            if not subdomain:
                 body["spec"].pop("subdomain", None)
 
         if body["kind"] == "ServiceAccount":
@@ -497,8 +497,7 @@ class OpenshiftResource:
                 if "namespace" in subject:
                     subject.pop("namespace")
                 if "apiGroup" in subject and (
-                    subject["apiGroup"] == ""
-                    or subject["apiGroup"] in body["apiVersion"]
+                    not subject["apiGroup"] or subject["apiGroup"] in body["apiVersion"]
                 ):
                     subject.pop("apiGroup")
             # TODO: remove this once we have no 3.11 clusters
@@ -714,6 +713,6 @@ def build_secret(
 
 
 def base64_encode_secret_field_value(value: str) -> str:
-    if value == "":
+    if not value:
         return ""
     return base64.b64encode(str(value).encode()).decode("utf-8")

reconcile/utils/parse_dhms_duration.py

@@ -58,7 +58,7 @@ def dhms_to_seconds(time_str: str) -> int:
         if s.isnumeric():
             previous_number += s
         else:
-            if previous_number == "":
+            if not previous_number:
                 raise BadHDMSDurationError(f"Invalid time duration {time_str}")
 
             if s in HANDLE_UNIT_MAP:

reconcile/utils/runtime/sharding.py

@@ -110,7 +110,7 @@ class StaticShardingStrategy:
     def create_sub_shards(
         base_shard: ShardSpec, sub_sharding: SubShardingV1
     ) -> list[ShardSpec]:
-        if base_shard.shard_id != "" or base_shard.shards != "":
+        if base_shard.shard_id or base_shard.shards:
             raise ValueError(
                 "Static sub_sharding can only be applied to Key based sharding"
             )

reconcile/utils/saasherder/saasherder.py

@@ -1803,9 +1803,9 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 )
 
                 # add managed resource types to target config
-                desired_target_config[
-                    "saas_file_managed_resource_types"
-                ] = saas_file.managed_resource_types
+                desired_target_config["saas_file_managed_resource_types"] = (
+                    saas_file.managed_resource_types
+                )
                 desired_target_config["url"] = rt.url
                 desired_target_config["path"] = rt.path
                 # before the GQL classes are introduced, the parameters attribute
@@ -2027,8 +2027,8 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
     @staticmethod
     def resolve_templated_parameters(saas_files: Iterable[SaasFile]) -> None:
         """Resolve templated target parameters in saas files."""
-        from reconcile.openshift_resources_base import (
-            compile_jinja2_template,  # avoid circular import
+        from reconcile.openshift_resources_base import (  # noqa: PLC0415 - # avoid circular import
+            compile_jinja2_template,
         )
 
         for saas_file in saas_files:

reconcile/utils/slack_api.py

@@ -429,7 +429,7 @@ class SlackApi:
 
             cursor = result["response_metadata"]["next_cursor"]
 
-            if cursor == "":
+            if not cursor:
                 break
 
             additional_kwargs["cursor"] = cursor
@@ -478,7 +478,7 @@ class SlackApi:
                 break
 
             cursor = response["response_metadata"]["next_cursor"]
-            if cursor == "":
+            if not cursor:
                 break
 
         return responses

reconcile/utils/terraform/config_client.py

@@ -122,7 +122,7 @@ class TerraformConfigClientCollection:
             working_dirs[account_name] = client.dump()
 
             if print_to_file:
-                with open(print_to_file, "a") as f:
+                with open(print_to_file, "a", encoding="locale") as f:
                     f.write(f"##### {account_name} #####\n")
                     f.write(client.dumps())
                     f.write("\n")

reconcile/utils/terraform_client.py

@@ -439,9 +439,9 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                 replica_source_name = f'{replica_src}-{tf_resource.get("provider")}'
                 # Creating a dict that is convenient to use inside the
                 # loop processing the formatted_output
-                replicas_info[spec.provisioner_name][
-                    spec.output_prefix
-                ] = replica_source_name
+                replicas_info[spec.provisioner_name][spec.output_prefix] = (
+                    replica_source_name
+                )
 
         return replicas_info
 
@@ -502,10 +502,10 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                 data[resource_name] = {}
             data[resource_name][field_key] = field_value
 
-        if len(data) == 1 and type in (
+        if len(data) == 1 and type in {
             self.OUTPUT_TYPE_PASSWORDS,
             self.OUTPUT_TYPE_CONSOLEURLS,
-        ):
+        }:
             return data[list(data.keys())[0]]
         return data
 

reconcile/utils/terrascript/cloudflare_client.py

@@ -171,7 +171,9 @@ class TerrascriptCloudflareClient(TerraformConfigClient):
             working_dir = tempfile.mkdtemp(prefix=TMP_DIR_PREFIX)
         else:
             working_dir = existing_dir
-        with open(working_dir + "/config.tf.json", "w") as terraform_config_file:
+        with open(
+            working_dir + "/config.tf.json", "w", encoding="locale"
+        ) as terraform_config_file:
             terraform_config_file.write(self.dumps())
 
         return working_dir

reconcile/utils/terrascript_aws_client.py

@@ -603,10 +603,10 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             with self.jenkins_lock:
                 # this may have already happened, so we check again
                 if not self.jenkins_map.get(instance_name):
-                    self.jenkins_map[
-                        instance_name
-                    ] = JenkinsApi.init_jenkins_from_secret(
-                        SecretReader(self.settings), instance["token"]
+                    self.jenkins_map[instance_name] = (
+                        JenkinsApi.init_jenkins_from_secret(
+                            SecretReader(self.settings), instance["token"]
+                        )
                     )
         return self.jenkins_map[instance_name]
 
@@ -1056,7 +1056,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "Name": connection_name,
                 },
             }
-            if connection_provider in ["account-vpc", "account-vpc-mesh"]:
+            if connection_provider in {"account-vpc", "account-vpc-mesh"}:
                 if self._multiregion_account(acc_account_name):
                     values["provider"] = "aws." + accepter["region"]
             else:
@@ -1075,7 +1075,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                         + identifier
                         + ".id}",
                     }
-                    if connection_provider in ["account-vpc", "account-vpc-mesh"]:
+                    if connection_provider in {"account-vpc", "account-vpc-mesh"}:
                         if self._multiregion_account(acc_account_name):
                             values["provider"] = "aws." + accepter["region"]
                     else:
@@ -1796,9 +1796,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             common_values.get("server_side_encryption_configuration")
             or DEFAULT_S3_SSE_CONFIGURATION
         )
-        values[
-            "server_side_encryption_configuration"
-        ] = server_side_encryption_configuration
+        values["server_side_encryption_configuration"] = (
+            server_side_encryption_configuration
+        )
         # Support static website hosting [rosa-authenticator]
         website = common_values.get("website")
         if website:
@@ -2432,9 +2432,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         specs = common_values.get("specs")
         all_queues_per_spec = []
         kms_keys = set()
-        for spec in specs:
-            defaults = self.get_values(spec["defaults"])
-            queues = spec.pop("queues", [])
+        for _spec in specs:
+            defaults = self.get_values(_spec["defaults"])
+            queues = _spec.pop("queues", [])
             all_queues = []
             for queue_kv in queues:
                 queue_key = queue_kv["key"]
@@ -2624,10 +2624,10 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         region = common_values.get("region") or self.default_regions.get(account)
         specs = common_values.get("specs")
         all_tables = []
-        for spec in specs:
-            defaults = self.get_values(spec["defaults"])
+        for _spec in specs:
+            defaults = self.get_values(_spec["defaults"])
             attributes = defaults.pop("attributes")
-            tables = spec["tables"]
+            tables = _spec["tables"]
             for table_kv in tables:
                 table_key = table_kv["key"]
                 table = table_kv["value"]
@@ -3604,9 +3604,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                     "starting_position_timestamp", None
                 )
                 if not starting_position_timestamp:
-                    source_vaules[
-                        "starting_position_timestamp"
-                    ] = starting_position_timestamp
+                    source_vaules["starting_position_timestamp"] = (
+                        starting_position_timestamp
+                    )
 
             batch_size = common_values.get("batch_size", 100)
             source_vaules["batch_size"] = batch_size
@@ -3796,7 +3796,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
 
         for name, ts in self.tss.items():
             if print_to_file:
-                with open(print_to_file, "a") as f:
+                with open(print_to_file, "a", encoding="locale") as f:
                     f.write(f"##### {name} #####\n")
                     f.write(str(ts))
                     f.write("\n")
@@ -3804,7 +3804,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                 wd = tempfile.mkdtemp(prefix=TMP_DIR_PREFIX)
             else:
                 wd = working_dirs[name]
-            with open(wd + "/config.tf.json", "w") as f:
+            with open(wd + "/config.tf.json", "w", encoding="locale") as f:
                 f.write(str(ts))
             working_dirs[name] = wd
 
@@ -4353,19 +4353,19 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         auth_options = values.get("auth", {})
         # TODO: @fishi0x01 make mandatory after migration APPSRE-3409
         if auth_options:
-            es_values[
-                "advanced_security_options"
-            ] = self._build_es_advanced_security_options(auth_options)
+            es_values["advanced_security_options"] = (
+                self._build_es_advanced_security_options(auth_options)
+            )
 
         # TODO: @fishi0x01 remove after migration APPSRE-3409
         # ++++++++ START: REMOVE +++++++++
         else:
             advanced_security_options = values.get("advanced_security_options", {})
             if advanced_security_options:
-                es_values[
-                    "advanced_security_options"
-                ] = self._build_es_advanced_security_options_deprecated(
-                    advanced_security_options
+                es_values["advanced_security_options"] = (
+                    self._build_es_advanced_security_options_deprecated(
+                        advanced_security_options
+                    )
                 )
         # ++++++++ END: REMOVE ++++++++++
 
@@ -4624,12 +4624,12 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         account = self.accounts[account_name]
         cluster = namespace_info["cluster"]
         ocm = ocm_map.get(cluster["name"])
-        account[
-            "assume_role"
-        ] = ocm.get_aws_infrastructure_access_terraform_assume_role(
-            cluster["name"],
-            account["uid"],
-            account["terraformUsername"],
+        account["assume_role"] = (
+            ocm.get_aws_infrastructure_access_terraform_assume_role(
+                cluster["name"],
+                account["uid"],
+                account["terraformUsername"],
+            )
         )
         account["assume_region"] = cluster["spec"]["region"]
         service_name = f"{namespace_info['name']}/{openshift_service}"
@@ -5198,9 +5198,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         if instance_requirements:
             override += [{"instance_requirements": instance_requirements}]
         if override:
-            asg_value["mixed_instances_policy"]["launch_template"][
-                "override"
-            ] = override
+            asg_value["mixed_instances_policy"]["launch_template"]["override"] = (
+                override
+            )
 
         asg_value["tags"] = [
             {"key": k, "value": v, "propagate_at_launch": True} for k, v in tags.items()
@@ -5281,7 +5281,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         lambda_managed_policy_arn = (
             "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         )
-        if region in ("us-gov-west-1", "us-gov-east-1"):
+        if region in {"us-gov-west-1", "us-gov-east-1"}:
             lambda_managed_policy_arn = "arn:aws-us-gov:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
         vpc_id = common_values.get("vpc_id")
         subnet_ids = common_values.get("subnet_ids")
@@ -6219,9 +6219,9 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             del values["logging_info"]["broker_logs"]["cloudwatch_logs"][
                 "retention_in_days"
             ]
-            values["logging_info"]["broker_logs"]["cloudwatch_logs"][
-                "log_group"
-            ] = log_group_tf_resource.name
+            values["logging_info"]["broker_logs"]["cloudwatch_logs"]["log_group"] = (
+                log_group_tf_resource.name
+            )
 
         # resource - secret manager for SCRAM client credentials
         if scram_enabled and scram_users:

reconcile/utils/three_way_diff_strategy.py

@@ -95,7 +95,7 @@ def is_empty_env_value(current: OR, desired: OR, patch: Mapping[str, Any]) -> bo
     pointer = patch["path"]
     if (
         patch["op"] == "add"
-        and patch["value"] == ""
+        and not patch["value"]
         and re.match(EMPTY_ENV_VALUE, pointer)
     ):
         return True
@@ -105,7 +105,7 @@ def is_empty_env_value(current: OR, desired: OR, patch: Mapping[str, Any]) -> bo
 
 def is_valid_change(current: OR, desired: OR, patch: Mapping[str, Any]) -> bool:
     # Only consider added or replaced values on the Desired object
-    if patch["op"] not in ["add", "replace"]:
+    if patch["op"] not in {"add", "replace"}:
         return False
 
     # Check known mutations. Replaced values can happen if values have been

reconcile/utils/unleash.py

@@ -65,7 +65,7 @@ class EnableClusterStrategy(ClusterStrategy):
 
 
 def _get_unleash_api_client(api_url: str, auth_head: str) -> UnleashClient:
-    global client
+    global client  # noqa: PLW0603
     with client_lock:
         if client is None:
             logging.getLogger("apscheduler").setLevel(logging.ERROR)

reconcile/utils/vault.py

@@ -151,7 +151,7 @@ class _VaultClient:
     def _refresh_client_auth(self):
         if self.kube_auth_enabled:
             # must read each time to account for sa token refresh
-            with open(self.kube_sa_token_path) as f:
+            with open(self.kube_sa_token_path, encoding="locale") as f:
                 try:
                     self._client.auth_kubernetes(
                         role=self.kube_auth_role,

reconcile/vpc_peerings_validator.py

@@ -58,10 +58,10 @@ def validate_no_cidr_overlap(
                         "cidr_block": cidr_block,
                     }
                     peerings_entries.append(vpc_peering_info)
-                if peering.provider in (
+                if peering.provider in {
                     "cluster-vpc-requester",
                     "cluster-vpc-accepter",
-                ):
+                }:
                     vpc_peering_info = {
                         "provider": peering.provider,
                         "vpc_name": peering.cluster.name,  # type: ignore[union-attr]
@@ -101,10 +101,10 @@ def validate_no_internal_to_public_peerings(
         if not cluster.internal or not cluster.peering:
             continue
         for connection in cluster.peering.connections:
-            if connection.provider not in [
+            if connection.provider not in {
                 "cluster-vpc-accepter",
                 "cluster-vpc-requester",
-            ]:
+            }:
                 continue
             connection = cast(
                 Union[
@@ -144,10 +144,10 @@ def validate_no_public_to_public_peerings(
         ):
             continue
         for connection in cluster.peering.connections:
-            if connection.provider not in [
+            if connection.provider not in {
                 "cluster-vpc-accepter",
                 "cluster-vpc-requester",
-            ]:
+            }:
                 continue
             connection = cast(
                 Union[

release/version.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import locale
 import os
 import re
 import subprocess
@@ -25,13 +26,17 @@ def git() -> str:
         # tox is running setup.py sdist from the git repo, and then runs again outside
         # of the git repo. At this second step, we cannot run git commands.
         # So we save the git version in a file and include it in the source distribution
-        with open(GIT_VERSION_FILE, "w") as f:
+        with open(
+            GIT_VERSION_FILE, "w", encoding=locale.getpreferredencoding(False)
+        ) as f:
             f.write(v)
         return v
     except subprocess.CalledProcessError as e:
         # if we're not in a git repo, try reading out from the GIT_VERSION file
         if os.path.exists(GIT_VERSION_FILE):
-            with open(GIT_VERSION_FILE, "r") as f:
+            with open(
+                GIT_VERSION_FILE, "r", encoding=locale.getpreferredencoding(False)
+            ) as f:
                 return f.read()
         print(e.stderr)
         raise e

tools/app_interface_reporter.py

@@ -387,9 +387,9 @@ def get_build_history(job):
 
 def get_build_history_pool(jenkins_map, jobs, timestamp_limit, thread_pool_size):
     history_to_get = []
-    for instance, jobs in jobs.items():
+    for instance, _jobs in jobs.items():
         jenkins = jenkins_map[instance]
-        for job in jobs:
+        for job in _jobs:
             job["jenkins"] = jenkins
             job["timestamp_limit"] = timestamp_limit
             history_to_get.append(job)
@@ -443,7 +443,7 @@ def main(
             except FileExistsError:
                 pass
 
-            with open(report_file, "w") as f:
+            with open(report_file, "w", encoding="locale") as f:
                 f.write(report["content"])
 
     if not dry_run:

tools/cli_commands/gpg_encrypt.py

@@ -100,7 +100,7 @@ class GPGEncryptCommand:
         return GPGEncryptCommand._format(secret)
 
     def _fetch_local_file_secret(self) -> str:
-        with open(self._command_data.secret_file_path) as f:
+        with open(self._command_data.secret_file_path, encoding="locale") as f:
             return f.read()
 
     def _fetch_secret(self) -> str:
@@ -140,7 +140,7 @@ class GPGEncryptCommand:
         if not output:
             print(content)
             return
-        with open(output, "w") as f:
+        with open(output, "w", encoding="locale") as f:
             f.write(content)
 
     def execute(self):

tools/qontract_cli.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# ruff: noqa: PLC0415 - `import` should be at the top-level of a file
 
 import base64
 import json
@@ -1781,10 +1782,10 @@ def app_interface_review_queue(ctx) -> None:
                 continue
             if len(mr.commits()) == 0:
                 continue
-            if mr.merge_status in [
+            if mr.merge_status in {
                 MRStatus.CANNOT_BE_MERGED,
                 MRStatus.CANNOT_BE_MERGED_RECHECK,
-            ]:
+            }:
                 continue
 
             labels = mr.attributes.get("labels")
@@ -2207,9 +2208,9 @@ def slo_document_services(ctx, status_board_instance):
         print(f"Status-board instance '{status_board_instance}' not found.")
         sys.exit(1)
 
-    desired_product_apps: dict[
-        str, set[str]
-    ] = StatusBoardExporterIntegration.get_product_apps(sb)
+    desired_product_apps: dict[str, set[str]] = (
+        StatusBoardExporterIntegration.get_product_apps(sb)
+    )
 
     slodocs = []
     for slodoc in get_slo_documents():
@@ -2620,7 +2621,7 @@ def alert_to_receiver(
 @click.option("--env-name", default=None, help="environment to use for parameters.")
 @click.pass_context
 def saas_dev(ctx, app_name=None, saas_file_name=None, env_name=None) -> None:
-    if env_name in [None, ""]:
+    if not env_name:
         print("env-name must be defined")
         return
     saas_files = get_saas_files(saas_file_name, env_name, app_name)