qontract-reconcile 0.10.1rc1031__py3-none-any.whl → 0.10.1rc1033__py3-none-any.whl

{qontract_reconcile-0.10.1rc1031.dist-info → qontract_reconcile-0.10.1rc1033.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1031
+Version: 0.10.1rc1033
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1031.dist-info → qontract_reconcile-0.10.1rc1033.dist-info}/RECORD

@@ -7,10 +7,10 @@ reconcile/aws_ecr_image_pull_secrets.py,sha256=TGEc_0nv8oxV2HqA8VdcM4HHP-B1YqmNO
 reconcile/aws_garbage_collector.py,sha256=ddwU8IKTueAJc0TzymcREr7hcoVui9kOGvdH1B2EcuM,450
 reconcile/aws_iam_keys.py,sha256=GpxZR_A4ZQFlOQG1jpNiYhL5GMxdeTJ05aAYgUwWveE,3633
 reconcile/aws_iam_password_reset.py,sha256=q96mwr2KeEQ5bpNniGlgIMZTxiuLSodcYfX-tSaZPjA,3108
-reconcile/aws_support_cases_sos.py,sha256=Jk6_XjDeJSYxgRGqcEAOcynt9qJF2r5HPIPcSKmoBv8,2974
+reconcile/aws_support_cases_sos.py,sha256=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
-reconcile/cli.py,sha256=XYYAh7NPZY86nIIJXNaY3ehbP1ACuix-pMpBUJqsLI4,107372
+reconcile/cli.py,sha256=2hjHLQED4DR41EHoov3uHiURb8dfAbDpaTwxnEvrVhk,107388
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=rLh16BOlBOxTmJ8Si3wWyyEpmMlhh4Znx1Gc36qsmOc,4865
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=l34QDu1G96_Ctnh7ZXdxXgSeCE93GQMdLAkWxmN6vDA,4775
@@ -23,7 +23,7 @@ reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7
 reconcile/email_sender.py,sha256=-5L-Ag_jaEYSzYRoMr52KQBRXz1E8yx9GqLbg2X4XFU,3533
 reconcile/gabi_authorized_users.py,sha256=rmvJN1TKZbDT0eOYObUeshKpl7uGhPam_r3U5j1eHX4,4854
 reconcile/gcr_mirror.py,sha256=dXMPHBx_Rdr7HQPfctz7tmBrJHAFG0wos1f4nZe4jRo,8742
-reconcile/github_org.py,sha256=m24SQQBlqghh9v663GE3lbHcSCKdcZqHd1hwcfU2PaQ,13455
+reconcile/github_org.py,sha256=Bjxtin6Qlosb7BOVdjPbcQc2QALbEsqnDfYjHAl7OIA,13458
 reconcile/github_owners.py,sha256=s9NDIqTbaqgGE5lj89eh3Sr52B-6SCUWQILzQlzGyxw,2949
 reconcile/github_repo_invites.py,sha256=3GOBGZq1DKMIuyYsDxHqXDnMTWlJfeu248-m3ajfV8Y,2672
 reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7lFEGOr_28GvsiwO5Xw,1734
@@ -53,7 +53,7 @@ reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQ
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=A9zXeYG-_52DsS1dz47yDSnHz62du5XpPBlaeRa6zxY,3975
-reconcile/ocm_aws_infrastructure_access.py,sha256=SghVWdmgliPVo_xHsp-e64_iC3mqDiia2ANSHb-g5G8,6891
+reconcile/ocm_aws_infrastructure_access.py,sha256=rrlcQxvRTmKyYOUR1C-Nlxj_o_iCDSxc7PNoELUDiew,6892
 reconcile/ocm_clusters.py,sha256=0AlqFrUoxxB8rsOgobvnwiBI2Zal8BK2TI2cpWa0Qqg,16895
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
@@ -61,23 +61,23 @@ reconcile/ocm_groups.py,sha256=-rTPMewkdyo1De6gs4u-294p3z34oUbGfuNi8ov56Sk,3424
 reconcile/ocm_machine_pools.py,sha256=poGfITOCJEMwYAJpiuL8SytgTcBmGIKEZPgNGld80TY,16563
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=aLgyInt9oIWAg0XtCiwJRUSwdPx3masKV8kHzkyEEOQ,4282
-reconcile/openshift_base.py,sha256=ZcyB6FU0MSibu8mLCQrQFOcEIoGITGBjR-g3vbdNKHE,52647
-reconcile/openshift_cluster_bots.py,sha256=1aGPaKUOoWuqDt6Jv6hdxc7NfdvjstrCmcDHHFfatIk,10942
+reconcile/openshift_base.py,sha256=l3stMLbjRj3Z18orwyRv8ZN5IqVRaEwQ9tgiQJjDI5w,52641
+reconcile/openshift_cluster_bots.py,sha256=AmCLCrlsZ_Wd5qMPzlv-O01i47WGJuojEc-Jgt2n77c,10942
 reconcile/openshift_clusterrolebindings.py,sha256=sDgHi_t2ayE3O6zZ5CLao7uBmihxRK8K70w2GSADz-w,5822
 reconcile/openshift_groups.py,sha256=sK2wLWwNupztbfyFPl32VH42s_s8Mu3g-URdlisnwJc,9382
 reconcile/openshift_limitranges.py,sha256=UvCGo_OQ4XoDK55TJmn55qEhhlkhLzhU12tX8nT5kPQ,3442
 reconcile/openshift_namespace_labels.py,sha256=97qZl0MlYCUGP5Uu3zwMoU-qt0Drbhafb2NHy4CZWLo,15619
-reconcile/openshift_namespaces.py,sha256=wCDf9LVvk0aTTPUQe_ZycjjWldAjycU6A0_4FQJR74Y,5809
+reconcile/openshift_namespaces.py,sha256=ju6G46odndwQlaMMV6Y6RjcDmtjAAFP4oEEaDuLAbLg,5806
 reconcile/openshift_network_policies.py,sha256=DyjaeJvSFHmslbM8nyHCxpF9EtU2m-MJokMrAv6Nwoo,4171
 reconcile/openshift_prometheus_rules.py,sha256=onowXab248zmHH8SbYDTc1W1bl7JiqRFU1xdTkZyLFg,1332
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLyqF4,1518
-reconcile/openshift_resources_base.py,sha256=Seh4T8oA_JO-g0Z5TODDtL5cyRj-o7bmk6-eOmDAL4Q,40751
+reconcile/openshift_resources_base.py,sha256=SKlJffnYjnc7AHIOvi7Ui9TmDA93_t81d5t54wnqCOA,40745
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=UZlm29JujJVS3MzSm6uehlC3y-jZxl6WVwMeKRdN11U,12773
-reconcile/openshift_saas_deploy_change_tester.py,sha256=FfXrx_JloAlWeJVsJLIQPqFQ7OoBkaB2TgJJXlNZNCM,8796
-reconcile/openshift_saas_deploy_trigger_base.py,sha256=m7aqYEZUM-vr3EBw-hIbz1rHpXZNxs_BAJv3ndfvnAQ,14039
+reconcile/openshift_saas_deploy_change_tester.py,sha256=12uyBwaeMka1C3_pejmQPIBPAx2V1sJ4dJkScq-2e2M,8793
+reconcile/openshift_saas_deploy_trigger_base.py,sha256=Ss_FE31d8jR2f3lbSiU0ROBMVI1kg-Y_8nxLavFPFko,14036
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=roLyVAVntaQptKaZbnN1LyLvCA8fyvqELfjU6M8xfeY,3511
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=eUejMGWuaQabZTLuvPLLvROfN5HOFyYZOpH4YEsiU_g,928
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=iUsiBGJf-CyFw7tSLWo59rXmSvsVnN6TTaAObbsVpNg,936
@@ -95,7 +95,7 @@ reconcile/quay_mirror_org.py,sha256=utrJpJaKCs7U6WX6DODdfCeB0EmX-lUC8Y5fkmpgFSs,
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
 reconcile/queries.py,sha256=-mwZ0V89Tik0zB585ID0jEqC4VSuUVaAPlaSXaNAR-E,50180
