qontract-reconcile 0.10.2.dev479__tar.gz → 0.10.2.dev481__tar.gz

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev479
+Version: 0.10.2.dev481
 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
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: ==3.12.*
-Requires-Dist: anymarkup<0.9.0,>=0.7.0
+Requires-Dist: anymarkup==0.8.1
 Requires-Dist: boto3==1.34.94
 Requires-Dist: botocore==1.34.94
 Requires-Dist: click<9.0,>=7.0
@@ -23,7 +23,7 @@ Requires-Dist: dnspython~=2.1
 Requires-Dist: dt==1.1.73
 Requires-Dist: filetype~=1.2.0
 Requires-Dist: gql==3.1.0
-Requires-Dist: hvac<0.8.0,>=0.7.0
+Requires-Dist: hvac==2.4.0
 Requires-Dist: jenkins-job-builder==6.4.2
 Requires-Dist: jinja2<3.2.0,>=2.10.1
 Requires-Dist: jira==3.10.5
@@ -33,7 +33,6 @@ Requires-Dist: jsonpath-rw<1.5.0,>=1.4.0
 Requires-Dist: jsonpointer~=2.4
 Requires-Dist: kubernetes==32.0.1
 Requires-Dist: ldap3<2.10.0,>=2.9.1
-Requires-Dist: markupsafe==2.1.1
 Requires-Dist: networkx~=2.8
 Requires-Dist: parse==1.18.0
 Requires-Dist: prometheus-client~=0.8

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "anymarkup>=0.7.0,<0.9.0",
+    "anymarkup==0.8.1",
     # keep in sync with boto3-stubs in dependency-groups.type
     "boto3==1.34.94",
     "botocore==1.34.94",
