qontract-reconcile 0.10.2.dev479__py3-none-any.whl → 0.10.2.dev480__py3-none-any.whl

{qontract_reconcile-0.10.2.dev479.dist-info → qontract_reconcile-0.10.2.dev480.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev479
+Version: 0.10.2.dev480
 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.dist-info → qontract_reconcile-0.10.2.dev480.dist-info}/RECORD

@@ -31,7 +31,7 @@ reconcile/gitlab_labeler.py,sha256=BA2dbXsN9hErUwJl22qcxfeH7XiPCuQ9LN3NddWdnpo,4
 reconcile/gitlab_members.py,sha256=ZpwsN5WkDwo-QroIXBRjJ5qV577o8m3mvVSmpPkNNhE,8252
 reconcile/gitlab_mr_sqs_consumer.py,sha256=3FB5vbVB9INBxMj4s1PrDIX-I1Gwu-CGBOH2_KeYShQ,2718
 reconcile/gitlab_owners.py,sha256=So7OWq3B1f3-aYlhd2kARYt1nwPV4jrbf5YPRXoHPrM,14663
-reconcile/gitlab_permissions.py,sha256=VqrgrtM1CGWASau73CvphlolCDEIMLX0fwo4kFs55dI,8168
+reconcile/gitlab_permissions.py,sha256=0H2UCa_44hgWbbOKFTw7zxjOjhjqDmS-m6r1gFFkaLQ,8188
 reconcile/gitlab_projects.py,sha256=JIB1UP8CnwSkngEMZE7DFQETMX6sJMp4DXaKoS-Pdkc,1879
 reconcile/integrations_manager.py,sha256=fk5Vt7MaJMb0XnC2AZjcSPi8RQ-wM8tf8LADKsdu6G0,9416
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
@@ -54,7 +54,7 @@ reconcile/ocm_groups.py,sha256=gDnkhkYUEoMkI6y6ctyoKIFpJNS18SVnedW4OzJ8VWs,4174
 reconcile/ocm_machine_pools.py,sha256=l_ZJNkM-Pl4vl2LRI-aFjBjJm_TFSNKZchIjeZQB-0M,17738
 reconcile/ocm_update_recommended_version.py,sha256=Vi3Y2sX-OQxx1mv_xiPQXnmrpsZzGIE38No0yBcTaD4,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=j4qthqx8qREB6mSbV9NT-Giq1Tu5y2EhPgIObkvmjyU,4371
-reconcile/openshift_base.py,sha256=5EyuG7bi7KTbJoYnDewiQVLUjm_ERVhJbqutbaLvFj0,57907
+reconcile/openshift_base.py,sha256=ERc8BELzWr8PF8SQtBbcYkzvudLe676ecEmS09MYZz0,57929
 reconcile/openshift_cluster_bots.py,sha256=QBflmFjXaIY7bxNlI2qSI5sER3Jks-_FAhrPHschI4g,10939
 reconcile/openshift_clusterrolebindings.py,sha256=jwSaYQvUUY7noQGc148Dkqm6woYxvOEd1sume7k_sUk,6212
 reconcile/openshift_groups.py,sha256=XpIyhgnWY1XUQio1wi6sHoDtoMYdk-lpHp0-1d1RC7o,9471
@@ -65,7 +65,7 @@ reconcile/openshift_network_policies.py,sha256=e6yo7F0zpeGySycqeK0ugzSmC_kn_5h4W
 reconcile/openshift_prometheus_rules.py,sha256=FVVx1D7KCUnNZh7NwVNbD6t4lXKRSO7ph5bvAXruPno,1417
 reconcile/openshift_resourcequotas.py,sha256=0CSuCre3T2ON42Ku1UDhTRugfmUNBx8PILpxIQaAzJU,2882
 reconcile/openshift_resources.py,sha256=YnhDxCvsp0muxEmULiqWhoar9EzxohTrnbY-U7oS5Hc,1603