-reconcile/query_validator.py,sha256=BAjGrU8_VhzTOv5k0-uz0hY9ziZyconv8VAhgre1Auc,1497
+reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
 reconcile/resource_template_tester.py,sha256=DsKvBuNLPxm4Fa-e1YHHySnhThm5i_j-nF3G4b02Mz0,2416
@@ -108,7 +108,7 @@ reconcile/slack_usergroups.py,sha256=tZIpxbCmS8M4A15tYdtgCMEJ1Q6hcrkF9j_5-CZ6Yjs
 reconcile/sql_query.py,sha256=pH-EHkXiDknn8ZNXVqRZeqFc3sKhu2nhsaykgSytbS8,25895
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=YeoE7kLf1YKpOdN32u3vqhuSI46ep5N_qcVWC1CBCf8,8635
-reconcile/terraform_aws_route53.py,sha256=1C1_xd_xjysPLSYKvohS6bfSsjSMP0U3sWVcRNW9cAA,9957
+reconcile/terraform_aws_route53.py,sha256=dQzzT46YhwRA902_H6pi-f7WlX4EaH187wXSdmJAUkQ,9958
 reconcile/terraform_cloudflare_dns.py,sha256=-aLEe2QnH5cJPu7HWqs-R9NmQ1NlFbcVUm0v7alVL3I,13431
 reconcile/terraform_cloudflare_resources.py,sha256=41Mj1WkuS75slCDpmhG2GGf1nh3BwfxcdNC73-PNadc,15000
 reconcile/terraform_cloudflare_users.py,sha256=iyTG5sj20Jg4J4qWJ144KVptfIHGOSfH8wQKxu0imq0,13942
@@ -181,14 +181,14 @@ reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_G
 reconcile/cna/assets/null.py,sha256=85mVh97atCoC0aLuX47poTZiyOthmziJeBsUw0c924w,1658
 reconcile/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/dynatrace_token_provider/dependencies.py,sha256=41q05A4C_eS3E8-MR4veeMxtQNsPoGdxmEa3d-OKxq4,2814
-reconcile/dynatrace_token_provider/integration.py,sha256=jOpj2qtkI95b_Ih0IH3cYV5G63RBuxhG6kX4RADBWeg,23003
+reconcile/dynatrace_token_provider/integration.py,sha256=-oAZ40IHLbY99PZB9THtH2FnS5LHCKpQMIYFdy1bp4Q,22997
 reconcile/dynatrace_token_provider/metrics.py,sha256=xiKkl8fTEBQaXJelGCPNTZhHAWdO1M3pCXNr_Tei63c,1285
 reconcile/dynatrace_token_provider/model.py,sha256=gkpqo5rRRueBXnIMjp4EEHqBUBuU65TRI8zpdb8GJ0A,241
 reconcile/dynatrace_token_provider/ocm.py,sha256=iHMsgbsLs-dlrB9UXmWNDF7E4UDe49JOsLa9rnowKfo,4282
 reconcile/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/endpoints_discovery/integration.py,sha256=lUx_S_mQNATuB3tqGbyaliHBb355PCuU5SaVAiD_tbQ,12354
-reconcile/endpoints_discovery/merge_request.py,sha256=NktpwMUoQ9TvBzOeHSPC09OqxWmgZBZVy-Eqmsm_vrA,2909
-reconcile/endpoints_discovery/merge_request_manager.py,sha256=oY3lovy5DcUgHNEDzWrbOPabzZtaGMns6YLl5ipZJ0c,6346
+reconcile/endpoints_discovery/integration.py,sha256=q01DJgCv1YiDY-VUWDfQ5kfGm67BUhP-YP7c0JQObj8,12333
+reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
+reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRattax4HfoRlhtVzmgro3GiJJ1C4Vc,6392
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=JvjKaABy2Pg8u8Lq82Acv4zMvpE3_qGKes7OG-zlHOM,2956
 reconcile/external_resources/factories.py,sha256=DXgaLxoO87zZ76VOpRpu2GeYGhsbfOnOx5mrzgo4Gf4,4767
@@ -507,7 +507,7 @@ reconcile/test/test_aws_iam_password_reset.py,sha256=fnkqB90adR7W4L4saNdrtIiwnQB
 reconcile/test/test_aws_support_cases_sos.py,sha256=MLgPHTv8uZhh2iINoBV38jiweEqFhqGg7WYOveXkIXY,837
 reconcile/test/test_checkpoint.py,sha256=sbDtqTbfw5yMZ_mCltMXxkyyGueVLGUjTDtcWhPP7yA,5340
 reconcile/test/test_cli.py,sha256=qx_iBwh4Z-YkK3sbjK1wEziPTgn060EN-baf9DNvR3k,1096
-reconcile/test/test_closedbox_endpoint_monitoring.py,sha256=isMHYwRWMFARU2nbJgbl69kD6H0eA86noCM4MPVI1fo,7151
+reconcile/test/test_closedbox_endpoint_monitoring.py,sha256=I0lSFOUQ5dBxjKeq1Dg3E4gWqoZ9d26d5pQmsLqWLPc,7166
 reconcile/test/test_dashdotdb_dora.py,sha256=MfHGAsX2eSQSvBVt9_1Sah3aQKNJBXA9Iu86X0NWD6c,7705
 reconcile/test/test_database_access_manager.py,sha256=n37cNan0dcMymWJbpsKN9HaCQ0vzXDn5PZencEH7e98,19592
 reconcile/test/test_deadmanssnitch.py,sha256=YAf8wlZoEC60Ul7UA6Y6XqwnZ1yqf07J15ABqeLpqW4,9835
@@ -536,12 +536,12 @@ reconcile/test/test_openshift_base.py,sha256=SX8URKF8Kn21nA-qcmICSUaZKHuc5YTgPzf
 reconcile/test/test_openshift_cluster_bots.py,sha256=sSGLgxnXO82xcfTFVNJzsrDuNfObwAR_-AkDe4B_4WE,7983
 reconcile/test/test_openshift_namespace_labels.py,sha256=i4S5QJFxMRjLkwi3iO6A-uhjgZ1QZb4jYXwB696m82Y,12070
 reconcile/test/test_openshift_namespaces.py,sha256=HmRnCE5EnFt3MYceVEFHmk8wWRtCrxu2AFGFkY9pdyA,9214
-reconcile/test/test_openshift_resource.py,sha256=lbTf48jX1q6rGnRiA5pPvfU0uPfY8zhNylMtryn0sLI,12995
-reconcile/test/test_openshift_resources_base.py,sha256=LtlR9x3o7KkSEw0JN0fZhinFeAAxBAQlB_9PpBnKwOM,14353
+reconcile/test/test_openshift_resource.py,sha256=0HlknH5SR3H6YXyoaKuk-4Trii04LSowM_pbsGsucjA,13001
+reconcile/test/test_openshift_resources_base.py,sha256=GOMYGG6yFACXpDWwPMBBIOR0v0ikjefEDON1DPQfdkk,14374
 reconcile/test/test_openshift_saas_deploy.py,sha256=3QXMrN9dXIiR0JktVDNQ7yJSexMTjZLb1tbRrB3-7uU,5991
 reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn6qdnKge5Sa_s732c-8uZqCnuT1gGI,12871
 reconcile/test/test_openshift_saas_deploy_trigger_cleaner.py,sha256=UQx1iJ21rsMa2whG-rtUIuTXbUzc0Ngr7jRLKXZCCCI,2838
