qontract-reconcile 0.10.2.dev14__py3-none-any.whl → 0.10.2.dev15__py3-none-any.whl

reconcile/typed_queries/reserved_networks.py

@@ -7,6 +7,6 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_networks(gql_api: GqlApi | None = None) -> list[NetworkV1]:
-    api = gql_api if gql_api else gql.get_api()
+    api = gql_api or gql.get_api()
     data = query(query_func=api.query)
     return list(data.networks or [])

reconcile/typed_queries/saas_files.py

@@ -73,7 +73,7 @@ class SaasResourceTemplateTarget(ConfiguredBaseModel):
     ) -> str:
         """Returns a unique identifier for a target."""
         return hashlib.blake2s(
-            f"{parent_saas_file_name}:{parent_resource_template_name}:{self.name if self.name else 'default'}:{self.namespace.cluster.name}:{self.namespace.name}".encode(),
+            f"{parent_saas_file_name}:{parent_resource_template_name}:{self.name or 'default'}:{self.namespace.cluster.name}:{self.namespace.name}".encode(),
             digest_size=20,
         ).hexdigest()
 

reconcile/typed_queries/slo_documents.py

@@ -7,6 +7,6 @@ from reconcile.utils.gql import GqlApi
 
 
 def get_slo_documents(gql_api: GqlApi | None = None) -> list[SLODocumentV1]:
-    api = gql_api if gql_api else gql.get_api()
+    api = gql_api or gql.get_api()
     data = query(query_func=api.query)
     return data.slo_document_v1 or []

reconcile/typed_queries/status_board.py

@@ -51,8 +51,7 @@ def get_selected_app_names(
     for selector in selectors:
         apps_to_remove: set[str] = set()
         results = parser.parse(selector).find(apps)
-        for match in results:
-            apps_to_remove.add(match.value["name"])
+        apps_to_remove.update(match.value["name"] for match in results)
         selected_app_names -= apps_to_remove
 
     return selected_app_names

reconcile/utils/amtool.py

@@ -52,7 +52,7 @@ def version() -> AmtoolResult:
     """Returns the version parsed from amtool --version"""
     result = _run_cmd(["amtool", "--version"])
 
-    pattern = re.compile("^amtool, version (?P<version>[^ ]+) .+")
+    pattern = re.compile(r"^amtool, version (?P<version>[^ ]+) .+")
     if m := pattern.match(result.message):
         return AmtoolResult(True, m.group("version"))
 
@@ -63,7 +63,7 @@ def _run_cmd(cmd: list[str]) -> AmtoolResult:
     try:
         result = run(cmd, capture_output=True, check=True)
     except CalledProcessError as e:
-        msg = f'Error running amtool command [{" ".join(cmd)}]'
+        msg = f"Error running amtool command [{' '.join(cmd)}]"
         if e.stdout:
             msg += f" {e.stdout.decode()}"
         if e.stderr:

reconcile/utils/aws_api.py

@@ -1,4 +1,5 @@
 import logging
+import operator
 import os
 import re
 import time
@@ -191,7 +192,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         service_name,
         region_name: str | None = None,
     ):