-reconcile/openshift_resources_base.py,sha256=tuOEH1UKoWksmPAfZJOhmLY6IghkvBcZyqa48kDLeR4,43172
+reconcile/openshift_resources_base.py,sha256=wOdQMLqaiQleQTsC8MH9nwpBKFffLcOuZthpOcc1heE,43096
 reconcile/openshift_rhcs_certs.py,sha256=UjBFX344n4eFXZmoEUCVeGECBowWTpbjNyPGrEzAmkA,11544
 reconcile/openshift_rolebindings.py,sha256=G4n7wWTGZ34OsRgen0L3EpdPXuFEdZ_1E-b3ROvSb4I,10824
 reconcile/openshift_routes.py,sha256=xnA34f32xDdkfV2MXIC1QURFJioQUsXT8AZBiY7iSP0,1298
@@ -142,7 +142,7 @@ reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 reconcile/aws_account_manager/integration.py,sha256=qpqefqnq4sPtXW13LBL0D2a5wXdq44mZzi3JxJtM7P0,16042
 reconcile/aws_account_manager/merge_request_manager.py,sha256=ePdn3c5MHZEW9iawgQWg7L5ydPLh0YZzfmRYV-rBCD8,3987
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
-reconcile/aws_account_manager/reconciler.py,sha256=xbCih3aOFk_98Nxly7-W8QMrT67loTH2-HVyQudjH00,17162
+reconcile/aws_account_manager/reconciler.py,sha256=_CBoRJyfabfesdaP0C_bT-xELwAKtkOiVuMtEQVbP44,17114
 reconcile/aws_account_manager/utils.py,sha256=m40ntjpxREpVPuzJv4pCG3LWtojAeqEoPOfbeIbmQUU,1443
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_ami_cleanup/integration.py,sha256=NJhGzl9lMOG4VgYf8IsoZFJeYTRS1e5ORpHfIUEl3tA,9264
@@ -153,7 +153,7 @@ reconcile/aws_saml_idp/integration.py,sha256=svCFxrxXY1HOh0ge7LaoeNZ3DskOVKvCCI9
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_roles/integration.py,sha256=WU44OvMHk0huM4MlUS6REdwzfC08iHXbTEtZ3TNEJRQ,11572
 reconcile/aws_version_sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_version_sync/integration.py,sha256=jiQeSVozOls24PtBAn_tKOw4LuzyT5Oy2iTW8eU7lXQ,21373
+reconcile/aws_version_sync/integration.py,sha256=UGskrZ0DnNRoOIIDJRWrNcCala_zKmtPvOd_r7Lq1Cc,21405
 reconcile/aws_version_sync/utils.py,sha256=x-45QT7zAwdNvCg7w_qJNwLaksFcfz1_6KQoD_0IVuA,1727
 reconcile/aws_version_sync/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLdqxycWNvX1eNbwMjWSVBb7q0p-8t5Db0m7b4Q,4842
@@ -164,7 +164,7 @@ reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeV
 reconcile/change_owners/bundle.py,sha256=6a51hi8yn2QwxQLQ4xc9zwlL5IT2sCbHriFuVJVeqzQ,5376
 reconcile/change_owners/change_log_tracking.py,sha256=njIBC6pRb6U2GmeXxAAc_CruIfnDpEUhOp05DrPFsuk,9531
 reconcile/change_owners/change_owners.py,sha256=Ay3KdLJBKH59xMdNYbiNTr2ow71bKPm0URiv4DjcB2M,18400
-reconcile/change_owners/change_types.py,sha256=5eSvS2_npUriq9RN4LdAWdYUiNzF91K1pDUEVYDIQ4k,32023
+reconcile/change_owners/change_types.py,sha256=e6zoXQ_kctwqNJyTt0SXqD06VNTIDYAgzu6H05djKzg,32021
 reconcile/change_owners/changes.py,sha256=YTqwUYutQ6JVSSYmC2Ph5ROCiVix42Vnzy47-i57z4Q,18119
 reconcile/change_owners/decision.py,sha256=WaT7ehJFYofsgSbbpabj3a5jniomxy8R4wQpb3xsdsw,7487
 reconcile/change_owners/diff.py,sha256=xuyvnHcdRuQ8Twl0QST3rbbPo-hiH1uTycTet_AoT8k,8944