-reconcile/test/test_openshift_serviceaccount_tokens.py,sha256=l5de4zsK4-eJMZuLsftYrsdKSXImKsxaWApPbK0pOoY,8958
+reconcile/test/test_openshift_serviceaccount_tokens.py,sha256=VvVXDCS94KFvSLOhK8ScKjvmns5k1B6QgWr691AXiKc,8991
 reconcile/test/test_openshift_tekton_resources.py,sha256=O6-qPQwSiPHQKm1a1iqRU2V8eabc4uiG4mNxPSUBg88,11212
 reconcile/test/test_openshift_upgrade_watcher.py,sha256=0GDQ_YFHIX8DbkbDYSuLv9uZeeg4NwP1vlOqvSaZvN4,7183
 reconcile/test/test_prometheus_rules_tester.py,sha256=cgVkPM3KcAw69bOkJ6iR2Lfog_WgblyoqVRtXv4ly7o,5685
@@ -567,7 +567,7 @@ reconcile/test/test_terraform_repo.py,sha256=INfl-VlUtpV87J0neQt4wliptnX7PKvxLPF
 reconcile/test/test_terraform_resources.py,sha256=8C97yXIEihaQ3DZrtjxLNt4y4G12IOhD01ydm7JjliY,15359
 reconcile/test/test_terraform_tgw_attachments.py,sha256=SM6QwogMZNLh0BkUyaxzFafuOLp23-hBtYTu_F53C4I,40922
 reconcile/test/test_terraform_users.py,sha256=XOAfGvITCJPI1LTlISmHbA4ONMQMkxYUMTsny7pQCFw,4319
-reconcile/test/test_terraform_vpc_peerings.py,sha256=Btl0ym7NmO2QFST9Xviz4OO1RjJuhCp1Xhix5A3e_HQ,20822
+reconcile/test/test_terraform_vpc_peerings.py,sha256=bpjCjhmic07cw3XKSHf-2JvmLuWlyQG8laXlC-H7qtI,20796
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=7VAFVbjlnnUJoOkZ4ApDc1lHFj38Zj4yrbDKvWkqWXE,49545
 reconcile/test/test_three_way_diff_strategy.py,sha256=v3rNkQFNy5e1uyfeNSlNBA07fvrPGD0aXD91Lgv8oxc,4062
 reconcile/test/test_utils_jinja2.py,sha256=TpzQlpFnLGzNEZp5WOh0o7AuBiGEktqO4MuwiiJW2YY,3895
@@ -650,11 +650,11 @@ reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNw
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=0Sh83kX8tk-XGwsWbNI19miuits71c3btKxGVhyApuY,66860
+reconcile/utils/aws_api.py,sha256=tYjTEW1uSkWsMWNFxwavJsI9xtq1dEeJ2HPlN5LAHzA,66861
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=7MaAFBpzuBUTJ_aA6G6-eult_BPMVyiXbBLD0Y6F-DM,2301
-reconcile/utils/config.py,sha256=lweqMxBEoSh2anhhvr9CTIYIh2ZtitOLpnlJYmU7p48,1032
+reconcile/utils/config.py,sha256=kwaAaNBQ9z-fsDJu2-WZFgTnL6HKd3FPjiu0mbriHkg,1004
 reconcile/utils/constants.py,sha256=pOUd97bqZdsAu5RWJ8NUs9cwCY7K9y0eW9VVeJ4fZIU,138
 reconcile/utils/data_structures.py,sha256=VyKfnlNJTiRvZKNpfgIrjESQ2YgmEpWuPQXT14WA1vI,311
 reconcile/utils/deadmanssnitch_api.py,sha256=0uajXxRNUEyF8CPTYPFNV4G-_3KB_hDF9L8OtTy2zCk,2476
@@ -669,14 +669,14 @@ reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4
 reconcile/utils/expiration.py,sha256=3JaXH4psksR7z262k7FmdyREjCLqm66OpVMEbcfdWRo,1213
 reconcile/utils/extended_early_exit.py,sha256=QSktrmfw37zSRMNk930tDbQsVeKxaPPPD43e79DGwZw,6754
 reconcile/utils/external_resource_spec.py,sha256=bhH_xneFwATdFumTPkiQmcVKYI0gcaWuqV6FpFdf_P0,7006
-reconcile/utils/external_resources.py,sha256=ObBOGBRTsDQ2s9rojfeUfFMoR8ls4Kg-AnpsyF6m7u8,7539
+reconcile/utils/external_resources.py,sha256=GC4wYuSXwk2ifr3aDEwnEiumaYqWhzgKK-hXp6pXemA,7516
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=JkpbUO10oBTtNHZ1IhjyG6dTOUizc7I5H0vm7NvDVNw,1409
 reconcile/utils/git_secrets.py,sha256=y1rEhwA8DyDpBSAEuhMS7Y2X3mpxT2zQ4zyDFkhLe_g,1936
 reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
 reconcile/utils/gitlab_api.py,sha256=WfhLhOp3-cOwgptiCNPhWja74Lo41ZIlJ6HFSWaIDRw,30512
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
-reconcile/utils/gql.py,sha256=NqxosFCInLy_dF_fcXnRYcZgsThedSyv_I3U8k2SLMg,14161
+reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
 reconcile/utils/helm.py,sha256=Zmh9shdcUNJmiHIbBDkuUlk9T_Cg7uvWfw9c4St2n8E,3775
 reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,1179
@@ -719,19 +719,19 @@ reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,8
 reconcile/utils/slack_api.py,sha256=iaOFzv3wiZRhcgYK2NB4lsG6ymNsGk2MEuj0PgZVp7w,17355
 reconcile/utils/smtp_client.py,sha256=ee8FHnCMt_uhDBJOvIfFtyutbToq-Ni5MECC_c8DXnA,2769
 reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41Fg,2265
-reconcile/utils/state.py,sha256=a_EO5u7__Pqd0_E3MqzUttJ-0xRtuxcNx5oQi5WIahI,16392
+reconcile/utils/state.py,sha256=W0_awkLAPX18hNOF_60o73tkPxDUylqbzYNHfl_sDsk,16386
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=4eYKaKfG5wYfR--e1jHpmoMq36Q-JX1_WtT916wlMVw,34669
-reconcile/utils/terrascript_aws_client.py,sha256=1JgXcCF_-xbaAg7V9qihL1Xz5okQlSSrT1DeXGducHc,278037
+reconcile/utils/terraform_client.py,sha256=jHTkqqJk1HQh2vZP1FkEeDOiMlO-SKmX8oYuS7lzO_o,34672
+reconcile/utils/terrascript_aws_client.py,sha256=eshIGXo9HQkAAANhO_mdL3a7M7A6NbMMlc8nj61k6Lk,278034
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=9GSNHku8tw5KM2LKpZ1myWYDLtLGUJgpSnD0DxbzeO0,14956
 reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5s1G0,911
-reconcile/utils/vcs.py,sha256=i2fbeoct1o6vMLON7SqW2IcDUhHQv7eZyNK3r7Ue6_w,8875
+reconcile/utils/vcs.py,sha256=98SLBpqy-j_foE6NRwsyMCiPpNQtM6ujspnk6_qOURI,8881
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/acs/base.py,sha256=6bMvtvmqb8j7fvOYqKu3lMWQzRuhMmZ6xv1Gfyev1hU,2535
-reconcile/utils/acs/notifiers.py,sha256=WI2HEerP73vDDYtBW-mC40MQAbo-VcTJbonl4_rhCTk,4997
+reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
+reconcile/utils/acs/notifiers.py,sha256=nHVw9C_2-K4nv5zq26jlOTSw1roY6TKlovi1sOfpxpI,4998
 reconcile/utils/acs/policies.py,sha256=jpbi3qpGkBD_X6MfzsX12dPajUbmACmhIOz_0rDvYzs,5489
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -760,9 +760,9 @@ reconcile/utils/internal_groups/models.py,sha256=y_IqBVqfGqNXiu0VudvBWFrm_-uafVm
 reconcile/utils/jinja2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jinja2/extensions.py,sha256=7K-uo6G2eCWa98MHT8fRPYIKCLQB_5D2keqQ_LyAfHM,1293
 reconcile/utils/jinja2/filters.py,sha256=tmiaYMhji5fv4B66YtR7zc-mE3wQLyj5I5SeX0WA2l4,4754