@@ -25,7 +25,7 @@ dependencies = [
     "dt==1.1.73",
     "filetype~=1.2.0",
     "gql==3.1.0",
-    "hvac>=0.7.0,<0.8.0",
+    "hvac==2.4.0",
     "jenkins-job-builder==6.4.2",
     "Jinja2>=2.10.1,<3.2.0",
     "jira==3.10.5",
@@ -35,7 +35,6 @@ dependencies = [
     "jsonpointer~=2.4",
     "kubernetes==32.0.1",
     "ldap3>=2.9.1,<2.10.0",
-    "MarkupSafe==2.1.1",
     "networkx~=2.8",
     "parse==1.18.0",
     "prometheus-client~=0.8",
@@ -72,23 +71,21 @@ dependencies = [
 [dependency-groups]
 debugger = ["debugpy ~=1.8.17"]
 dev = [
-    "anymarkup ~=0.8.1",
     # keep in sync project.dependencies.boto3
     "boto3-stubs[account,cloudformation,dynamodb,ec2,ecr,elb,iam,logs,organizations,rds,route53,s3,service-quotas,sqs,sts,support]==1.34.94",
-    "MarkupSafe ~=2.1.1",
-    "moto[ec2,iam,logs,s3,route53] ~=5.1",
-    "mypy ~=1.17.0",
-    "pyfakefs ~=5.9",
-    "pytest ~=8.4",
-    "pytest-cov ~=6.2",
-    "pytest-httpserver ~=1.1",
-    "pytest-mock ~=3.6",
-    "qenerate==0.9.0",
-    "responses ~=0.25.0",
-    "ruff==0.12.12",
-    "smtpdfix ~=0.5.2",
-    "snakeviz ~=2.2.2",
-    "testslide ~=2.7.1",
+    "moto[ec2,iam,logs,s3,route53]==5.1.20",
+    "mypy==1.19.1",
+    "pyfakefs==6.0.0",
+    "pytest==9.0.2",
+    "pytest-cov==7.0.0",
+    "pytest-httpserver==1.1.3",
+    "pytest-mock==3.15.1",
+    "qenerate==0.9.1",
+    "responses==0.25.0",
+    "ruff==0.14.13",
+    "smtpdfix==0.5.3",
+    "snakeviz==2.2.2",
+    "testslide==2.7.1",
     "types-click",
     "types-croniter",
     "types-dateparser",
@@ -219,6 +216,7 @@ ignore = [
     "B017",    #`pytest.raises(Exception)` should be considered evil
     "RUF005",  # Consider "...."instead of concatenation
     "RUF012",  # Mutable class attributes should be annotated with "typing.ClassVar"
+    "RUF067",  # `__init__` module should only contain docstrings and re-exports
     # Review later
     "FURB101", # Replace `open` with `pathlib.Path`
     "FURB103", # Replace `open` with `pathlib.Path`

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/aws_account_manager/reconciler.py

@@ -59,10 +59,10 @@ class AWSReconciler:
         email: str,
     ) -> str | None:
         """Create the organization account and return the creation status ID."""
-        with self.state.transaction(state_key(name, TASK_CREATE_ACCOUNT)) as _state:
-            if _state.exists:
+        with self.state.transaction(state_key(name, TASK_CREATE_ACCOUNT)) as state:
+            if state.exists:
                 # account already exists, nothing to do
-                return _state.value
+                return state.value
 
             logging.info(f"{name}: Creating account")
             if self.dry_run:
@@ -70,7 +70,7 @@ class AWSReconciler:
 
             status = aws_api.organizations.create_account(email=email, name=name)
             # store the status id for future reference
-            _state.value = status.id
+            state.value = status.id
             return status.id
 
     def _org_account_exists(
@@ -80,10 +80,10 @@ class AWSReconciler:
         create_account_request_id: str,
     ) -> str | None:
         """Check if the organization account exists and return its ID."""
-        with self.state.transaction(state_key(name, TASK_DESCRIBE_ACCOUNT)) as _state:
-            if _state.exists:
+        with self.state.transaction(state_key(name, TASK_DESCRIBE_ACCOUNT)) as state:
+            if state.exists:
                 # account checked and exists, nothing to do
-                return _state.value
+                return state.value
 
             logging.info(f"{name}: Checking account creation status")
             status = aws_api.organizations.describe_create_account_status(
@@ -91,7 +91,7 @@ class AWSReconciler:
             )
             match status.state:
                 case "SUCCEEDED":
-                    _state.value = status.uid
+                    state.value = status.uid
                     return status.uid
                 case "FAILED":
                     raise RuntimeError(
@@ -109,19 +109,19 @@ class AWSReconciler:
     def _tag_account(
         self, aws_api: AWSApi, name: str, uid: str, tags: dict[str, str]
     ) -> None:
-        with self.state.transaction(state_key(name, TASK_TAG_ACCOUNT)) as _state:
-            if _state.exists and _state.value == tags:
+        with self.state.transaction(state_key(name, TASK_TAG_ACCOUNT)) as state:
+            if state.exists and state.value == tags:
                 # account already tagged, nothing to do
                 return
 
             logging.info(f"{name}: Setting tags {tags}")
-            _state.value = tags
+            state.value = tags
             if self.dry_run:
                 raise AbortStateTransactionError("Dry run")
 
-            if _state.exists:
+            if state.exists:
                 aws_api.organizations.untag_resource(
-                    resource_id=uid, tag_keys=_state.value.keys()
+                    resource_id=uid, tag_keys=state.value.keys()
                 )
             aws_api.organizations.tag_resource(resource_id=uid, tags=tags)
 
@@ -132,8 +132,8 @@ class AWSReconciler:
         return org_tree_root.find(destination_path)
 
     def _move_account(self, aws_api: AWSApi, name: str, uid: str, ou: str) -> None:
-        with self.state.transaction(state_key(name, TASK_MOVE_ACCOUNT)) as _state:
-            if _state.exists and _state.value == ou:
+        with self.state.transaction(state_key(name, TASK_MOVE_ACCOUNT)) as state:
+            if state.exists and state.value == ou:
                 # account already moved, nothing to do
                 return
 
@@ -146,15 +146,15 @@ class AWSReconciler:
                 uid=uid,
                 destination_parent_id=destination.id,
             )
-            _state.value = ou
+            state.value = ou
 
     def _set_account_alias(self, aws_api: AWSApi, name: str, alias: str | None) -> None:
         """Create an account alias."""
         new_alias = alias or name
         with self.state.transaction(
             state_key(name, TASK_ACCOUNT_ALIAS), new_alias
-        ) as _state:
-            if _state.exists and _state.value == new_alias:
+        ) as state:
+            if state.exists and state.value == new_alias:
                 return
 
             logging.info(f"{name}: Set account alias '{new_alias}'")
@@ -170,9 +170,9 @@ class AWSReconciler:
         quotas_dict = [q.model_dump() for q in quotas]
         with self.state.transaction(
             state_key(name, TASK_REQUEST_SERVICE_QUOTA)
-        ) as _state:
-            if _state.exists and _state.value["last_applied_quotas"] == quotas_dict:
-                return _state.value["ids"]
+        ) as state:
+            if state.exists and state.value["last_applied_quotas"] == quotas_dict:
+                return state.value["ids"]
 
             # ATTENTION: reverting previously applied quotas or lowering them is not supported
             new_quotas = []
@@ -211,7 +211,7 @@ class AWSReconciler:
                     ) from None
                 ids.append(req.id)
 
-            _state.value = {"last_applied_quotas": quotas_dict, "ids": ids}
+            state.value = {"last_applied_quotas": quotas_dict, "ids": ids}
             return ids
 
     def _check_quota_change_requests(
@@ -223,22 +223,22 @@ class AWSReconciler:
         """Check the status of the quota change requests."""
         with self.state.transaction(
             state_key(name, TASK_CHECK_SERVICE_QUOTA_STATUS)
-        ) as _state:
-            if _state.exists and _state.value == request_ids:
+        ) as state:
+            if state.exists and state.value == request_ids:
                 return
 
             logging.info(f"{name}: Checking quota change requests")
             if self.dry_run:
                 raise AbortStateTransactionError("Dry run")
 
-            _state.value = []
+            state.value = []
             for request_id in request_ids:
                 req = aws_api.service_quotas.get_requested_service_quota_change(
                     request_id=request_id
                 )
                 match req.status:
                     case "CASE_CLOSED" | "APPROVED":
-                        _state.value.append(request_id)
+                        state.value.append(request_id)
                     case "DENIED" | "INVALID_REQUEST" | "NOT_APPROVED":
                         raise RuntimeError(
                             f"Quota change request {request_id} failed: {req.status}"
@@ -253,9 +253,9 @@ class AWSReconciler:
         """Enable enterprise support for the account."""
         with self.state.transaction(
             state_key(name, TASK_ENABLE_ENTERPRISE_SUPPORT), ""
-        ) as _state:
-            if _state.exists:
-                return _state.value
+        ) as state:
+            if state.exists:
+                return state.value
 
             if aws_api.support.get_support_level() == SupportPlan.ENTERPRISE:
                 if self.dry_run:
@@ -278,7 +278,7 @@ class AWSReconciler:
                     [rh-internal-account-name: {name}]
                 """),
             )
-            _state.value = case_id
+            state.value = case_id
             return case_id
 
     def _check_enterprise_support_status(
@@ -287,8 +287,8 @@ class AWSReconciler:
         """Check the status of the enterprise support case."""
         with self.state.transaction(
             state_key(case_id, TASK_CHECK_ENTERPRISE_SUPPORT_STATUS), True
-        ) as _state:
-            if _state.exists:
+        ) as state:
+            if state.exists:
                 return
 
             logging.info(f"{name}: Checking enterprise support case {case_id}")
@@ -318,8 +318,8 @@ class AWSReconciler:
         security_contact = f"{name} {title} {email} {phone_number}"
         with self.state.transaction(
             state_key(account, TASK_SET_SECURITY_CONTACT)
-        ) as _state:
-            if _state.exists and _state.value == security_contact:
+        ) as state:
+            if state.exists and state.value == security_contact:
                 return
 
             logging.info(f"{account}: Setting security contact")
@@ -329,7 +329,7 @@ class AWSReconciler:
             aws_api.account.set_security_contact(
                 name=name, title=title, email=email, phone_number=phone_number
             )
-            _state.value = security_contact
+            state.value = security_contact
 
     def _set_supported_regions(
         self,
@@ -340,8 +340,8 @@ class AWSReconciler:
         """Set the supported regions for the account."""
         with self.state.transaction(
             state_key(name, TASK_SET_SUPPORTED_REGIONS)
-        ) as _state:
-            if _state.exists and _state.value == regions:
+        ) as state:
+            if state.exists and state.value == regions:
                 return
 
             aws_regions = aws_api.account.list_regions()
@@ -378,7 +378,7 @@ class AWSReconciler:
             for aws_region in to_disable_regions:
                 aws_api.account.disable_region(aws_region)
 
-            _state.value = regions
+            state.value = regions
 
     #
     # Public methods
@@ -404,8 +404,8 @@ class AWSReconciler:
         """Create an IAM user and return its access key."""
         with self.state.transaction(
             state_key(name, TASK_CREATE_IAM_USER), user_name
-        ) as _state:
-            if _state.exists and _state.value == user_name:
+        ) as state:
+            if state.exists and state.value == user_name:
                 return None
 
             logging.info(f"{name}: Creating IAM user '{user_name}'")

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/aws_version_sync/integration.py

@@ -434,11 +434,12 @@ class AVSIntegration(QontractReconcileIntegration[AVSIntegrationParams]):
             current=external_resources_app_interface,
             desired=external_resources_aws,
             key=lambda r: r.key,
-            equal=lambda external_resources_app_interface,
-            external_resources_aws: external_resources_app_interface.resource_engine_version_string
-            == external_resources_aws.resource_engine_version_string
-            and external_resources_app_interface.resource_engine
-            == external_resources_aws.resource_engine,
+            equal=lambda external_resources_app_interface, external_resources_aws: (
+                external_resources_app_interface.resource_engine_version_string
+                == external_resources_aws.resource_engine_version_string
+                and external_resources_app_interface.resource_engine
+                == external_resources_aws.resource_engine
+            ),
         )
         for diff_pair in diff.change.values():
             aws_resource = diff_pair.desired

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/change_owners/change_types.py

@@ -90,8 +90,8 @@ class DiffCoverage:
         Returns a list of change-owner labels of all involved change-type contexts.
         """
         labels = {label for c in self.coverage for label in c.change_owner_labels or {}}
-        for _split in self._split_into:
-            labels.update(_split.change_owner_labels)
+        for split in self._split_into:
+            labels.update(split.change_owner_labels)
         return labels
 
     def relative_path(self) -> jsonpath_ng.JSONPath:

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/gitlab_permissions.py

@@ -98,8 +98,9 @@ class GroupPermissionHandler:
         diff_data = diff_mappings(
             current=current_state,
             desired=desired_state,
-            equal=lambda current, desired: current.group_access_level
-            == desired.group_access_level,
+            equal=lambda current, desired: (
+                current.group_access_level == desired.group_access_level
+            ),
         )
         errors: list[Exception] = []
         for repo in diff_data.add:

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/openshift_base.py

@@ -860,7 +860,8 @@ def patch_desired_resource_for_recycle_annotations(
         return desired
 
     current_annotations = (
-        current.body.get("spec", {})
+        current.body
+        .get("spec", {})
         .get("template", {})
         .get("metadata", {})
         .get("annotations")
@@ -873,7 +874,8 @@ def patch_desired_resource_for_recycle_annotations(
     }
     if patch_annotations:
         desired_annotations = (
-            desired.body.setdefault("spec", {})
+            desired.body
+            .setdefault("spec", {})
             .setdefault("template", {})
             .setdefault("metadata", {})
             .setdefault("annotations", {})

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/openshift_resources_base.py

@@ -1238,13 +1238,9 @@ def early_exit_monkey_patch() -> Generator:
     ) as mocks:
         # mock lookup_secret
         mocks["lookup_secret"].side_effect = (
-            lambda path,
-            key,
-            version=None,
-            tvars=None,
-            allow_not_found=False,
-            settings=None,
-            secret_reader=None: f"vault({path}, {key}, {version}"
+            lambda path, key, version=None, tvars=None, allow_not_found=False, settings=None, secret_reader=None: (
+                f"vault({path}, {key}, {version}"
+            )
         )
         # needed for jinja2 `is_safe_callable`
         mocks["lookup_secret"].unsafe_callable = False
@@ -1252,12 +1248,9 @@ def early_exit_monkey_patch() -> Generator:
 
         # mock lookup_github_file_content
         mocks["lookup_github_file_content"].side_effect = (
-            lambda repo,
-            path,
-            ref,
-            tvars=None,
-            settings=None,
-            secret_reader=None: f"github({repo}, {path}, {ref})"
+            lambda repo, path, ref, tvars=None, settings=None, secret_reader=None: (
+                f"github({repo}, {path}, {ref})"
+            )
         )
         # needed for jinja2 `is_safe_callable`
         mocks["lookup_github_file_content"].unsafe_callable = False
@@ -1271,10 +1264,9 @@ def early_exit_monkey_patch() -> Generator:
 
         # mock lookup_s3_object
         mocks["lookup_s3_object"].side_effect = (
-            lambda account_name,
-            bucket_name,
-            path,
-            region_name=None: f"lookup_s3_object({account_name}, {bucket_name}, {path}, {region_name})"
+            lambda account_name, bucket_name, path, region_name=None: (
+                f"lookup_s3_object({account_name}, {bucket_name}, {path}, {region_name})"
+            )
         )
         # needed for jinja2 `is_safe_callable`
         mocks["lookup_s3_object"].unsafe_callable = False
@@ -1282,10 +1274,9 @@ def early_exit_monkey_patch() -> Generator:
 
         # mock list_s3_objects
         mocks["list_s3_objects"].side_effect = (
-            lambda account_name,
-            bucket_name,
-            path,
-            region_name=None: f"list_s3_objects({account_name}, {bucket_name}, {path}, {region_name})"
+            lambda account_name, bucket_name, path, region_name=None: (
+                f"list_s3_objects({account_name}, {bucket_name}, {path}, {region_name})"
+            )
         )
         # needed for jinja2 `is_safe_callable`
         mocks["list_s3_objects"].unsafe_callable = False

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/typed_queries/saas_files.py

@@ -342,6 +342,6 @@ def get_saasherder_settings(
 ) -> AppInterfaceSettingsV1:
     if not query_func:
         query_func = gql.get_api().query
-    if _settings := saasherder_settings_query(query_func).settings:
-        return _settings[0]
+    if settings := saasherder_settings_query(query_func).settings:
+        return settings[0]
     raise AppInterfaceSettingsError("settings missing")

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/typed_queries/smtp.py

@@ -10,8 +10,8 @@ from reconcile.utils.exceptions import (
 
 
 def settings() -> SmtpSettingsV1:
-    if _settings := query(query_func=gql.get_api().query).settings:
-        if not _settings[0].smtp:
+    if settings_ := query(query_func=gql.get_api().query).settings:
+        if not settings_[0].smtp:
             raise AppInterfaceSmtpSettingsError("settings.smtp missing")
-        return _settings[0].smtp
+        return settings_[0].smtp
     raise AppInterfaceSettingsError("settings missing")

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/jira_client.py

@@ -233,9 +233,9 @@ class JiraClient:
 
     def get_issue_type(self, issue_type: str) -> IssueType | None:
         """Return a issue type (e.g. Task) for the project if it exists."""
-        for _issue_type in self.project_issue_types(self.project):
-            if _issue_type.name == issue_type:
-                return _issue_type
+        for issue_type_ in self.project_issue_types(self.project):
+            if issue_type_.name == issue_type:
+                return issue_type_
         return None
 
     @staticmethod
@@ -305,11 +305,11 @@ class JiraClient:
 
         This API endpoint needs createIssue project permissions.
         """
-        for _field in self.project_issue_fields(
+        for field_ in self.project_issue_fields(
             project=self.project, issue_type_id=issue_type_id
         ):
-            if _field.name == field:
-                return _field
+            if field_.name == field:
+                return field_
         return None
 
     def _priorities(self) -> list[Priority]:

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/jobcontroller/controller.py

@@ -120,7 +120,8 @@ class K8sJobController:
         if job_resource is None:
             return None
         return (
-            job_resource.body.get("metadata", {})
+            job_resource.body
+            .get("metadata", {})
             .get("annotations", {})
             .get(JOB_GENERATION_ANNOTATION)
         )
@@ -325,6 +326,7 @@ class K8sJobController:
                 self.integration,
                 self.integration_version,
             ).annotate(),
+            server_side=True,
         )
 
         # if the job defines secret data, we need to create the secret
@@ -338,6 +340,7 @@ class K8sJobController:
                     self.integration,
                     self.integration_version,
                 ).annotate(),
+                server_side=True,
             )
 
     def validate_job(self, job: V1Job) -> None:

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/oc.py

@@ -573,8 +573,17 @@ class OCCli:
         return json.loads(result)["items"]
 
     @OCDecorators.process_reconcile_time
-    def apply(self, namespace: str, resource: OR) -> OCProcessReconcileTimeDecoratorMsg:
-        cmd = ["apply", "-n", namespace, "-f", "-"]
+    def apply(
+        self,
+        namespace: str,
+        resource: OR,
+        server_side: bool = False,
+    ) -> OCProcessReconcileTimeDecoratorMsg:
+        cmd = (
+            ["apply"]
+            + (["--server-side"] if server_side else [])
+            + ["-n", namespace, "-f", "-"]
+        )
         self._run(cmd, stdin=resource.to_json(), apply=True)
         return self._msg_to_process_reconcile_time(namespace, resource)
 

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/rhcsv2_certs.py

@@ -143,7 +143,8 @@ def generate_cert(
 ) -> RhcsV2CertPem | RhcsV2CertPkcs12:
     private_key = rsa.generate_private_key(65537, 4096)
     csr = (
-        x509.CertificateSigningRequestBuilder()
+        x509
+        .CertificateSigningRequestBuilder()
         .subject_name(
             x509.Name([
                 x509.NameAttribute(NameOID.USER_ID, uid),

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/terrascript_aws_client.py

@@ -3054,9 +3054,9 @@ class TerrascriptClient:
         assert specs is not None  # make mypy happy
         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"]
@@ -3249,10 +3249,10 @@ class TerrascriptClient:
         specs = common_values.get("specs")
         assert specs is not None  # make mypy happy
         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"]
@@ -7275,7 +7275,8 @@ class TerrascriptClient:
 
         # resource - cloudwatch
         if (
-            values.get("logging_info", {})
+            values
+            .get("logging_info", {})
             .get("broker_logs", {})
             .get("cloudwatch_logs", {})
             .get("enabled", False)

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/reconcile/utils/vault.py

@@ -179,7 +179,7 @@ class VaultClient:
             # must read each time to account for sa token refresh
             with open(self.kube_sa_token_path, encoding="locale") as f:
                 try:
-                    self._client.auth_kubernetes(
+                    self._client.auth.kubernetes.login(
                         role=self.kube_auth_role,
                         jwt=f.read(),
                         mount_point=self.kube_auth_mount,
@@ -190,7 +190,9 @@ class VaultClient:
                         f"using role '{self.kube_auth_role}' on mount '{self.kube_auth_mount}': {e}"
                     )
         else:
-            self._client.auth_approle(self.role_id, self.secret_id)
+            self._client.auth.approle.login(
+                role_id=self.role_id, secret_id=self.secret_id
+            )
 
     @retry()
     def read_all_with_version(self, secret: Mapping) -> tuple[dict, int | None]:

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/tools/app_interface_reporter.py

@@ -366,9 +366,9 @@ def get_build_history_pool(
     jenkins_map: Mapping, jobs: Mapping, timestamp_limit: int, thread_pool_size: int
 ) -> dict:
     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)

{qontract_reconcile-0.10.2.dev479 → qontract_reconcile-0.10.2.dev481}/tools/glitchtip_access_reporter.py

@@ -66,7 +66,7 @@ def main(
                         ),
                     )
                     if org.name not in [
-                        _org.name for _org in report_user.organizations
+                        org_.name for org_ in report_user.organizations
                     ]:
                         report_user.organizations.append(
                             GlitchtipAccessReportOrg(