@@ -561,10 +561,10 @@ reconcile/typed_queries/quay.py,sha256=3IMy9jjHF2f9t47EXZOQVA3p0nFkWFhaFhxhvib-7
 reconcile/typed_queries/repos.py,sha256=8A93dKDt6igT4ClqMjt7YUTsoP4qh1Wnm0W3xsMgj48,824
 reconcile/typed_queries/reserved_networks.py,sha256=XY9y3amtIQT0n06O0Toubqr_UmylJ2ELAv9-BJCK890,345
 reconcile/typed_queries/rhcs_provider_settings.py,sha256=fxD84CPCiH25_qc02p48LOIJHv39Wlc1VwOhs9ZVsKk,743
-reconcile/typed_queries/saas_files.py,sha256=yVJiba_kIKYaRqSxXovNC2Zupf-KfWoVWQdOmeD1ccY,14666
+reconcile/typed_queries/saas_files.py,sha256=QvAcLxsQZGQcIFSlRCiDaGPaE3G8L92UTVgg5Ncw2M0,14664
 reconcile/typed_queries/slack.py,sha256=r30lspctHloyygPn8_DVybxPwUWwiBpvBRRXiTVcQYk,251
 reconcile/typed_queries/slo_documents.py,sha256=YMdox_-lBRqrdxamPhdnUlRTY_Ro35ptsupq7OaynUQ,362
-reconcile/typed_queries/smtp.py,sha256=aSLglYa5bHKmlGwKkxq2RZqyMWuAf0a4S_mOuhDa084,542
+reconcile/typed_queries/smtp.py,sha256=_mIjwpma4_N0Jhr7jozE_ZAE66MC5r9pAS6lhURcT6M,542
 reconcile/typed_queries/status_board.py,sha256=y-1H3cGYyWKT9OXiq3hNcPieaeHYdAqfne94DUCSHcY,1838
 reconcile/typed_queries/tekton_pipeline_providers.py,sha256=LtoSnSRkuckYsXIU64L1Mf-o3iuUjaN-5O-ARzIROZA,515
 reconcile/typed_queries/terraform_namespaces.py,sha256=4H9WE90jN_BVYBAt1DxJITS4vkL-vykbXZIS1H4EKNM,413
@@ -619,7 +619,7 @@ reconcile/utils/helpers.py,sha256=DHeMt684XULOLqAwEZs92jrnfG7nOGFArCUgbTbip0U,18
 reconcile/utils/imap_client.py,sha256=sJSBBCObR34JTk70raIkJYXZbmEOOyc8IDQ1CrcSO1Q,2019
 reconcile/utils/instrumented_wrappers.py,sha256=BwJBirum_ISxDy1Zf1_90PaQ9Q5JSp0TInv26CmkjiE,1935
 reconcile/utils/jenkins_api.py,sha256=A7J2AnOxHHZfA-dqjUCtFgy4145peA7WwUvRIXjR5Qo,8623
-reconcile/utils/jira_client.py,sha256=dEDGFxJYF_JmbqD72qLeTWyUhVQ-YTgBqTr6UMrdn1c,11777
+reconcile/utils/jira_client.py,sha256=Zoj3ehxk4VpH7OlzpwxOwG22cCValZ4XmQUoCmTpZVI,11777
 reconcile/utils/jjb_client.py,sha256=4YyfvQj7Uh7bJ1boczvOo9yrbWUfEDjGjlISw6HW8OE,16917
 reconcile/utils/json.py,sha256=okNqZCz_R54TL4WCTrnsxpdI11VB7wKTSMu7OrKjaAo,2045
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
@@ -650,7 +650,7 @@ reconcile/utils/quay_mirror.py,sha256=dpWCNv5lITwIk6Q9RkmqaQKHNk_JPy27UQEribJ7E-
 reconcile/utils/raw_github_api.py,sha256=ZUDtOxdMSMs-Z0noKi0pyMtXHi5V2nCMFDB5JIM_oQ0,3057
 reconcile/utils/repo_owners.py,sha256=c6Z-U5TkiRPvuhr_zYWvZG9HZGzoT-l-d2PJ33lGflE,6507
 reconcile/utils/rest_api_base.py,sha256=MT7tp6CQO2S5aKfVOzw_hipWg7wAGoOqkm4qurI1hEU,4342