-reconcile/utils/jinja2/utils.py,sha256=gjsTb__eSddY-JyYjx-9AGFzYCEMqfYyMym_B8x0pdo,8045
+reconcile/utils/jinja2/utils.py,sha256=a4vpt8f0UHerPAZs5zFESkVzZdEZRJjZ4mzJ19nubjI,8048
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/jobcontroller/controller.py,sha256=2V_vm5thFx6adW4bMy9CdHXFesuo6S4lSkEpGxkXSM0,14492
+reconcile/utils/jobcontroller/controller.py,sha256=n9twSH_xZtp5vknM3qByp0eWCn9ED4U1a6yOFBS-GTg,14488
 reconcile/utils/jobcontroller/models.py,sha256=x9YIvWfYOOvXNKToFVx1H7qDrZb0Sa1KI_4Y0gl7rMM,6336
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=MqDFvK3aXhmmMuMiIygC-onFVrrIopKHriaYJQ5jnuY,1988
@@ -771,7 +771,7 @@ reconcile/utils/membershipsources/resolver.py,sha256=meERrCZqeVJZR2lHdZEznaZDsCs
 reconcile/utils/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/merge_request_manager/merge_request_manager.py,sha256=3EP6Yw_zB7nY0OkU8D_32nDqta1TITgtRI0cSmOlNQg,3332
 reconcile/utils/merge_request_manager/parser.py,sha256=5pGoz8Q6EuYXlUc1z-D0FahdRP2YLO8CpACoa9HcgtQ,2098
-reconcile/utils/mr/__init__.py,sha256=IvDRx0x33ROPZ66DDkg3FCt8pLpcaVRGWyCJvZQ1SPE,2578
+reconcile/utils/mr/__init__.py,sha256=hcfHDIIIsJT4C0BnzDnyeZEfZdamrqHzMLcBzIT1ibI,2578
 reconcile/utils/mr/app_interface_reporter.py,sha256=6Kpg93V9FvcOke9Jimkva359MQ-ZyBIkUpf8QIA6-to,1793
 reconcile/utils/mr/aws_access.py,sha256=w-UJutB_OfBJOvr-gsPzhtBPkDfKcNZZWGGuI9cN3HI,2605
 reconcile/utils/mr/base.py,sha256=TP6xaxznxsF_v2KcC_D3ut1cX_4KCcx4pjIC1-4eZUY,7307
@@ -783,7 +783,7 @@ reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnY
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOGBOEgPZLH4nC1hcuef74LWw2Rpk,3004
 reconcile/utils/mr/promote_qontract.py,sha256=3o_Lpn3gQc8HP3kSJRB1d7TvaDoIAKWLap5bhagQRaM,5945
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
-reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
+reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
 reconcile/utils/ocm/base.py,sha256=iL_uMN03URDisWHpsaGGto_pLx652epUkuld_9ctx5o,14555
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
@@ -811,10 +811,10 @@ reconcile/utils/runtime/integration.py,sha256=H3kDfbc4IKrhubSDCWHs0W9oxM7FoCiPax
 reconcile/utils/runtime/meta.py,sha256=dWdKS9eHVuowFkTK4lgXJ723vS1y9giOMzePUKnHnDI,214
 reconcile/utils/runtime/runner.py,sha256=I30KRrX1UQbHc_Ir1cIZX3OfNSdoHKdnDSPAEB69Ilk,7944
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
-reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
+reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=rTsBaQrCY7StLWkkHnMLVil8luLMsZ9hRED6SDw4Cds,85698
+reconcile/utils/saasherder/saasherder.py,sha256=qYnVoBydM0lMMW0J4xvMWFi6kBZzpvguqEbQgm2c1QM,85683
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -823,7 +823,7 @@ reconcile/utils/terrascript/cloudflare_client.py,sha256=HPmWBF6X2yZ4_Yly5IdMmEwx
 reconcile/utils/terrascript/cloudflare_resources.py,sha256=AXI0NddGSwn5rro1GvKdL7CAbiobPnb_0KpDUZVpIGk,15973
 reconcile/utils/terrascript/models.py,sha256=DZfSEqyaZh8fCE_g7toa9TUCzcn3MHnuumoWCdzACh0,441
 reconcile/utils/terrascript/resources.py,sha256=ucuudrCjmJYeSleklXTlmeSEwZOqVtEfzWFEiDZydxM,1361
-reconcile/utils/unleash/__init__.py,sha256=ayCrW7Cw9dxQYq56QwrjtTcCnMp0xAHr1R7re9jo6RM,219
+reconcile/utils/unleash/__init__.py,sha256=2PsN3GlLU8DOyWSvv5q9uzwuFn_vYtfEo-mmVaIFtpA,219
 reconcile/utils/unleash/client.py,sha256=YrJnauxjcy1ml7W2AHg7dzIH_fVK_GugoRu7IFmk6e0,3505
 reconcile/utils/unleash/server.py,sha256=907gDh9Ee8UxLqusnfpzE-7LUnttB38D4xhVJ0vMf_M,4439
 release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -831,10 +831,10 @@ release/test_version.py,sha256=4DKxDZkT0aoS6ibZFsH2fd_wNETij1qfn2pCgQtVCGo,2093
 release/version.py,sha256=hLSW-Ai13atY9yBcUkEPEOr-drkZdRC4VcFIm1n5Y8o,4103
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5JXPk-iPcOQ,1619
-tools/app_interface_reporter.py,sha256=1ZP58LYV6ww3XOLVxgy8NKasMb1jQmp4BNqzTEB0VBE,17723
+tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=8HbIKtepnmoQteb9Q31iJXFG7_y2o_g6JEkIhXnoncM,128916
+tools/qontract_cli.py,sha256=LDQgwmAg3kzgtPuODqhGgPeVfD_9g8dgiOOVRsJ3YRA,128234
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -865,8 +865,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1031.dist-info/METADATA,sha256=IU8tp02udRNBkJ5CY9gEN_NBZcO87JMc_Kqe3JP4siY,2213
-qontract_reconcile-0.10.1rc1031.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1031.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1031.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1031.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1033.dist-info/METADATA,sha256=UgXHDzIBXemPFdpTK2uj033p1---CqacT8xzomQxMxI,2213
+qontract_reconcile-0.10.1rc1033.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1033.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1033.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1033.dist-info/RECORD,,

reconcile/aws_support_cases_sos.py

@@ -53,7 +53,7 @@ def act(dry_run, gitlab_project_id, accounts, keys_to_delete, defer=None):
         key = k["key"]
         logging.info(["delete_aws_access_key", account, key])
         if not dry_run:
-            path = "data" + [a["path"] for a in accounts if a["name"] == account][0]
+            path = "data" + next(a["path"] for a in accounts if a["name"] == account)
 
             mr = CreateDeleteAwsAccessKey(account, path, key)
             mr.submit(cli=mr_cli)

reconcile/cli.py