-        region = region_name if region_name else session.region_name
+        region = region_name or session.region_name
         client = session.client(
             service_name,
             region_name=region,
@@ -205,7 +206,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
     def _get_session_resource(
         session: Session, service_name, region_name: str | None = None
     ):
-        region = region_name if region_name else session.region_name
+        region = region_name or session.region_name
         return session.resource(service_name, region_name=region)
 
     def _account_ec2_client(
@@ -1000,12 +1001,13 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         assumed_role_data = self._get_account_assume_data(account)
         assumed_ec2 = self._get_assumed_role_client(*assumed_role_data)
         nat_gateways = assumed_ec2.describe_nat_gateways()
-        egress_ips = set()
+        egress_ips: set[str] = set()
         for nat in nat_gateways.get("NatGateways") or []:
             if nat["VpcId"] != vpc_id:
                 continue
-            for address in nat["NatGatewayAddresses"]:
-                egress_ips.add(address["PublicIp"])
+            egress_ips.update(
+                address["PublicIp"] for address in nat["NatGatewayAddresses"]
+            )
 
         return egress_ips
 
@@ -1481,13 +1483,11 @@ class AWSApi:  # pylint: disable=too-many-public-methods
             client.delete_hosted_zone(Id=zone_id)
         except client.exceptions.NoSuchHostedZone:
             logging.error(
-                f"[{account_name}] Error trying to delete "
-                f"unknown DNS zone {zone_id}"
+                f"[{account_name}] Error trying to delete unknown DNS zone {zone_id}"
             )
         except client.exceptions.HostedZoneNotEmpty:
             logging.error(
-                f"[{account_name}] Cannot delete DNS zone that "
-                f"is not empty {zone_id}"
+                f"[{account_name}] Cannot delete DNS zone that is not empty {zone_id}"
             )
         except Exception as e:
             logging.error(f"[{account_name}] unhandled exception: {e}")
@@ -1697,7 +1697,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         return [
             obj["Key"]
             for obj in sorted(
-                objects, key=lambda obj: obj["LastModified"], reverse=True
+                objects, key=operator.itemgetter("LastModified"), reverse=True
             )
         ]
 

reconcile/utils/aws_helper.py

@@ -74,7 +74,7 @@ def get_account(accounts: Iterable[Account], account_name: str) -> Account:
     raise AccountNotFoundError(account_name)
 
 
-def get_region_from_availability_zone(availability_zone: str) -> str:
+def get_region_from_availability_zone(availability_zone: str) -> str:  # noqa: FURB118
     return availability_zone[:-1]
 
 

reconcile/utils/binary.py

@@ -39,8 +39,7 @@ def binary_version(binary, version_args, search_regex, expected_versions):
                 result = subprocess.run(cmd, capture_output=True, check=True)
             except subprocess.CalledProcessError as e:
                 msg = (
-                    f"Could not execute binary '{binary}' "
-                    f"for binary version check: {e}"
+                    f"Could not execute binary '{binary}' for binary version check: {e}"
                 )
                 raise Exception(msg) from e
 

reconcile/utils/differ.py

@@ -1,3 +1,4 @@
+import operator
 from collections.abc import (
     Callable,
     Iterable,
@@ -30,10 +31,6 @@ class DiffResult(Generic[Current, Desired, Key]):
     identical: dict[Key, DiffPair[Current, Desired]]
 
 
-def _default_equal(current: Current, desired: Desired) -> bool:
-    return current == desired
-
-
 def _default_key(item: Any) -> Any:
     return item
 
@@ -41,7 +38,7 @@ def _default_key(item: Any) -> Any:
 def diff_mappings(
     current: Mapping[Key, Current],
     desired: Mapping[Key, Desired],
-    equal: Callable[[Current, Desired], bool] = _default_equal,
+    equal: Callable[[Current, Desired], bool] = operator.eq,
 ) -> DiffResult[Current, Desired, Key]:
     """
     Compare two mappings and return a `DiffResult` instance containing the differences between them.
@@ -91,7 +88,7 @@ def diff_any_iterables(
     desired: Iterable[Desired],
     current_key: Callable[[Current], Key] = _default_key,
     desired_key: Callable[[Desired], Key] = _default_key,
-    equal: Callable[[Current, Desired], bool] = _default_equal,
+    equal: Callable[[Current, Desired], bool] = operator.eq,
 ) -> DiffResult[Current, Desired, Key]:
     """
     Compare two iterables and return a `DiffResult` instance containing the differences between them.
@@ -152,7 +149,7 @@ def diff_iterables(
     current: Iterable[T],
     desired: Iterable[T],
     key: Callable[[T], Key] = _default_key,
-    equal: Callable[[T, T], bool] = _default_equal,
+    equal: Callable[[T, T], bool] = operator.eq,
 ) -> DiffResult[T, T, Key]:
     """
     Compare two iterables with same type and return a `DiffResult` instance containing the differences between them.

reconcile/utils/dnsutils.py

@@ -1,17 +1,9 @@
 from dns import resolver
 
 
-def get_nameservers(domain):
-    records = []
-    answers = resolver.query(domain, "NS")
-    for rdata in answers:
-        records.append(rdata.to_text())
-    return records
+def get_nameservers(domain: str) -> list[str]:
+    return [rdata.to_text() for rdata in resolver.query(domain, "NS")]
 
 
-def get_a_records(host):
-    records = []
-    answers = resolver.query(host, "A")
-    for rdata in answers:
-        records.append(rdata.to_text())
-    return records
+def get_a_records(host: str) -> list[str]:
+    return [rdata.to_text() for rdata in resolver.query(host, "A")]

reconcile/utils/external_resources.py

@@ -52,8 +52,7 @@ def get_provision_providers(namespace_info: Mapping[str, Any]) -> set[str]:
         return providers
 
     external_resources = namespace_info.get("externalResources") or []
-    for e in external_resources:
-        providers.add(e["provider"])
+    providers.update(e["provider"] for e in external_resources)
 
     return providers
 

reconcile/utils/gitlab_api.py

@@ -413,7 +413,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         items = self.get_items(mr.pipelines.list)
         return sorted(
             [i.asdict() for i in items],
-            key=lambda x: x["created_at"],
+            key=itemgetter("created_at"),
             reverse=True,
         )
 
@@ -599,9 +599,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         if label in labels:
             return
         labels.append(label)
-        note_body = (
-            f"item has been marked as {label}. " f"to remove say `/{label} cancel`"
-        )
+        note_body = f"item has been marked as {label}. to remove say `/{label} cancel`"
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
         item.notes.create({"body": note_body})
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()

reconcile/utils/glitchtip/models.py

@@ -130,7 +130,7 @@ class ProjectAlert(BaseModel):
     ) -> MutableMapping[str, Any]:
         # name is an empty string if the alert was created manually because it can't be set via UI
         # use the pk instead.
-        values["name"] = values.get("name") or f'alert-{values.get("pk")}'
+        values["name"] = values.get("name") or f"alert-{values.get('pk')}"
         return values
 
     def __eq__(self, other: object) -> bool:

reconcile/utils/helm.py

@@ -87,7 +87,7 @@ def do_template(
                 ]
                 result = run(cmd, capture_output=True, check=True)
     except CalledProcessError as e:
-        msg = f'Error running helm template [{" ".join(cmd)}]'
+        msg = f"Error running helm template [{' '.join(cmd)}]"
         if e.stdout:
             msg += f" {e.stdout.decode()}"
         if e.stderr:

reconcile/utils/instrumented_wrappers.py

@@ -10,8 +10,8 @@ from reconcile.utils import metrics
 # TODO: move these to a shared, constants module
 
 INTEGRATION_NAME = os.environ.get("INTEGRATION_NAME", "")
-SHARDS = os.environ.get("SHARDS", 1)
-SHARD_ID = int(os.environ.get("SHARD_ID", 0))
+SHARDS = int(os.environ.get("SHARDS", "1"))
+SHARD_ID = int(os.environ.get("SHARD_ID", "0"))
 
 
 class InstrumentedImage(Image):

reconcile/utils/jjb_client.py

@@ -236,7 +236,7 @@ class JJB:  # pylint: disable=too-many-public-methods
                 result = subprocess.run(
                     cmd, check=True, stdout=PIPE, stderr=STDOUT, encoding="utf-8"
                 )
-                if re.search("updated: [1-9]", result.stdout):
+                if re.search(r"updated: [1-9]", result.stdout):
                     logging.info(result.stdout)
             except CalledProcessError as ex:
                 logging.error(ex.stdout)

reconcile/utils/jump_host.py

@@ -36,7 +36,7 @@ class JumpHostBase:
     def __init__(self, parameters: JumphostParameters):
         self._hostname = parameters.hostname
         self._user = parameters.user
-        self._port = parameters.port if parameters.port else 22
+        self._port = parameters.port or 22
         self._identity = parameters.key
         self._init_identity_file()
 

reconcile/utils/metrics.py

@@ -65,8 +65,8 @@ execution_counter = Counter(
 )
 
 reconcile_time = Histogram(
-    name="qontract_reconcile_function_" "elapsed_seconds_since_bundle_commit",
-    documentation="Run time seconds for tracked " "functions",
+    name="qontract_reconcile_function_elapsed_seconds_since_bundle_commit",
+    documentation="Run time seconds for tracked functions",
     labelnames=["name", "integration"],
     buckets=(60.0, 150.0, 300.0, 600.0, 1200.0, 1800.0, 2400.0, 3000.0, float("inf")),
 )
@@ -133,8 +133,7 @@ class BaseMetric(ABC, BaseModel):
         class name. Removes the suffix `_metric` is present. Subclasses can override this.
         """
         metric_name = re.sub(r"(?<!^)(?=[A-Z])", "_", cls.__name__).lower()
-        if metric_name.endswith("_metric"):
-            metric_name = metric_name[:-7]
+        metric_name = metric_name.removesuffix("_metric")
         return metric_name
 
 
@@ -151,8 +150,7 @@ class GaugeMetric(BaseMetric):
     @classmethod
     def name(cls) -> str:
         metric_name = super().name()
-        if metric_name.endswith("_gauge"):
-            metric_name = metric_name[:-6]
+        metric_name = metric_name.removesuffix("_gauge")
         return metric_name
 
 
@@ -175,8 +173,7 @@ class CounterMetric(BaseMetric):
     @classmethod
     def name(cls) -> str:
         metric_name = super().name()
-        if metric_name.endswith("_counter"):
-            metric_name = metric_name[:-8]
+        metric_name = metric_name.removesuffix("_counter")
         return metric_name
 
 
@@ -221,9 +218,7 @@ class MetricsContainer:
         self._counters[counter.__class__][label_values] = current_value + by
 
     def _aggregate_scopes(self) -> "MetricsContainer":
-        containers = [self]
-        for sub in self._scopes.values():
-            containers.append(sub._aggregate_scopes())
+        containers = [self] + [sub._aggregate_scopes() for sub in self._scopes.values()]
         return join_metric_containers(containers)
 
     def collect(self) -> Generator[Metric, None, None]:

reconcile/utils/mr/aws_access.py

@@ -64,7 +64,7 @@ class CreateDeleteAwsAccessKey(MergeRequestBase):
 
         body = body_template.render(ACCOUNT=self.account, ACCESS_KEY=self.key)
         email_name = f"{self.account}-{self.key}"
-        ref = self.path[4:] if self.path.startswith("data") else self.path
+        ref = self.path.removeprefix("data")
         content = app_interface_email(
             name=email_name, subject=self.title, aws_accounts=[ref], body=pss(body)
         )

reconcile/utils/mr/base.py

@@ -65,9 +65,7 @@ class MergeRequestBase(ABC):
     def cancel(self, message: str) -> None:
         self.cancelled = True
         raise CancelMergeRequest(
-            f"{self.name} MR canceled for "
-            f"branch {self.branch}. "
-            f"Reason: {message}"
+            f"{self.name} MR canceled for branch {self.branch}. Reason: {message}"
         )
 
     @property
@@ -222,7 +220,7 @@ class MergeRequestBase(ABC):
                 # we are not going to let an otherwise fine MR
                 # processing fail just because of this
                 LOG.error(
-                    f"Failed to delete branch {self.branch}. " f"Reason: {gitlab_error}"
+                    f"Failed to delete branch {self.branch}. Reason: {gitlab_error}"
                 )
 
     def diffs(self, gitlab_cli: GitLabApi) -> Any:

reconcile/utils/mr/notificator.py

@@ -40,7 +40,7 @@ class CreateAppInterfaceNotificator(MergeRequestBase):
         self._notification = notification
         self._email_base_path = email_base_path
         self._dry_run = dry_run
-        self.labels = labels if labels else [DO_NOT_MERGE_HOLD]
+        self.labels = labels or [DO_NOT_MERGE_HOLD]
 
     @property
     def title(self) -> str:

reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py

@@ -21,7 +21,7 @@ class CreateOCMUpgradeSchedulerOrgUpdates(MergeRequestBase):
 
     @property
     def description(self) -> str:
-        return f'ocm upgrade scheduler org updates for {self.updates_info["name"]}'
+        return f"ocm upgrade scheduler org updates for {self.updates_info['name']}"
 
     def process(self, gitlab_cli: GitLabApi) -> None:
         changes = False

reconcile/utils/oc.py

@@ -213,20 +213,13 @@ class OCDecorators:
         return wrapper
 
 
+@dataclass
 class OCProcessReconcileTimeDecoratorMsg:
-    def __init__(
-        self,
-        namespace: str,
-        resource: OR,
-        server: str | None,
-        slow_oc_reconcile_threshold: float,
-        is_log_slow_oc_reconcile: bool,
-    ):
-        self.namespace = namespace
-        self.resource = resource
-        self.server = server
-        self.slow_oc_reconcile_threshold = slow_oc_reconcile_threshold
-        self.is_log_slow_oc_reconcile = is_log_slow_oc_reconcile
+    namespace: str
+    resource: OR
+    server: str | None
+    slow_oc_reconcile_threshold: float
+    is_log_slow_oc_reconcile: bool
 
 
 def oc_process(template, parameters=None):
@@ -383,7 +376,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
             self.projects = {p["metadata"]["name"] for p in self.get_all(kind)["items"]}
 
         self.slow_oc_reconcile_threshold = float(
-            os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", 600)
+            os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", "600")
         )
 
         self.is_log_slow_oc_reconcile = os.environ.get(
@@ -456,7 +449,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
             self.projects = {p["metadata"]["name"] for p in self.get_all(kind)["items"]}
 
         self.slow_oc_reconcile_threshold = float(
-            os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", 600)
+            os.environ.get("SLOW_OC_RECONCILE_THRESHOLD", "600")
         )
 
         self.is_log_slow_oc_reconcile = os.environ.get(
@@ -484,9 +477,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
 
         if "labels" in kwargs:
             labels_list = [f"{k}={v}" for k, v in kwargs.get("labels").items()]
-
-            cmd.append("-l")
-            cmd.append(",".join(labels_list))
+            cmd += ["-l", ",".join(labels_list)]
 
         resource_names = kwargs.get("resource_names")
         if resource_names:
@@ -766,9 +757,9 @@ class OCCli:  # pylint: disable=too-many-public-methods
         if not finished_pods:
             raise JobNotRunningError(name)
 
-        latest_pod = sorted(
+        latest_pod = max(
             finished_pods, key=lambda pod: pod["metadata"]["creationTimestamp"]
-        )[-1]
+        )
         cmd = [
             "logs",
             "--all-containers=true",
@@ -1180,7 +1171,7 @@ class OCCli:  # pylint: disable=too-many-public-methods
 
             if not find:
                 raise StatusCodeError(
-                    f"{self.server}: {apigroup_override}" f" does not have kind {kind}"
+                    f"{self.server}: {apigroup_override} does not have kind {kind}"
                 )
         return (kind, group_version)
 
@@ -1420,7 +1411,7 @@ class OCLocal(OCCli):
 class OC:
     client_status = Counter(
         name="qontract_reconcile_native_client",
-        documentation="Cluster is using openshift " "native client",
+        documentation="Cluster is using openshift native client",
         labelnames=["cluster_name", "native_client"],
     )
 
@@ -1667,7 +1658,7 @@ class OC_Map:
                     cluster,
                     OCLogMsg(
                         log_level=logging.ERROR,
-                        message=f"[{cluster}]" f" is unreachable: {e}",
+                        message=f"[{cluster}] is unreachable: {e}",
                     ),
                     privileged,
                 )
@@ -1770,13 +1761,9 @@ def validate_labels(labels: dict[str, str]) -> Iterable[str]:
 
     for k, v in labels.items():
         if len(v) > LABEL_MAX_VALUE_LENGTH:
-            err.append(
-                f"Label value longer than " f"{LABEL_MAX_VALUE_LENGTH} chars: {v}"
-            )
+            err.append(f"Label value longer than {LABEL_MAX_VALUE_LENGTH} chars: {v}")
         if not v_pattern.match(v):
-            err.append(
-                f"Label value is invalid, it needs to match " f"'{v_pattern}': {v}"
-            )
+            err.append(f"Label value is invalid, it needs to match '{v_pattern}': {v}")
 
         prefix, name = "", k
         if "/" in k:
@@ -1792,8 +1779,7 @@ def validate_labels(labels: dict[str, str]) -> Iterable[str]:
             )
         if not k_name_pattern.match(name):
             err.append(
-                f"Label key name is invalid, it needs to mach "
-                f"'{v_pattern}'': {name}"
+                f"Label key name is invalid, it needs to mach '{v_pattern}'': {name}"
             )
 
         if prefix:

reconcile/utils/oc_map.py

@@ -54,7 +54,7 @@ class OCMap:
         self._init_api_resources = init_api_resources
         self._lock = Lock()
         self._jh_ports: dict[str, int] = {}
-        self._oc_cls = oc_cls if oc_cls else OC
+        self._oc_cls = oc_cls or OC
 
         threaded.run(
             self._init_oc_client,

reconcile/utils/ocm/base.py

@@ -166,8 +166,10 @@ class OCMClusterAWSSettings(BaseModel):
             roles.append(self.sts.role_arn)
         if self.sts.support_role_arn:
             roles.append(self.sts.support_role_arn)
-        for instance_iam_role in (self.sts.instance_iam_roles or {}).values():
-            roles.append(instance_iam_role)
+        roles.extend(
+            instance_iam_role
+            for instance_iam_role in (self.sts.instance_iam_roles or {}).values()
+        )
         return roles
 
     @property

reconcile/utils/ocm/search_filters.py

@@ -355,9 +355,10 @@ class Filter:
         """
         if not self.conditions:
             raise InvalidFilterError("no conditions within filter object")
-        rendered_conditions = []
-        for condition in sorted(self.conditions, key=lambda c: c.key):
-            rendered_conditions.append(condition.render())
+        rendered_conditions = [
+            condition.render()
+            for condition in sorted(self.conditions, key=lambda c: c.key)
+        ]
         if self.mode == FilterMode.OR:
             concat = " or ".join(rendered_conditions)
             if len(rendered_conditions) > 1:

reconcile/utils/ocm/status_board.py

@@ -22,7 +22,7 @@ def get_product_applications(
             application.get("metadata", {}).get(METADATA_MANAGED_BY_KEY, "")
             == METADATA_MANAGED_BY_VALUE
         ):
-            results.append({
+            results.append({  # noqa: PERF401
                 k: v for k, v in application.items() if k in APPLICATION_DESIRED_KEYS
             })
 
@@ -36,7 +36,7 @@ def get_managed_products(ocm_api: OCMBaseClient) -> list[dict[str, Any]]:
             product.get("metadata", {}).get(METADATA_MANAGED_BY_KEY, "")
             == METADATA_MANAGED_BY_VALUE
         ):
-            results.append({
+            results.append({  # noqa: PERF401
                 k: v for k, v in product.items() if k in PRODUCTS_DESIRED_KEYS
             })
     return results

reconcile/utils/ocm/upgrades.py

@@ -132,7 +132,7 @@ def get_node_pool_upgrade_policies(
     for policy in ocm_api.get_paginated(
         f"{build_cluster_url(cluster_id)}/node_pools/{node_pool}/upgrade_policies"
     ):
-        results.append({
+        results.append({  # noqa: PERF401
             k: v for k, v in policy.items() if k in UPGRADE_POLICY_DESIRED_KEYS
         })
     return results
@@ -166,12 +166,9 @@ def create_version_agreement(
 def get_version_agreement(
     ocm_api: OCMBaseClient, cluster_id: str
 ) -> list[dict[str, Any]]:
-    agreements = []
-    for item in ocm_api.get_paginated(
-        f"{build_cluster_url(cluster_id)}/gate_agreements"
-    ):
-        agreements.append(item)
-    return agreements
+    return list(
+        ocm_api.get_paginated(f"{build_cluster_url(cluster_id)}/gate_agreements")
+    )
 
 
 def get_version_gates(ocm_api: OCMBaseClient) -> list[OCMVersionGate]:

reconcile/utils/ocm_base_client.py

@@ -44,7 +44,7 @@ class OCMBaseClient:
         self._access_token_client_id = access_token_client_id
         self._access_token_url = access_token_url
         self._url = url
-        self._session = session if session else Session()
+        self._session = session or Session()
         self._init_access_token()
         self._init_request_headers()
 

reconcile/utils/openshift_resource.py

@@ -51,7 +51,7 @@ CONTROLLER_MANAGED_LABELS: dict[str, set[str | re.Pattern]] = {
         "clusterID",
         "managed-by",
         "openshiftVersion",
-        re.compile("feature.open-cluster-management.io/.*"),
+        re.compile(r"feature.open-cluster-management.io/.*"),
     }
 }
 

reconcile/utils/promtool.py

@@ -68,7 +68,7 @@ def _run_yaml_spec_cmd(cmd: list[str], yaml_spec: Mapping) -> CommandExecutionRe
         try:
             result = subprocess.run(cmd, capture_output=True, check=True)
         except subprocess.CalledProcessError as e:
-            msg = f'Error running promtool command [{" ".join(cmd)}]'
+            msg = f"Error running promtool command [{' '.join(cmd)}]"
             if e.stdout:
                 msg += f" {e.stdout.decode()}"
             if e.stderr:

reconcile/utils/quay_api.py

@@ -45,9 +45,7 @@ class QuayApi:
         body = r.json()
 
         # Using a set because members may be repeated
-        members = set()
-        for member in body["members"]:
-            members.add(member["name"])
+        members = {member["name"] for member in body["members"]}
 
         members_list = list(members)
         self.team_members[team] = members_list