-reconcile/utils/rhcsv2_certs.py,sha256=wt-dYeCeoiLTkt8VGHI2FXxQjBxuLAIIsWVRC9DfuxE,6613
+reconcile/utils/rhcsv2_certs.py,sha256=KjtDga8p7DZeUmIg-CJerQIsypVHjPClTCp8hdbDBZA,6622
 reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=9wcKdC6cuxHFn1j1GpLgBkWl3-7TVGTGWHcevmGtYL0,9988
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
@@ -663,10 +663,10 @@ reconcile/utils/sqs_gateway.py,sha256=GoStXLTP75zBQIL0ntwVy1oHOquY3XHtadybzifLdX
 reconcile/utils/state.py,sha256=kOI5ZorbJKWomQbnOql7uBuO7A0zQu54tUxUTZ2lEKE,16416
 reconcile/utils/structs.py,sha256=ZS3mYM3s188lfLZjcWpOoIpU8Xq76sxaapgRHJCdF-g,377
 reconcile/utils/terraform_client.py,sha256=VexlnYM9h-2-g6Y8HiE48BFi8AX-mYLhIapl2G2PUPQ,37769
-reconcile/utils/terrascript_aws_client.py,sha256=qazXB2Re1DFReDcHwplcIF7_SmlE__z0XJv6hvd0L50,307485
+reconcile/utils/terrascript_aws_client.py,sha256=t3iKwg3QZbRRRw_T4qZPevgYV1E5X9WA43s3XQamEJE,307498
 reconcile/utils/three_way_diff_strategy.py,sha256=yDEbP3HWvDDVzo_8FEbcT0pA6lz72HviXZkh5wmzkkY,4837
 reconcile/utils/throughput.py,sha256=KNDCVsCLSp89V4pO3sEUd7bJUuh6gNfsxsc_18rEv_Y,357
-reconcile/utils/vault.py,sha256=6gYe-EKrYnz3SI_JM8gSpbXT9yfMrwDAw23kgiH7pV4,15573
+reconcile/utils/vault.py,sha256=bzdHKN2RwLwyZhZeoNiidpYGfcWHa0qjXPKa6FN8UOU,15633
 reconcile/utils/vcs.py,sha256=RDqe4bz01n_oU4VJRjSbbmWn-yqvFNCKCkC8JXgSfuU,10304
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=G10mrztmTbdwcSuuXu4cp5gGH2Ogv9vZAAOBQUdl7e0,2625
@@ -702,7 +702,7 @@ reconcile/utils/jinja2/extensions.py,sha256=7K-uo6G2eCWa98MHT8fRPYIKCLQB_5D2keqQ
 reconcile/utils/jinja2/filters.py,sha256=JfO_14APySBPidsMvHXG-8dULNPddZCE15Umjk_aSBk,4830
 reconcile/utils/jinja2/utils.py,sha256=iTwfFLWwuMIAIMuEnENrwcL7CRWw24fUmcWKLFw6jOE,9231
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/jobcontroller/controller.py,sha256=3bNip_Eedu3HU8qd02kSBlNCivwSLSE1SlwcGysdrVs,15349
+reconcile/utils/jobcontroller/controller.py,sha256=UyV6t7HZH5LxVf3UyGaeN1WzG-tPEPyNg_ksm6zSnUU,15362
 reconcile/utils/jobcontroller/models.py,sha256=okj1zGdharGTJYW-f1XyvmWfp4F2ESTkvhYvrmzSGGE,6936
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=cK4WkGRtqfdSq-RTswJ47nqQSZYiXshI3gFiKfILZe0,2014
@@ -772,12 +772,12 @@ reconcile/utils/unleash/server.py,sha256=X79h8E371IeBjJlKtufKxwfo3EBUPxrJ17yVRFM
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/alert_report.py,sha256=cyQTei8_SYOggW_6uYvzhrF7Nae-9xOz-jmh9O9V8R8,5589
 tools/app_interface_metrics_exporter.py,sha256=mCi6SZf20mo5yvRI2VoqmrCdz46Ph3JhpEJPvryXncY,2261