@@ -1003,7 +1003,7 @@ def aws_saml_roles(
     "--initial-user-secret-vault-path",
     help="The path in Vault to store the initial user secret. Python format string with access to 'account_name' attribute.",
     required=True,
-    default="app-sre-v2/creds/terraform/{account_name}/config",
+    default="app-sre-v2/creds/terraform/{account_name}/config",  # noqa: RUF027
 )
 @click.option(
     "--account-tmpl-resource",

reconcile/dynatrace_token_provider/integration.py

@@ -218,7 +218,7 @@ class DynatraceTokenProviderIntegration(
                     _expose_errors_as_service_log(
                         ocm_client,
                         cluster.external_id,
-                        f"DTP can't create {token_spec.name=} {str(e.args)}",
+                        f"DTP can't create {token_spec.name=} {e.args!s}",
                     )
             logging.info(
                 f"{token_spec.name=} created in {dt_api_url} for {cluster.external_id=}."
@@ -271,7 +271,7 @@ class DynatraceTokenProviderIntegration(
                         _expose_errors_as_service_log(
                             ocm_client,
                             cluster.external_id,
-                            f"DTP can't patch {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} due to {str(e.args)}",
+                            f"DTP can't patch {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} due to {e.args!s}",
                         )
                 logging.info(
                     f"Patched {token_spec.name=} for {SYNCSET_AND_MANIFEST_ID} in {cluster.external_id=}."

reconcile/endpoints_discovery/integration.py

@@ -261,8 +261,7 @@ class EndpointsDiscoveryIntegration(
     ) -> ExtendedEarlyExitRunnerResult:
         """Reconcile the endpoints for all namespaces."""
         apps = self.get_apps(oc_map, endpoint_template, namespaces)
-        if apps:
-            merge_request_manager.create_merge_request(apps=apps)
+        merge_request_manager.create_merge_request(apps=apps)
         return ExtendedEarlyExitRunnerResult(payload={}, applied_count=len(apps))
 
     @defer

reconcile/endpoints_discovery/merge_request.py

@@ -72,13 +72,17 @@ class Renderer:
         """Update the app-interface app file for a merge request."""
         yml = create_ruamel_instance(explicit_start=True)
         content = yml.load(current_content)
-        app_endpoints = content.setdefault("endPoints", [])
-        for i, app_endpoint in enumerate(app_endpoints):
+        new_endpoints = []
+        for app_endpoint in content.setdefault("endPoints", []):
             if app_endpoint["name"] in endpoints_to_delete:
-                app_endpoints.remove(app_endpoint)
-            if app_endpoint["name"] in endpoints_to_change:
-                app_endpoints[i] = endpoints_to_change[app_endpoint["name"]]
-        app_endpoints.extend(endpoints_to_add)
+                continue
+            elif app_endpoint["name"] in endpoints_to_change:
+                new_endpoints.append(endpoints_to_change[app_endpoint["name"]])
+            else:
+                new_endpoints.append(app_endpoint)
+
+        new_endpoints.extend(endpoints_to_add)
+        content["endPoints"] = new_endpoints
         with StringIO() as stream:
             yml.dump(content, stream)
             return stream.getvalue()

reconcile/endpoints_discovery/merge_request_manager.py

@@ -139,6 +139,9 @@ class MergeRequestManager(MergeRequestManagerBase[EPDInfo]):
             # same external resource.
             return None
 
+        if not apps:
+            return None
+
         endpoints_discovery_mr = EndpointsDiscoveryMR(
             title=self._renderer.render_title(),
             description=self._renderer.render_description(hash=apps_hash),

reconcile/github_org.py

@@ -128,7 +128,7 @@ def get_config(default=False):
 
 def get_default_config():
     github_config = get_config(default=True)
-    return list(github_config["github"].values())[0]
+    return next(iter(github_config["github"].values()))
 
 
 @retry()

reconcile/ocm_aws_infrastructure_access.py

@@ -113,9 +113,9 @@ def fetch_desired_state(clusters):
                 continue
             if aws_infrastructure_access.get("assume_role"):
                 continue
-            aws_account_uid = [
+            aws_account_uid = next(
                 a["uid"] for a in aws_accounts if a["name"] == spec.provisioner_name
-            ][0]
+            )
             cluster = aws_infrastructure_access["cluster"]["name"]
             access_level = aws_infrastructure_access["access_level"]
             item = {

reconcile/openshift_base.py

@@ -316,7 +316,7 @@ def populate_current_state(
             )
     except StatusCodeError as e:
         ri.register_error(cluster=spec.cluster)
-        logging.error(f"[{spec.cluster}/{spec.namespace}] {str(e)}")
+        logging.error(f"[{spec.cluster}/{spec.namespace}] {e!s}")
 
 
 def fetch_current_state(
@@ -907,7 +907,7 @@ def delete_action(
         )
     except StatusCodeError as e:
         ri.register_error()
-        msg = f"[{cluster}/{namespace}] {str(e)}"
+        msg = f"[{cluster}/{namespace}] {e!s}"
         logging.error(msg)
 
 

reconcile/openshift_cluster_bots.py

@@ -91,7 +91,7 @@ def oc(
     kubeconfig: str, namespace: str, command: list[str], stdin: bytes | None = None
 ) -> dict | None:
     ret = subprocess.run(
-        ["oc", "--kubeconfig", kubeconfig, "-n", namespace, "-o", "json"] + command,
+        ["oc", "--kubeconfig", kubeconfig, "-n", namespace, "-o", "json", *command],
         input=stdin,
         check=True,
         capture_output=True,

reconcile/openshift_namespaces.py

@@ -132,7 +132,7 @@ def check_results(
             err = True
             msg = (
                 f'cluster: {s["cluster"]}, namespace: {s["namespace"]}, '
-                f"exception: {str(e)}"
+                f"exception: {e!s}"
             )
             logging.error(msg)
     return err

reconcile/openshift_resources_base.py

@@ -680,7 +680,7 @@ def fetch_desired_state(
         UnknownProviderError,
     ) as e:
         ri.register_error()
-        msg = f"[{cluster}/{namespace}] {str(e)}"
+        msg = f"[{cluster}/{namespace}] {e!s}"
         _locked_error_log(msg)
         return
 
@@ -747,7 +747,7 @@ def fetch_states(
 
     except StatusCodeError as e:
         ri.register_error(cluster=spec.cluster)
-        logging.error(f"{spec} - exception: {str(e)}")
+        logging.error(f"{spec} - exception: {e!s}")
 
 
 def fetch_data(

reconcile/openshift_saas_deploy_change_tester.py

@@ -147,7 +147,7 @@ def collect_compare_diffs(
             # that changes another saas file was merged but is not yet
             # reflected in the baseline graphql endpoint.
             # https://issues.redhat.com/browse/APPSRE-3029
-            logging.debug(f"Diff not found in changed paths, skipping: {str(d)}")
+            logging.debug(f"Diff not found in changed paths, skipping: {d!s}")
             continue
         for c in current_state:
             if d.saas_file_name != c.saas_file_name:

reconcile/openshift_saas_deploy_trigger_base.py

@@ -297,7 +297,7 @@ def _trigger_tekton(
             logging.error(
                 f"could not trigger pipeline {tkn_name} "
                 + f"in {tkn_cluster_name}/{tkn_namespace_name}. "
-                + f"details: {str(e)}"
+                + f"details: {e!s}"
             )
 
     if not error and not dry_run:

reconcile/query_validator.py

@@ -42,13 +42,13 @@ def run(dry_run):
                 gqlapi.query(gql.get_resource(q["path"])["content"])
             except (gql.GqlGetResourceError, gql.GqlApiError) as e:
                 error = True
-                logging.error(f"query validation error in {qv_name}: {str(e)}")
+                logging.error(f"query validation error in {qv_name}: {e!s}")
         for r in qv.get("resources") or []:
             try:
                 fetch_openshift_resource(r, qv, settings=settings, skip_validation=True)
             except Exception as e:
                 error = True
-                logging.error(f"query validation error in {qv_name}: {str(e)}")
+                logging.error(f"query validation error in {qv_name}: {e!s}")
 
     if error:
         sys.exit(ExitCodes.ERROR)

reconcile/terraform_aws_route53.py

@@ -147,9 +147,9 @@ def build_desired_state(
                     sys.exit(ExitCodes.ERROR)
                 tf_zone_spec = tf_zone_specs[0]
                 tf_zone_account_name = tf_zone_spec.provisioner_name
-                zone_account = [
+                zone_account = next(
                     a for a in all_accounts if a["name"] == tf_zone_account_name
-                ][0]
+                )
                 tf_zone_region = (
                     tf_zone_spec.resource.get("region")
                     or zone_account["resourcesDefaultRegion"]

reconcile/test/test_closedbox_endpoint_monitoring.py

@@ -43,7 +43,7 @@ def test_blackbox_exporter_endpoint_loading(mocker):
     assert endpoints is not None
     assert len(endpoints) == 1
 
-    provider = list(endpoints.keys())[0]
+    provider = next(iter(endpoints.keys()))
     assert provider.provider == BLACKBOX_EXPORTER_PROVIDER
     provider_endpoints = endpoints.get(provider)
     assert provider_endpoints is not None
@@ -74,7 +74,7 @@ def test_blackbox_exporter_probe_building(mocker):
     endpoints = get_endpoints(BLACKBOX_EXPORTER_PROVIDER)
     assert len(endpoints) == 1
 
-    provider = list(endpoints.keys())[0]
+    provider = next(iter(endpoints.keys()))
     provider_endpoints = endpoints.get(provider)
     assert provider_endpoints is not None
     probe_resource = blackbox_exporter_probe_builder(provider, provider_endpoints)
@@ -108,7 +108,7 @@ def test_signalfx_probe_building(mocker):
     endpoints = get_endpoints(SIGNALFX_PROVIDER)
     assert len(endpoints) == 1
 
-    provider = list(endpoints.keys())[0]
+    provider = next(iter(endpoints.keys()))
     provider_endpoints = endpoints.get(provider)
     assert provider_endpoints is not None
     probe_resource = signalfx_probe_builder(provider, provider_endpoints)
@@ -157,7 +157,7 @@ def test_blackbox_exporter_filling_desired_state(mocker):
     add_desired_mock = mocker.patch.object(ResourceInventory, "add_desired")
 
     endpoints = get_endpoints(BLACKBOX_EXPORTER_PROVIDER)
-    provider = list(endpoints.keys())[0]
+    provider = next(iter(endpoints.keys()))
     probe = blackbox_exporter_probe_builder(provider, endpoints[provider])
     assert probe is not None
     fill_desired_state(provider, probe, ResourceInventory())
@@ -178,7 +178,7 @@ def test_signalfx_filling_desired_state(mocker):
     add_desired_mock = mocker.patch.object(ResourceInventory, "add_desired")
 
     endpoints = get_endpoints(SIGNALFX_PROVIDER)
-    provider = list(endpoints.keys())[0]
+    provider = next(iter(endpoints.keys()))
     probe = signalfx_probe_builder(provider, endpoints[provider])
     assert probe is not None
     fill_desired_state(provider, probe, ResourceInventory())

reconcile/test/test_openshift_resource.py

@@ -391,7 +391,7 @@ def test_resource_inventory_add_desired_resource_short_kind():
 
     assert len(list(ri)) == 1
 
-    cluster_name, namespace_name, resource_type, resource = list(ri)[0]
+    cluster_name, namespace_name, resource_type, resource = next(iter(ri))
     assert cluster_name == "cl"
     assert namespace_name == "ns"
     assert resource_type == "Deployment"
@@ -412,7 +412,7 @@ def test_resource_inventory_add_desired_resource_long_kind():
 
     assert len(list(ri)) == 1
 
-    cluster_name, namespace_name, resource_type, resource = list(ri)[0]
+    cluster_name, namespace_name, resource_type, resource = next(iter(ri))
     assert cluster_name == "cl"
     assert namespace_name == "ns"
     assert resource_type == "Deployment.apps"

reconcile/test/test_openshift_resources_base.py

@@ -155,7 +155,7 @@ def test_fetch_current_state_ri_initialized(oc_cs1: oc.OCClient, tmpl1: dict[str
         resource_names=[],
     )
 
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 1
     assert "tmpl1" in resource["current"]
     assert resource["current"]["tmpl1"].kind == "Template"
@@ -178,7 +178,7 @@ def test_fetch_current_state_kind_not_supported(
         resource_names=[],
     )
 
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 0
 
 
@@ -195,7 +195,7 @@ def test_fetch_current_state_long_kind(oc_cs1: oc.OCClient, tmpl1: dict[str, Any
         resource_names=[],
     )
 
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 1
     assert "tmpl1" in resource["current"]
     assert resource["current"]["tmpl1"].kind == "Template"
@@ -218,7 +218,7 @@ def test_fetch_current_state_long_kind_not_supported(
         resource_names=[],
     )
 
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 0
 
 
@@ -227,7 +227,7 @@ def test_fetch_states(current_state_spec: CurrentStateSpec, tmpl1: dict[str, Any
     ri.initialize_resource_type("cs1", "ns1", "Template")
     current_state_spec.oc.get_items = lambda kind, **kwargs: [tmpl1]  # type: ignore[method-assign]
     orb.fetch_states(ri=ri, spec=current_state_spec)
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 1
     assert "tmpl1" in resource["current"]
     assert resource["current"]["tmpl1"].kind == "Template"
@@ -238,7 +238,7 @@ def test_fetch_states_unknown_kind(current_state_spec: CurrentStateSpec):
     ri = ResourceInventory()
     ri.initialize_resource_type("cs1", "ns1", "UnknownKind")
     orb.fetch_states(ri=ri, spec=current_state_spec)
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 0
 
 
@@ -250,7 +250,7 @@ def test_fetch_states_oc_error(current_state_spec: CurrentStateSpec):
     ri.initialize_resource_type("cs1", "ns1", "Template")
     orb.fetch_states(ri=ri, spec=current_state_spec)
     assert ri.has_error_registered("cs1")
-    _, _, _, resource = list(ri)[0]
+    _, _, _, resource = next(iter(ri))
     assert len(resource["current"]) == 0
 
 

reconcile/test/test_openshift_serviceaccount_tokens.py

@@ -264,11 +264,13 @@ def test_openshift_serviceaccount_tokens__fetch_desired_state_create_token(
         )
         == 1
     )
-    r = list(
-        ri._clusters["cluster"]["with-openshift-serviceaccount-tokens"]["Secret"][
-            "desired"
-        ].values()
-    )[0]
+    r = next(
+        iter(
+            ri._clusters["cluster"]["with-openshift-serviceaccount-tokens"]["Secret"][
+                "desired"
+            ].values()
+        )
+    )
     assert r.body["type"] == "kubernetes.io/service-account-token"
 
 

reconcile/test/test_terraform_vpc_peerings.py

@@ -117,7 +117,7 @@ def build_cluster(
         cluster["awsInfrastructureManagementAccounts"] = []
         if read_only_accounts:
             for acc in read_only_accounts:
-                cluster["awsInfrastructureManagementAccounts"].append(  # type: ignore # noqa: E501
+                cluster["awsInfrastructureManagementAccounts"].append(  # type: ignore
                     {
                         "account": {
                             "name": acc,
@@ -131,7 +131,7 @@ def build_cluster(
                 )
         if network_mgmt_accounts:
             for idx, acc in enumerate(network_mgmt_accounts):
-                cluster["awsInfrastructureManagementAccounts"].append(  # type: ignore # noqa: E501
+                cluster["awsInfrastructureManagementAccounts"].append(  # type: ignore
                     {
                         "account": {
                             "name": acc,

reconcile/utils/acs/base.py

@@ -70,7 +70,7 @@ class AcsBaseApi(BaseModel):
         try:
             response.raise_for_status()
         except requests.exceptions.HTTPError as e:
-            logging.error(f"{str(e)}: {response.text}")
+            logging.error(f"{e!s}: {response.text}")
             raise
 
         return response

reconcile/utils/acs/notifiers.py

@@ -123,7 +123,7 @@ class AcsNotifiersApi(AcsBaseApi):
         ]
 
     def get_notifier_id_by_name(self, name: str) -> str:
-        return [n["id"] for n in self.get_notifiers() if n["name"] == name][0]
+        return next(n["id"] for n in self.get_notifiers() if n["name"] == name)
 
     def update_jira_notifier(
         self, jira_notifier: JiraNotifier, jira_credentials: JiraCredentials

reconcile/utils/aws_api.py

@@ -738,7 +738,7 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
     def get_user_key_status(self, iam: IAMClient, user: str, key: str) -> KeyStatus:
         key_list = self._get_user_key_list(iam, user)
-        return [k["Status"] for k in key_list if k["AccessKeyId"] == key][0]
+        return next(k["Status"] for k in key_list if k["AccessKeyId"] == key)
 
     def get_support_cases(self):
         all_support_cases = {}

reconcile/utils/config.py

@@ -35,7 +35,7 @@ def read(secret):
             config = config[t]
         return config[field]
     except Exception as e:
-        raise SecretNotFound(f"key not found in config file {path}: {str(e)}") from None
+        raise SecretNotFound(f"key not found in config file {path}: {e!s}") from None
 
 
 def read_all(secret):
@@ -47,6 +47,4 @@ def read_all(secret):
             config = config[t]
         return config
     except Exception as e:
-        raise SecretNotFound(
-            f"secret {path} not found in config file: {str(e)}"
-        ) from None
+        raise SecretNotFound(f"secret {path} not found in config file: {e!s}") from None

reconcile/utils/external_resources.py

@@ -33,7 +33,7 @@ def get_external_resource_specs(
     external_resources = namespace_info.get("externalResources") or []
     for e in external_resources:
         for r in e.get("resources", []):
-            if "managed_by_erv2" in r and r["managed_by_erv2"]:
+            if r.get("managed_by_erv2"):
                 continue
             spec = ExternalResourceSpec(
                 provision_provider=e["provider"],

reconcile/utils/gql.py

@@ -77,7 +77,7 @@ class GqlApiErrorForbiddenSchema(Exception):
 
 class GqlGetResourceError(Exception):
     def __init__(self, path, msg):
-        super().__init__(f"Error getting resource from path {path}: {str(msg)}")
+        super().__init__(f"Error getting resource from path {path}: {msg!s}")
 
 
 class GqlApi:

reconcile/utils/jinja2/utils.py

@@ -122,7 +122,7 @@ def lookup_graphql_query_results(query: str, **kwargs: dict[str, Any]) -> list[A
     gqlapi = gql.get_api()
     resource = gqlapi.get_resource(query)["content"]
     rendered_resource = jinja2.Template(resource).render(**kwargs)
-    results = list(gqlapi.query(rendered_resource).values())[0]
+    results = next(iter(gqlapi.query(rendered_resource).values()))
     return results
 
 

reconcile/utils/jobcontroller/controller.py

@@ -158,9 +158,9 @@ class K8sJobController:
         the function will wait indefinitely.  If a timeout occures, a TimeoutError will be raised.
         """
         jobs_left = job_names.copy()
-        job_statuses: dict[str, JobStatus] = {
-            name: JobStatus.NOT_EXISTS for name in job_names
-        }
+        job_statuses: dict[str, JobStatus] = dict.fromkeys(
+            job_names, JobStatus.NOT_EXISTS
+        )
 
         start_time = self.time_module.time()
         while jobs_left:

reconcile/utils/mr/__init__.py

@@ -22,19 +22,19 @@ from reconcile.utils.mr.user_maintenance import (
 )
 
 __all__ = [
-    "init_from_sqs_message",
-    "UnknownMergeRequestType",
-    "MergeRequestProcessingError",
+    "CreateAppInterfaceNotificator",
     "CreateAppInterfaceReporter",
-    "CreateDeleteAwsAccessKey",
     "CreateClustersUpdates",
-    "CreateOCMUpgradeSchedulerOrgUpdates",
-    "CreateOCMUpdateRecommendedVersion",
-    "CreateAppInterfaceNotificator",
+    "CreateDeleteAwsAccessKey",
     "CreateDeleteUserAppInterface",
     "CreateDeleteUserInfra",
-    "PromoteQontractSchemas",
+    "CreateOCMUpdateRecommendedVersion",
+    "CreateOCMUpgradeSchedulerOrgUpdates",
+    "MergeRequestProcessingError",
     "PromoteQontractReconcileCommercial",
+    "PromoteQontractSchemas",
+    "UnknownMergeRequestType",
+    "init_from_sqs_message",
 ]
 
 

reconcile/utils/ocm/__init__.py

@@ -1,5 +1,5 @@
-from reconcile.utils.ocm.ocm import *  # noqa: F401,F403
-from reconcile.utils.ocm.products import (  # noqa: F401,F403
+from reconcile.utils.ocm.ocm import *  # noqa: F403
+from reconcile.utils.ocm.products import (  # noqa: F401
     BYTES_IN_GIGABYTE,
     CS_API_BASE,
     DEFAULT_OCM_MACHINE_POOL_ID,

reconcile/utils/saasherder/__init__.py

@@ -9,9 +9,9 @@ from reconcile.utils.saasherder.saasherder import (
 )
 
 __all__ = [
+    "UNIQUE_SAAS_FILE_ENV_COMBO_LEN",
     "Providers",
     "SaasHerder",
     "TriggerSpecUnion",
     "TriggerTypes",
-    "UNIQUE_SAAS_FILE_ENV_COMBO_LEN",
 ]

reconcile/utils/saasherder/saasherder.py

@@ -888,7 +888,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     url=url, path=path, ref=ref, github=github
                 )
             except Exception as e:
-                logging.error(f"{error_prefix} error fetching template: {str(e)}")
+                logging.error(f"{error_prefix} error fetching template: {e!s}")
                 raise
 
             # add COMMIT_SHA only if it is unspecified
@@ -930,7 +930,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     logging.error(
                         f"{error_prefix} error generating REPO_DIGEST. "
                         + "Is REGISTRY_IMG missing? "
-                        + f"{str(e)}"
+                        + f"{e!s}"
                     )
                     raise
 
@@ -955,7 +955,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             try:
                 resources = oc.process(template, consolidated_parameters)
             except StatusCodeError as e:
-                logging.error(f"{error_prefix} error processing template: {str(e)}")
+                logging.error(f"{error_prefix} error processing template: {e!s}")
 
         elif provider == "directory":
             try:
@@ -964,7 +964,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 )
             except Exception as e:
                 logging.error(
-                    f"{error_prefix} error fetching directory: {str(e)} "
+                    f"{error_prefix} error fetching directory: {e!s} "
                     + "(We do not support nested directories. Do you by chance have subdirectories?)"
                 )
                 raise
@@ -1141,7 +1141,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             )
         except Exception as e:
             logging.error(
-                f"{error_prefix} Image is invalid: {image}. " + f"details: {str(e)}"
+                f"{error_prefix} Image is invalid: {image}. " + f"details: {e!s}"
             )
 
         return None

reconcile/utils/state.py

@@ -250,7 +250,7 @@ class State:
             self.client.head_bucket(Bucket=self.bucket)
         except ClientError as details:
             raise StateInaccessibleException(
-                f"Bucket {self.bucket} is not accessible - {str(details)}"
+                f"Bucket {self.bucket} is not accessible - {details!s}"
             ) from None
 
     def __enter__(self) -> Self:
@@ -301,7 +301,7 @@ class State:
 
             raise StateInaccessibleException(
                 f"Can not access state key {key_path} "
-                f"in bucket {self.bucket} - {str(details)}"
+                f"in bucket {self.bucket} - {details!s}"
             ) from None
 
     def ls(self) -> list[str]:

reconcile/utils/terraform_client.py

@@ -523,7 +523,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             self.OUTPUT_TYPE_PASSWORDS,
             self.OUTPUT_TYPE_CONSOLEURLS,
         }:
-            return data[list(data.keys())[0]]
+            return data[next(iter(data.keys()))]
         return data
 
     def populate_terraform_output_secrets(

reconcile/utils/terrascript_aws_client.py

@@ -5734,7 +5734,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
                 s3_client.head_bucket(Bucket=bucket_name)
             except ClientError as details:
                 raise StateInaccessibleException(
-                    f"Bucket {bucket_name} is not accessible - {str(details)}"
+                    f"Bucket {bucket_name} is not accessible - {details!s}"
                 ) from None
 
             # todo: probably remove 'RedHat' from the object/variable/filepath

reconcile/utils/unleash/__init__.py

@@ -5,7 +5,7 @@ from .client import (
 )
 
 __all__ = [
-    "get_feature_toggles",
-    "get_feature_toggle_state",
     "get_feature_toggle_default",
+    "get_feature_toggle_state",
+    "get_feature_toggles",
 ]

reconcile/utils/vcs.py

@@ -129,7 +129,7 @@ class VCS:
         gitlab_instances: Iterable[GitlabInstanceV1],
     ) -> GitLabApi:
         return GitLabApi(
-            list(gitlab_instances)[0].dict(by_alias=True),
+            next(iter(gitlab_instances)).dict(by_alias=True),
             secret_reader=self._secret_reader,
         )
 
@@ -139,7 +139,7 @@ class VCS:
         app_interface_repo_url: str,
     ) -> GitLabApi:
         return GitLabApi(
-            list(gitlab_instances)[0].dict(by_alias=True),
+            next(iter(gitlab_instances)).dict(by_alias=True),
             secret_reader=self._secret_reader,
             project_url=app_interface_repo_url,
         )

tools/app_interface_reporter.py

@@ -338,10 +338,10 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
                             validt_mx[cluster][namespace] = {}
                         if validation not in validt_mx[cluster][namespace]:
                             validt_mx[cluster][namespace][validation] = {}
-                        if status not in validt_mx[cluster][namespace][validation]:  # noqa: E501
-                            validt_mx[cluster][namespace][validation][status] = {}  # noqa: E501
+                        if status not in validt_mx[cluster][namespace][validation]:
+                            validt_mx[cluster][namespace][validation][status] = {}
                         value = int(sample.value)
-                        validt_mx[cluster][namespace][validation][status] = value  # noqa: E501
+                        validt_mx[cluster][namespace][validation][status] = value
         for family in text_string_to_metric_families(slo_metrics):
             for sample in family.samples:
                 if sample.name == "serviceslometrics":
@@ -358,14 +358,14 @@ def get_apps_data(date, month_delta=1, thread_pool_size=10):
                             slo_mx[cluster] = {}
                         if namespace not in slo_mx[cluster]:
                             slo_mx[cluster][namespace] = {}
-                        if slo_doc_name not in slo_mx[cluster][namespace]:  # pylint: disable=line-too-long # noqa: E501
+                        if slo_doc_name not in slo_mx[cluster][namespace]:  # pylint: disable=line-too-long
                             slo_mx[cluster][namespace][slo_doc_name] = {}
-                        if slo_name not in slo_mx[cluster][namespace][slo_doc_name]:  # noqa: E501
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name] = {  # noqa: E501
+                        if slo_name not in slo_mx[cluster][namespace][slo_doc_name]:
+                            slo_mx[cluster][namespace][slo_doc_name][slo_name] = {
                                 sample.labels["type"]: sample.value
                             }
                         else:
-                            slo_mx[cluster][namespace][slo_doc_name][slo_name].update({  # pylint: disable=line-too-long # noqa: E501
+                            slo_mx[cluster][namespace][slo_doc_name][slo_name].update({  # pylint: disable=line-too-long
                                 sample.labels["type"]: sample.value
                             })
         app["container_vulnerabilities"] = vuln_mx

tools/qontract_cli.py

@@ -1124,14 +1124,14 @@ def cidr_blocks(ctx, for_cluster: int, mask: int) -> None:
 
         avail_addr = ipaddress.ip_address(latest_cluster_cidr["to"]) + 1
 
-        print(f"INFO: Latest available network address: {str(avail_addr)}")
+        print(f"INFO: Latest available network address: {avail_addr!s}")
         try:
             result_cidr_block = str(ipaddress.ip_network((avail_addr, mask)))
         except ValueError:
             print(f"ERROR: Invalid CIDR Mask {mask} Provided.")
             sys.exit(1)
-        print(f"INFO: You are reserving {str(2 ** (32 - mask))} network addresses.")
-        print(f"\nYou can use: {str(result_cidr_block)}")
+        print(f"INFO: You are reserving {2 ** (32 - mask)!s} network addresses.")
+        print(f"\nYou can use: {result_cidr_block!s}")
     else:
         ctx.obj["options"]["sort"] = False
         print_output(ctx.obj["options"], cidrs, columns)
@@ -1744,17 +1744,8 @@ def roles(ctx, org_username):
 
     user = users[0]
 
-    roles = []
-
-    def add(d):
-        for i, r in enumerate(roles):
-            if all(d[k] == r[k] for k in ("type", "name", "resource")):
-                roles.insert(
-                    i + 1, {"type": "", "name": "", "resource": "", "ref": d["ref"]}
-                )
-                return
-
-        roles.append(d)
+    # type, name, resource, [ref]
+    roles: dict[(str, str, str), set] = defaultdict(set)
 
     for role in user["roles"]:
         role_name = role["path"]
@@ -1771,53 +1762,38 @@ def roles(ctx, org_username):
             if "team" in p:
                 r_name += "/" + p["team"]
 
-            add({
-                "type": "permission",
-                "name": p["name"],
-                "resource": r_name,
-                "ref": role_name,
-            })
+            roles[("permission", p["name"], r_name)].add(role_name)
 
         for aws in role.get("aws_groups") or []:
             for policy in aws["policies"]:
-                add({
-                    "type": "aws",
-                    "name": policy,
-                    "resource": aws["account"]["name"],
-                    "ref": aws["path"],
-                })
+                roles[("aws", policy, aws["account"]["name"])].add(aws["path"])
 
         for a in role.get("access") or []:
             if a["cluster"]:
                 cluster_name = a["cluster"]["name"]
-                add({
-                    "type": "cluster",
-                    "name": a["clusterRole"],
-                    "resource": cluster_name,
-                    "ref": role_name,
-                })
+                roles[("cluster", a["clusterRole"], cluster_name)].add(role_name)
             elif a["namespace"]:
                 ns_name = a["namespace"]["name"]
-                add({
-                    "type": "namespace",
-                    "name": a["role"],
-                    "resource": ns_name,
-                    "ref": role_name,
-                })
+                roles[("namespace", a["role"], ns_name)].add(role_name)
 
         for s in role.get("self_service") or []:
             for d in s.get("datafiles") or []:
                 name = d.get("name")
                 if name:
-                    add({
-                        "type": "saas_file",
-                        "name": "owner",
-                        "resource": name,
-                        "ref": role_name,
-                    })
+                    roles[("saas_file", "owner", name)].add(role_name)
 
     columns = ["type", "name", "resource", "ref"]
-    print_output(ctx.obj["options"], roles, columns)
+    rows = [
+        {
+            "type": k[0],
+            "name": k[1],
+            "resource": k[2],
+            "ref": ref,
+        }
+        for k, v in roles.items()
+        for ref in v
+    ]
+    print_output(ctx.obj["options"], rows, columns)
 
 
 @get.command()