qontract-reconcile 0.10.2.dev256__tar.gz → 0.10.2.dev257__tar.gz

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev256
+Version: 0.10.2.dev257
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/pyproject.toml

@@ -82,7 +82,7 @@ dev = [
     "pytest-mock ~=3.6",
     "qenerate==0.7.0",
     "responses ~=0.25.0",
-    "ruff ~=0.9.0",
+    "ruff ~=0.12.2",
     "smtpdfix ~=0.3.3",
     "testslide ~=2.7",
     "typeguard ~=2.13.3",
@@ -189,8 +189,12 @@ extend-select = [
     "PERF",
     # refurb
     "FURB",
+    # PEP8
+    "N",
 ]
 ignore = [
+    "N811",    # Constant `xxx` imported as non-constant `xxx`
+    "N817",    # CamelCase `xxx` imported as acronym `xxx`
     "PLR0904", # Too many public methods
     "PLR0911", # Too many return statements
     "PLR0912", # Too many branches

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aus/advanced_upgrade_service.py

@@ -358,7 +358,7 @@ def _build_org_upgrade_spec(
 
     org_labelset = build_labelset(org_labels, OrganizationLabelSet)
     final_org = org.copy(deep=True)
-    final_org.blocked_versions = org_labelset.blocked_versions
+    final_org.blocked_versions = org_labelset.blocked_versions  # type: ignore
     final_org.sectors = org_labelset.sector_dependencies()
     final_org.inherit_version_data = inherit_version_data
     org_upgrade_spec = OrganizationUpgradeSpec(org=final_org)

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aus/base.py

@@ -116,7 +116,7 @@ class AdvancedUpgradeSchedulerBaseIntegrationParams(PydanticRunParams):
     ignore_sts_clusters: bool = False
 
 
-class ReconcileErrorSummary(Exception):
+class ReconcileError(Exception):
     def __init__(self, exceptions: list[str]) -> None:
         self.exceptions = exceptions
 
@@ -150,7 +150,7 @@ class AdvancedUpgradeSchedulerBaseIntegration(
                             )
 
         if unhandled_exceptions:
-            raise ReconcileErrorSummary(unhandled_exceptions)
+            raise ReconcileError(unhandled_exceptions)
         sys.exit(0)
 
     def get_orgs_for_environment(

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aus/version_gates/sts_version_gate_handler.py

@@ -4,7 +4,7 @@ from reconcile.aus.version_gates.handler import GateHandler
 from reconcile.utils.jobcontroller.controller import K8sJobController
 from reconcile.utils.ocm.base import OCMCluster, OCMVersionGate
 from reconcile.utils.ocm_base_client import OCMBaseClient
-from reconcile.utils.rosa.rosa_cli import RosaCliException
+from reconcile.utils.rosa.rosa_cli import RosaCliError
 from reconcile.utils.rosa.session import RosaSession
 
 GATE_LABEL = "api.openshift.com/gate-sts"
@@ -93,7 +93,7 @@ class STSGateHandler(GateHandler):
                 cluster_id=cluster.id,
                 dry_run=dry_run,
             )
-        except RosaCliException as e:
+        except RosaCliError as e:
             logging.error(f"Failed to upgrade roles for cluster {cluster.name}: {e}")
             e.write_logs_to_logger(logging.error)
             return False

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aws_account_manager/reconciler.py

@@ -11,10 +11,10 @@ from reconcile.utils.aws_api_typed.iam import (
 )
 from reconcile.utils.aws_api_typed.organization import AwsOrganizationOU
 from reconcile.utils.aws_api_typed.service_quotas import (
-    AWSResourceAlreadyExistsException,
+    AWSResourceAlreadyExistsError,
 )
-from reconcile.utils.aws_api_typed.support import SUPPORT_PLAN
-from reconcile.utils.state import AbortStateTransaction, State
+from reconcile.utils.aws_api_typed.support import SupportPlan
+from reconcile.utils.state import AbortStateTransactionError, State
 
 TASK_CREATE_ACCOUNT = "create-account"
 TASK_DESCRIBE_ACCOUNT = "describe-account"
@@ -66,7 +66,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Creating account")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             status = aws_api.organizations.create_account(email=email, name=name)
             # store the status id for future reference
@@ -98,7 +98,9 @@ class AWSReconciler:
                         f"Account creation failed: {status.failure_reason}"
                     )
                 case "IN_PROGRESS":
-                    raise AbortStateTransaction("Account creation still in progress")
+                    raise AbortStateTransactionError(
+                        "Account creation still in progress"
+                    )
                 case _:
                     raise RuntimeError(
                         f"Unexpected account creation status: {status.state}"
@@ -115,7 +117,7 @@ class AWSReconciler:
             logging.info(f"{name}: Setting tags {tags}")
             _state.value = tags
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             if _state.exists:
                 aws_api.organizations.untag_resource(
@@ -138,7 +140,7 @@ class AWSReconciler:
             logging.info(f"{name}: Moving account to OU {ou}")
             destination = self._get_destination_ou(aws_api, destination_path=ou)
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             aws_api.organizations.move_account(
                 uid=uid,
@@ -157,7 +159,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Set account alias '{new_alias}'")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             aws_api.iam.set_account_alias(account_alias=new_alias)
 
@@ -193,7 +195,7 @@ class AWSReconciler:
                 )
 
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             ids = []
             for new_quota in new_quotas:
@@ -203,8 +205,8 @@ class AWSReconciler:
                         quota_code=new_quota.quota_code,
                         desired_value=new_quota.value,
                     )
-                except AWSResourceAlreadyExistsException:
-                    raise AbortStateTransaction(
+                except AWSResourceAlreadyExistsError:
+                    raise AbortStateTransactionError(
                         f"{name}: A quota increase for this {new_quota.service_code}/{new_quota.quota_code} already exists. Try it again later."
                     ) from None
                 ids.append(req.id)
@@ -227,7 +229,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Checking quota change requests")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             _state.value = []
             for request_id in request_ids:
@@ -255,14 +257,14 @@ class AWSReconciler:
             if _state.exists:
                 return _state.value
 
-            if aws_api.support.get_support_level() == SUPPORT_PLAN.ENTERPRISE:
+            if aws_api.support.get_support_level() == SupportPlan.ENTERPRISE:
                 if self.dry_run:
-                    raise AbortStateTransaction("Dry run")
+                    raise AbortStateTransactionError("Dry run")
                 return None
 
             logging.info(f"{name}: Enabling enterprise support")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             case_id = aws_api.support.create_case(
                 subject=f"Add account {uid} to Enterprise Support",
@@ -291,7 +293,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Checking enterprise support case {case_id}")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             case = aws_api.support.describe_case(case_id=case_id)
             if case.status == "resolved":
@@ -300,7 +302,7 @@ class AWSReconciler:
             logging.info(
                 f"Enterprise support case {case_id} is still open. Current status: {case.status}"
             )
-            raise AbortStateTransaction("Enterprise support case still open")
+            raise AbortStateTransactionError("Enterprise support case still open")
 
     def _set_security_contact(
         self,
@@ -322,7 +324,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Setting security contact")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             aws_api.account.set_security_contact(
                 name=name, title=title, email=email, phone_number=phone_number
@@ -369,7 +371,7 @@ class AWSReconciler:
                 logging.info(f"{name}: Disabling regions {to_disable_regions}")
 
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             for aws_region in to_enable_regions:
                 aws_api.account.enable_region(aws_region)
@@ -408,7 +410,7 @@ class AWSReconciler:
 
             logging.info(f"{name}: Creating IAM user '{user_name}'")
             if self.dry_run:
-                raise AbortStateTransaction("Dry run")
+                raise AbortStateTransactionError("Dry run")
 
             aws_api.iam.create_user(user_name=user_name)
             aws_api.iam.attach_user_policy(

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aws_iam_keys.py

@@ -48,9 +48,9 @@ def init_tf_working_dirs(
     thread_pool_size: int,
     settings: Mapping[str, Any],
 ) -> dict[str, str]:
-    # copied here to avoid circular dependency
-    QONTRACT_INTEGRATION = "terraform_resources"
-    QONTRACT_TF_PREFIX = "qrtf"
+    # Avoid circular import
+    import reconcile.terraform_resources  # noqa: PLC0415
+
     # if the terraform-resources integration is disabled
     # for an account, it means that Terrascript will not
     # initiate that account's config and will not create
@@ -59,8 +59,8 @@ def init_tf_working_dirs(
     # created by terraform-resources, but it is disabled
     # tl;dr - we are good. how cool is this alignment...
     ts = Terrascript(
-        QONTRACT_INTEGRATION,
-        QONTRACT_TF_PREFIX,
+        reconcile.terraform_resources.QONTRACT_INTEGRATION,
+        reconcile.terraform_resources.QONTRACT_TF_PREFIX,
         thread_pool_size,
         accounts,
         settings=settings,

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aws_iam_password_reset.py

@@ -41,7 +41,7 @@ class AwsProfileToReset(BaseModel):
 
 class AwsAccountWithResets(BaseModel):
     account: Mapping[str, Any]
-    resetPasswords: list[AwsProfileToReset]
+    reset_passwords: list[AwsProfileToReset]
 
 
 @defer
@@ -63,7 +63,7 @@ def run(dry_run: bool, defer: Callable | None = None) -> None:
 
         account_reset = AwsAccountWithResets(
             account=a,
-            resetPasswords=[],
+            reset_passwords=[],
         )
         accounts_to_reset.append(account_reset)
 
@@ -83,7 +83,7 @@ def run(dry_run: bool, defer: Callable | None = None) -> None:
                 logging.error(f"User {user_name} is not in account {account_name}")
                 sys.exit(1)
 
-            account_reset.resetPasswords.append(
+            account_reset.reset_passwords.append(
                 AwsProfileToReset(
                     user_name=user_name,
                     state_key=state_key,
@@ -91,11 +91,11 @@ def run(dry_run: bool, defer: Callable | None = None) -> None:
             )
 
     for a in accounts_to_reset:
-        if not a.resetPasswords:
+        if not a.reset_passwords:
             continue
 
         with AWSApi(1, [a.account], settings=settings) as aws_api:
-            for r in a.resetPasswords:
+            for r in a.reset_passwords:
                 user_name = r.user_name
                 state_key = r.state_key
 

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aws_saml_roles/integration.py

@@ -58,7 +58,7 @@ class AwsSamlRolesIntegrationParams(PydanticRunParams):
     log_cached_log_output: bool = False
 
     @validator("max_session_duration_hours")
-    def max_session_duration_range(cls, v: str | int) -> int:
+    def max_session_duration_range(cls, v: str | int) -> int:  # noqa: N805
         if 1 <= int(v) <= 12:
             return int(v)
         raise ValueError("max_session_duration_hours must be between 1 and 12 hours")
@@ -69,7 +69,7 @@ class CustomPolicy(BaseModel):
     policy: dict[str, Any]
 
     @validator("name")
-    def name_size(cls, v: str) -> str:
+    def name_size(cls, v: str) -> str:  # noqa: N805
         """Check the policy name size.
 
         See https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html
@@ -81,7 +81,7 @@ class CustomPolicy(BaseModel):
         return v
 
     @validator("policy")
-    def policy_size(cls, v: dict[str, Any]) -> dict[str, Any]:
+    def policy_size(cls, v: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         """Check the policy size.
 
         See https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html
@@ -104,7 +104,7 @@ class AwsRole(BaseModel):
     managed_policies: list[ManagedPolicy]
 
     @validator("name")
-    def name_size(cls, v: str) -> str:
+    def name_size(cls, v: str) -> str:  # noqa: N805
         """Check the role name size.
 
         See https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html
@@ -116,7 +116,7 @@ class AwsRole(BaseModel):
         return v
 
     @root_validator
-    def validate_policies(cls, values: dict[str, Any]) -> dict[str, Any]:
+    def validate_policies(cls, values: dict[str, Any]) -> dict[str, Any]:  # noqa: N805
         """Check the policies.
 
         See https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/aws_version_sync/integration.py

@@ -107,15 +107,16 @@ class ExternalResource(BaseModel):
         )
 
     @validator("resource_engine_version", pre=True)
-    def parse_resource_engine_version(  # pylint: disable=no-self-argument
-        cls, v: str | semver.VersionInfo
+    def parse_resource_engine_version(
+        cls,  # noqa: N805
+        v: str | semver.VersionInfo,
     ) -> semver.VersionInfo:
         if isinstance(v, semver.VersionInfo):
             return v
         return parse_semver(str(v), optional_minor_and_patch=True)
 
     @root_validator(pre=True)
-    def set_resource_engine_version_format(cls, values: dict) -> dict:
+    def set_resource_engine_version_format(cls, values: dict) -> dict:  # noqa: N805
         resource_engine_version, resource_engine_version_format = (
             str(values.get("resource_engine_version")),
             values.get("resource_engine_version_format"),

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/cli.py

@@ -21,7 +21,7 @@ from reconcile.status import (
     RunningState,
 )
 from reconcile.utils import gql
-from reconcile.utils.aggregated_list import RunnerException
+from reconcile.utils.aggregated_list import RunnerError
 from reconcile.utils.amtool import AMTOOL_VERSION, AMTOOL_VERSION_REGEX
 from reconcile.utils.binary import (
     binary,
@@ -533,7 +533,7 @@ def register_faulthandler(fileobj: TextIOWrapper | None = sys.__stderr__) -> Non
                 logging.debug("faulthandler enabled.")
                 faulthandler.register(SIGUSR1, file=fileobj, all_threads=True)
                 logging.debug("SIGUSR1 registered with faulthandler.")
-            except RunnerException:
+            except RunnerError:
                 logging.warning("Failed to register USR1 or enable faulthandler.")
         else:
             logging.debug("Skipping, faulthandler already enabled")
@@ -591,13 +591,13 @@ def run_class_integration(
                 print_url=ctx.obj["gql_url_print"],
             )
         )
-    except gql.GqlApiIntegrationNotFound as e:
+    except gql.GqlApiIntegrationNotFoundError as e:
         sys.stderr.write(str(e) + "\n")
         sys.exit(ExitCodes.INTEGRATION_NOT_FOUND)
-    except RunnerException as e:
+    except RunnerError as e:
         sys.stderr.write(str(e) + "\n")
         sys.exit(ExitCodes.ERROR)
-    except gql.GqlApiErrorForbiddenSchema as e:
+    except gql.GqlApiErrorForbiddenSchemaError as e:
         sys.stderr.write(str(e) + "\n")
         sys.exit(ExitCodes.FORBIDDEN_SCHEMA)
     except Exception:

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/closedbox_endpoint_monitoring_base.py

@@ -1,3 +1,4 @@
+# ruff: noqa: N815
 import json
 import logging
 from collections import defaultdict

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/database_access_manager.py

@@ -707,7 +707,7 @@ class DatabaseAccessManagerIntegration(QontractReconcileIntegration):
             integration=QONTRACT_INTEGRATION, secret_reader=self.secret_reader
         )
 
-        encounteredErrors: list[Exception] = []
+        encountered_errors: list[Exception] = []
 
         namespaces = get_database_access_namespaces()
         for namespace in namespaces:
@@ -741,9 +741,9 @@ class DatabaseAccessManagerIntegration(QontractReconcileIntegration):
                                 vault_client,
                             )
                         except (JobFailedError, ValueError) as e:
-                            encounteredErrors.append(e)
+                            encountered_errors.append(e)
 
-            if encounteredErrors:
-                for err in encounteredErrors:
+            if encountered_errors:
+                for err in encountered_errors:
                     logging.error(err)
                 raise JobFailedError("One or more jobs failed to complete")

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/dynatrace_token_provider/integration.py

@@ -62,7 +62,7 @@ DTP_V3_SPEC_SUFFIX = "token-spec"
 DTP_V3_TENANT_SUFFIX = "tenant"
 
 
-class ReconcileErrorSummary(Exception):
+class ReconcileError(Exception):
     def __init__(self, exceptions: Iterable[str]) -> None:
         self.exceptions = exceptions
 
@@ -279,7 +279,7 @@ class DynatraceTokenProviderIntegration(QontractReconcileIntegration[NoParams]):
                 self._expose_token_metrics()
 
         if unhandled_exceptions:
-            raise ReconcileErrorSummary(unhandled_exceptions)
+            raise ReconcileError(unhandled_exceptions)
 
     def process_cluster(
         self,

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/external_resources/manager.py

@@ -20,7 +20,7 @@ from reconcile.external_resources.model import (
     ExternalResourceKey,
     ExternalResourceModuleConfiguration,
     ExternalResourceOrphanedResourcesError,
-    ExternalResourceOutputResourceNameDuplications,
+    ExternalResourceOutputResourceNameDuplicationsError,
     ExternalResourcesInventory,
     ExternalResourceValidationError,
     ModuleInventory,
@@ -93,7 +93,7 @@ class ExternalResourceDryRunsValidator:
             for spec in self.er_inventory.values()
         )
         if duplicates := [key for key, count in specs.items() if count > 1]:
-            raise ExternalResourceOutputResourceNameDuplications(duplicates)
+            raise ExternalResourceOutputResourceNameDuplicationsError(duplicates)
 
     def _check_orphaned_objects(self) -> None:
         state_keys = self.state_mgr.get_all_resource_keys()

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/external_resources/model.py

@@ -50,7 +50,7 @@ class ExternalResourceOrphanedResourcesError(Exception):
         super().__init__("".join(msg))
 
 
-class ExternalResourceOutputResourceNameDuplications(Exception):
+class ExternalResourceOutputResourceNameDuplicationsError(Exception):
     def __init__(self, duplicates: Iterable[tuple[str, str, str]]) -> None:
         msg = [
             "There are output_resource_name attribute duplications. ",

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/external_resources/secrets_sync.py

@@ -34,7 +34,7 @@ from reconcile.utils.oc import (
 )
 from reconcile.utils.oc_map import OCMap, init_oc_map_from_clusters
 from reconcile.utils.openshift_resource import OpenshiftResource, ResourceInventory
-from reconcile.utils.secret_reader import SecretNotFound, SecretReaderBase
+from reconcile.utils.secret_reader import SecretNotFoundError, SecretReaderBase
 from reconcile.utils.three_way_diff_strategy import three_way_diff_using_hash
 from reconcile.utils.vault import (
     VaultClient,
@@ -455,5 +455,5 @@ class VaultSecretsReconciler(SecretsReconciler):
             spec.metadata[SECRET_UPDATED_AT] = data[SECRET_UPDATED_AT]
             del data[SECRET_UPDATED_AT]
             spec.secret = data
-        except SecretNotFound:
+        except SecretNotFoundError:
             logging.info("Error getting secret from vault, skipping. [%s]", secret_path)

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/gabi_authorized_users.py

@@ -15,7 +15,7 @@ from typing import Any
 import reconcile.openshift_base as ob
 from reconcile import queries
 from reconcile.status import ExitCodes
-from reconcile.utils.aggregated_list import RunnerException
+from reconcile.utils.aggregated_list import RunnerError
 from reconcile.utils.defer import defer
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.external_resources import get_external_resource_specs
@@ -66,7 +66,7 @@ def fetch_desired_state(
     for g in gabi_instances:
         expiration_date = datetime.strptime(g["expirationDate"], "%Y-%m-%d").date()
         if (expiration_date - date.today()).days > EXPIRATION_DAYS_MAX:
-            raise RunnerException(
+            raise RunnerError(
                 f"The maximum expiration date of {g['name']} shall not "
                 f"exceed {EXPIRATION_DAYS_MAX} days from today"
             )
@@ -91,7 +91,7 @@ def fetch_desired_state(
                     found = True
                     break
             if not found:
-                raise RunnerException(
+                raise RunnerError(
                     f"[gabi:{g['name']} (path: {g['path']})] Could not find RDS identifier {identifier} "
                     f"for account {account} in namespace {namespace['name']}. "
                     "If this is a removed read only instance, consider updating the identifier to the source replica."

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/github_org.py

@@ -416,10 +416,10 @@ class RunnerAction:
 
     @staticmethod
     def raise_exception(msg: str) -> Callable:
-        def raiseException(params: dict, items: dict) -> None:
+        def _raise_exception(params: dict, items: dict) -> None:
             raise Exception(msg)
 
-        return raiseException
+        return _raise_exception
 
 
 def service_is(service: str) -> Callable:

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/gitlab_housekeeping.py

@@ -277,7 +277,7 @@ def handle_stale_items(
     items: Iterable[ProjectIssue | ProjectMergeRequest],
     item_type: str,
 ) -> None:
-    LABEL = "stale"
+    LABEL = "stale"  # noqa: N806
 
     now = datetime.utcnow()
     for item in items:

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/gitlab_mr_sqs_consumer.py

@@ -59,7 +59,7 @@ def run(dry_run: str, gitlab_project_id: str, defer: Callable | None = None) ->
                     merge_request = mr.init_from_sqs_message(body)
                     merge_request.submit_to_gitlab(gitlab_cli=gitlab_cli)
                     sqs_cli.delete_message(str(receipt_handle))
-                except mr.UnknownMergeRequestType as ex:
+                except mr.UnknownMergeRequestTypeError as ex:
                     # Received an unknown MR type.
                     # This could be a producer being on a newer version
                     # of qontract-reconcile than the consumer.

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/glitchtip/integration.py

@@ -58,7 +58,7 @@ def get_user_role(organization: Organization, roles: RoleV1) -> str:
     return DEFAULT_MEMBER_ROLE
 
 
-class GlitchtipException(Exception):
+class GlitchtipError(Exception):
     pass
 
 
@@ -102,7 +102,7 @@ def fetch_desired_state(
         )
         # Check project is unique within an organization
         if project.name in [p.name for p in organization.projects]:
-            raise GlitchtipException(f'project name "{project.name}" already in use!')
+            raise GlitchtipError(f'project name "{project.name}" already in use!')
         for glitchtip_team in glitchtip_project.teams:
             users: list[User] = []
 

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/jenkins_worker_fleets.py

@@ -36,11 +36,11 @@ def get_current_state(jenkins: JenkinsApi) -> list[JenkinsWorkerFleet]:
 
 
 def get_desired_state(
-    terrascript: Terrascript, workerFleets: list[dict[str, Any]]
+    terrascript: Terrascript, worker_fleets: list[dict[str, Any]]
 ) -> list[JenkinsWorkerFleet]:
     desired_state = []
 
-    for f in workerFleets:
+    for f in worker_fleets:
         namespace = f["namespace"]
         account = f["account"]
         identifier = f["identifier"]
@@ -131,8 +131,8 @@ def run(dry_run: bool) -> None:
     )
 
     for instance in jenkins_instances:
-        workerFleets = instance.get("workerFleets", [])
-        if not workerFleets:
+        worker_fleets = instance.get("workerFleets", [])
+        if not worker_fleets:
             # Skip instance if no fleets defined
             continue
 
@@ -140,7 +140,7 @@ def run(dry_run: bool) -> None:
         instance_name = instance["name"]
         jenkins = JenkinsApi.init_jenkins_from_secret(secret_reader, token)
         current_state = get_current_state(jenkins)
-        desired_state = get_desired_state(terrascript, workerFleets)
+        desired_state = get_desired_state(terrascript, worker_fleets)
         act(dry_run, instance_name, current_state, desired_state, jenkins)
 
 

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/ldap_groups/integration.py

@@ -22,7 +22,7 @@ from reconcile.utils.exceptions import (
 from reconcile.utils.helpers import find_duplicates
 from reconcile.utils.internal_groups.client import (
     InternalGroupsClient,
-    NotFound,
+    NotFoundError,
 )
 from reconcile.utils.internal_groups.models import (
     Entity,
@@ -226,7 +226,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         """Reach out to the internal groups API and fetch all managed groups."""
         groups = []
         for group_name in group_names:
-            with contextlib.suppress(NotFound):
+            with contextlib.suppress(NotFoundError):
                 groups.append(internal_groups_client.group(group_name))
         return groups
 
@@ -263,7 +263,7 @@ class LdapGroupsIntegration(QontractReconcileIntegration[LdapGroupsIntegrationPa
         for group_to_remove in diff_result.delete.values():
             logging.info(["delete_ldap_group", group_to_remove.name])
             if not dry_run:
-                with contextlib.suppress(NotFound):
+                with contextlib.suppress(NotFoundError):
                     internal_groups_client.delete_group(group_to_remove.name)
                 self._managed_groups.remove(group_to_remove.name)
 

{qontract_reconcile-0.10.2.dev256 → qontract_reconcile-0.10.2.dev257}/reconcile/ocm_clusters.py

@@ -26,7 +26,7 @@ from reconcile.utils.ocm.products import (
     IGNORE_NETWORK_TYPE_ATTR,
     OCMProduct,
     OCMProductPortfolio,
-    OCMValidationException,
+    OCMValidationError,
     build_product_portfolio,
 )
 from reconcile.utils.rosa.session import RosaSessionBuilder
@@ -448,7 +448,7 @@ class OcmClusters(QontractReconcileIntegration[OcmClustersParams]):
                         "its manifest to app-interface"
                     )
                     error = True
-                except OCMValidationException as e:
+                except OCMValidationError as e:
                     logging.error("[%s] Error creating cluster: %s", cluster_name, e)
                     error = True