-tools/app_interface_reporter.py,sha256=OLSTsGVcV-yJFY-RcrscVSKUWuQv63AEcv_69TH2xQk,17642
+tools/app_interface_reporter.py,sha256=k_9-qxhp4zORhu4zc8EXdKId_VMoXPoZpAu04u7G4r0,17642
 tools/app_sre_tekton_access_reporter.py,sha256=5qmkevJdlb2j_lpGC5Pu1Pmo0eomX5ZxzS_GNkqHAEE,3104
 tools/app_sre_tekton_access_revalidation.py,sha256=vwL1o_j7oSTOhrHNH1znpgjA2LHGzb8yc5iG3aaY4m0,2684
-tools/glitchtip_access_reporter.py,sha256=wnaiDGW4MkYONV_erltnJ6nGkEj0kQrAiv04NNnOS0k,2859
+tools/glitchtip_access_reporter.py,sha256=HRPALTkMiiVJbAJHAQam1ptaDq5eRQXhf4Qt-n1Q-x8,2859
 tools/glitchtip_access_revalidation.py,sha256=jjeLO53LTbz_LfQw3G2Cs8lVLO_6xqU39BYyTH3cEPE,2764
-tools/qontract_cli.py,sha256=70fp6gxuEjvEDooqThUyPV6AuXk2UjCFq9rp3-i6bUw,160266
+tools/qontract_cli.py,sha256=wi2loe1dVpj8jYGqVpjaRnF0Wy3bcaPxjY3CjTqbY_M,160266
 tools/template_validation.py,sha256=imLeY5zYE_ITk0yl99pqkoqcG2psFG0jLYKTZ7NXLcY,3393
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=8mAjCS6XR0yD7k0mfiVBlt6xbYU47q_ftdYNi5o5VKE,5566
@@ -803,7 +803,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev479.dist-info/METADATA,sha256=S8y7PdpWCuc852MqrZRmjaXKWpQ-grJVtnuqlbn3NiI,24948
-qontract_reconcile-0.10.2.dev479.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev479.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev479.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev480.dist-info/METADATA,sha256=jpe2_IZtrGHSGKGrq0HZ3Fxyi933BiPjxBqUWNlP_zY,24901
+qontract_reconcile-0.10.2.dev480.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev480.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev480.dist-info/RECORD,,

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}'")

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

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:

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:

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", {})

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

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")

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")

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]:

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)
         )

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),

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)

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]:

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)

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(

tools/qontract_cli.py

@@ -4543,8 +4543,8 @@ def migrate(ctx: click.Context, dry_run: bool, skip_build: bool) -> None:
 def debug_shell(ctx: click.Context) -> None:
     """Enter an ERv2 debug shell to manually migrate resources."""
     # use a temporary directory in $HOME. The MacOS colima default configuration allows docker mounts from $HOME.
-    with tempfile.TemporaryDirectory(dir=Path.home(), prefix="erv2-debug.") as _tempdir:
-        tempdir = Path(_tempdir)
+    with tempfile.TemporaryDirectory(dir=Path.home(), prefix="erv2-debug.") as tempdir_:
+        tempdir = Path(tempdir_)
         with progress_spinner() as progress:
             with task(progress, "Preparing environment ..."):
                 credentials_file = tempdir / "credentials"
@@ -4582,8 +4582,8 @@ def force_unlock(ctx: click.Context, lock_id: str) -> None:
     # use a temporary directory in $HOME. The MacOS colima default configuration allows docker mounts from $HOME.
     with tempfile.TemporaryDirectory(
         dir=Path.home(), prefix="erv2-unlock."
-    ) as _tempdir:
-        tempdir = Path(_tempdir)
+    ) as tempdir_:
+        tempdir = Path(tempdir_)
         with progress_spinner() as progress:
             with task(progress, "Preparing environment ..."):
                 credentials_file = tempdir / "credentials"