qontract-reconcile 0.10.2.dev55__py3-none-any.whl → 0.10.2.dev57__py3-none-any.whl

{qontract_reconcile-0.10.2.dev55.dist-info → qontract_reconcile-0.10.2.dev57.dist-info}/METADATA

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

{qontract_reconcile-0.10.2.dev55.dist-info → qontract_reconcile-0.10.2.dev57.dist-info}/RECORD

@@ -15,7 +15,7 @@ reconcile/closedbox_endpoint_monitoring_base.py,sha256=MvGKBqH9PdHWdMjhLuptze-dk
 reconcile/cluster_deployment_mapper.py,sha256=5gumAaRCcFXsabUJ1dnuUy9WrP_FEEM5JnOnE8ch9sE,2326
 reconcile/dashdotdb_base.py,sha256=83ZWIf5JJk3P_D69y2TmXRcQr6ELJGlv10OM0h7fJVs,4767
 reconcile/dashdotdb_cso.py,sha256=QRK0YfIqO4rehs8btD3l_GXIO2ZIycTQEKEthBdB0xA,3639
-reconcile/dashdotdb_dora.py,sha256=olQnGp4JYpoh1lQEf9kHc2y3bMaAIUXEB6eFohWH8Io,17859
+reconcile/dashdotdb_dora.py,sha256=ZOIIyxuwSrv33L7FZAHiKHPWDNnA1FybaUf37Lsk07A,17736
 reconcile/dashdotdb_dvo.py,sha256=lCkZ0iby6HrNQb-3kYb6xrt8wCjVUZYxKzz9SiStfHU,8946
 reconcile/dashdotdb_slo.py,sha256=PU1GzT6Uy07IIO3Y62cFfRfaBJYUPrMkMp71Up80_bg,8334
 reconcile/database_access_manager.py,sha256=Z3aAmw2LsmMIIor-bOGzziVZdVNC82Gmw8oHBUAFf-8,25577
@@ -30,7 +30,7 @@ reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7l
 reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,3672
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
 reconcile/gitlab_fork_compliance.py,sha256=c7UfqSAsW04c1bWJmXXaQDwtUcG4Kb6nCJAyRU2uAuw,4449
-reconcile/gitlab_housekeeping.py,sha256=Gy1mhn33xGp9IyQFqs4VrBmhwJBD6x90XITDR_pU4MU,25416
+reconcile/gitlab_housekeeping.py,sha256=i4hNZViV2yfUTDNsYhVSLik211q8_c4nbTK8ilmpufc,25313
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=MUIgYDLeJx2-_vMypyq2Pa17cpKdXATYhtVACS2ghpQ,8297
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
@@ -115,11 +115,11 @@ reconcile/terraform_cloudflare_resources.py,sha256=pq8Ieo5NmB-dYQ9X2F0s6iEoINMzh
 reconcile/terraform_cloudflare_users.py,sha256=-dCJZqpZH1vD_Gri9QAZbqpKWiN-tsSWllIp0JuZ_-M,13938
 reconcile/terraform_repo.py,sha256=xHk0-7wgZchh_eqI-7oX4br9pYkKvYa6m7-8VPWqiZ4,15777
 reconcile/terraform_resources.py,sha256=iufjMJs_aSEvmh7Cg11beCxKmV8nrOLOpEtiTryPNx0,19470
-reconcile/terraform_tgw_attachments.py,sha256=-x7OV5fBmTh9t3N8f4t-AnvQozU1kQUxWKwVzk4GWWM,18838
+reconcile/terraform_tgw_attachments.py,sha256=09svJG9pAiwWp4aY0xRoQRV90T4ZNwHG3r8flI-ZS_s,18810
 reconcile/terraform_users.py,sha256=rt62m9Yb0mkyhza07t_c6vlrFWF-OeJGJ9oGaCVK72M,10234
-reconcile/terraform_vpc_peerings.py,sha256=0N7uxG6Afe2oNrUyw-apjV-fX2P9TbI5A3xjXO_83eA,27658
+reconcile/terraform_vpc_peerings.py,sha256=pDJkUFnAhEz2cNKEUY4WAJYK-09YPrNSSpt8BnIW3hc,27651
 reconcile/vault_replication.py,sha256=YD70ROZXC1dYnUcS3q1WgnAoIDSdoZVdZsUGc5fanNU,17556
-reconcile/vpc_peerings_validator.py,sha256=aESqrhm1tpkc2iqSL1UV5to_HjNgjRSffD0crb_q49g,7113
+reconcile/vpc_peerings_validator.py,sha256=-upvNg3ggKCxcJ4kqZcqJVsiltlhQ8MyyLZiWX8eYmE,7068
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=NF3UQ02MdUpVPup50EqnTbTn3dRHGoXoSfFLZxOjr8Q,23744
 reconcile/aus/aus_label_source.py,sha256=2Rktyvs7ZvCwsRwmbGUhddycTBTq0jHq8wpBaiDHAMA,4165
@@ -149,7 +149,7 @@ reconcile/aws_account_manager/utils.py,sha256=iYPPOtbZ7FiKkz9v5f1YXRIHw5YFOtSavU
 reconcile/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_ami_cleanup/integration.py,sha256=KG7g9NpbKmoaveDD3oi9SinqUE29NaM-4lGo-6YuHlM,9302
 reconcile/aws_cloudwatch_log_retention/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aws_cloudwatch_log_retention/integration.py,sha256=qVggTjGwP_6xTCXo2o3brSPtjwArNhZiGPy8YiBrCMM,7779
+reconcile/aws_cloudwatch_log_retention/integration.py,sha256=p3ERapK2aJXTQ76tyGDORUn0r-dNtggNflcfP0Hi7RQ,7773
 reconcile/aws_saml_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_saml_idp/integration.py,sha256=Z2JtUx2YIbkn0KVrVa2CoAErPB8vTykOOkWD_ZPoB94,6511
 reconcile/aws_saml_roles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -564,31 +564,32 @@ reconcile/typed_queries/terraform_tgw_attachments/aws_accounts.py,sha256=2idUmpa
 reconcile/unleash_feature_toggles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/unleash_feature_toggles/integration.py,sha256=nx7BhtzCsTfPbOp60vI5MkNwuj8QrPay52msjADLbfI,10995
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/aggregated_list.py,sha256=_9UeaS1TWbJsGIESvXlzzK-omPI2lMMcCsoqc9LBclc,4022
+reconcile/utils/aggregated_list.py,sha256=km0xadW0jO4G_CqZPsXmoBURQ8c90FaTu5x4X1K1cZs,3357
 reconcile/utils/amtool.py,sha256=3dHViQ_esKPaMEpiOVVSnxTaySM8ELpGVVvppqqPvUY,2289
-reconcile/utils/aws_api.py,sha256=n2HMUPOnztcDt7c8GvGpT0qrpwArXke0hSCHQ1dSk6w,79439
-reconcile/utils/aws_helper.py,sha256=8PvDR17ntAGX3bBzlTIxDuENl2rkK-RECsNYKm2_DZw,2955
+reconcile/utils/aws_api.py,sha256=cyX3NYe035CyX2ZyVmjWl_jcFCAm-SA_T34NUt9brW0,67901
+reconcile/utils/aws_helper.py,sha256=IOfPpNB0Hh73oo8pWozeril7YH_EJRCdYhahFp-esns,2871
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
-reconcile/utils/binary.py,sha256=lSIevhilMeoGMePPHD7A-pxe45LVpBT0LksecYbM-EA,2477
-reconcile/utils/config.py,sha256=UhF9U6A0TLmoPTGwhOclUKcSEChu5_Gqwm8VTM1X0ow,1156
+reconcile/utils/binary.py,sha256=V6fW70wGFMCaYaLjJ0A-C_U3p7THTcAmv4wN_KP__KU,2207
+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
-reconcile/utils/defer.py,sha256=LYTqcvyifCg71_C2i7pbxdqd8-NrXrUhcvuLFy1bQN0,476
+reconcile/utils/defer.py,sha256=SniUsbgOEs9Pa8JkecLu0F94O63yQPByKXaElDYe0FI,377
 reconcile/utils/differ.py,sha256=WFW8GoFPMEw9TD1irPpIan6aILF-kjeWWsKLuvqnv64,7554
 reconcile/utils/disabled_integrations.py,sha256=z1ZGUOKjZ99R-YZ68w1xnLQ_wUccI27NcmdzfK9TARs,1077
 reconcile/utils/dnsutils.py,sha256=Zit4U-DAt_6AD4NVvic3I7EO5DdjNEeu8Qn_x84i-44,258
 reconcile/utils/early_exit_cache.py,sha256=9zj4ksXCq2qK2oGO0zW9aZ5tkjC5sRCms0ismZOmBv4,8725
-reconcile/utils/elasticsearch_exceptions.py,sha256=4lwms6yjDYJzhD_xXgb96Juax5DHp_LXEUaME6t59A4,578
-reconcile/utils/environ.py,sha256=j43kXnqE9uVg__N-83HpcWUqv1Q8ge8ykTL3OnVs-yc,653
-reconcile/utils/exceptions.py,sha256=2cKJD01d_uZM_j0CTcvDoo-WDisZJVYaeY2KUbfUHCc,686
+reconcile/utils/elasticsearch_exceptions.py,sha256=zMuP0B8Y3U0u64ZrmAyzw2RWALPs9uS7IzKcF7Prx0U,501
+reconcile/utils/environ.py,sha256=psk07d2xyjbUzjOCDdNWgavaNolL_t2sq3sn2gFfY9k,507
+reconcile/utils/exceptions.py,sha256=DwfnWUpVOotpP79RWZ2pycmG6nKCL00RBIeZLYkQPW4,635
 reconcile/utils/expiration.py,sha256=3JaXH4psksR7z262k7FmdyREjCLqm66OpVMEbcfdWRo,1213
 reconcile/utils/extended_early_exit.py,sha256=QSktrmfw37zSRMNk930tDbQsVeKxaPPPD43e79DGwZw,6754
 reconcile/utils/external_resource_spec.py,sha256=qeupz4t4trd2uPjlHjf_AFA9Y-EKrMnaXi72tAuCxig,7177
 reconcile/utils/external_resources.py,sha256=YzTb0xAcNdmKO326mGQy7BmST56CZcdru4lX7ai_7kw,7579
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
-reconcile/utils/git.py,sha256=o4p9m8jlzCJDcutl2HErvGLhL6sZ1NB4Aw3zGcQIzso,2427
+reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
 reconcile/utils/github_api.py,sha256=y3fxty7FKvfhdzfHgGSaIstL6A_Y2loUcMiyIK5TMDg,2750
-reconcile/utils/gitlab_api.py,sha256=WMTNXtldW0L9qhC0rfd3ssGeHu9khmzU1RBG6lZHpQM,29723
+reconcile/utils/gitlab_api.py,sha256=N1QdgF6Jdhg_nF03vtfouvqXP7MVfkPRnq7Q3z169kM,28662
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
@@ -642,7 +643,7 @@ reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
 reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5s1G0,911
-reconcile/utils/vcs.py,sha256=fcNwWlhrknxg3QUs8BZ23wxTe3ISS7GFZxwFUZZG-wg,8718
+reconcile/utils/vcs.py,sha256=4_f08Rixb1NcLdWI0vh8e-B0Cb4ckx1bd0TkLqCmvR4,8674
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
 reconcile/utils/acs/notifiers.py,sha256=nHVw9C_2-K4nv5zq26jlOTSw1roY6TKlovi1sOfpxpI,4998
@@ -690,7 +691,7 @@ reconcile/utils/mr/__init__.py,sha256=hcfHDIIIsJT4C0BnzDnyeZEfZdamrqHzMLcBzIT1ib
 reconcile/utils/mr/app_interface_reporter.py,sha256=6Kpg93V9FvcOke9Jimkva359MQ-ZyBIkUpf8QIA6-to,1793
 reconcile/utils/mr/app_sre_tekton_access_report.py,sha256=i7JeTkyaq0HyVGbAFKCNbiLy3NVE05IXqJzwArsGre4,1513
 reconcile/utils/mr/aws_access.py,sha256=9MMpYD24j2lLr_hLeMSh_OsJ07waalrlNpz-JlOsKAM,2575
-reconcile/utils/mr/base.py,sha256=pHRmyxJzlBy9ldjYKOdHg9-9KbsK8bdRScntKZa5Tew,8130
+reconcile/utils/mr/base.py,sha256=O8BWr6dibeQ22FDE9y56r6DK3UnC-5IhRXT7IWGrnxk,8069
 reconcile/utils/mr/clusters_updates.py,sha256=pcusPAwRUkvyk_-bixsRNTzSvpTLypJ1kflq5UEVgcM,2271
 reconcile/utils/mr/glitchtip_access_reporter.py,sha256=cTkOtzdgeKPaqro0VS2hDuAClQiN4nZATh-mplQC-AI,1369
 reconcile/utils/mr/labels.py,sha256=9QRTRjZAtq45zELd9SwavaraczMjwjn5no3RK1YxFTg,825
@@ -698,7 +699,7 @@ reconcile/utils/mr/notificator.py,sha256=f8IcGQ1_iBsXJFnhPsWQ7UE3NfigaOrXcVieJPp
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=5EncHGr4QRnZgHedRfCwMYZ9CaijYzHGj7-M6lhtQRo,3004
 reconcile/utils/mr/promote_qontract.py,sha256=wgvX2CBlcZaihKJSXJ0zcEK8NGaEP2_DUQDz0STzGes,7158
-reconcile/utils/mr/update_access_report_base.py,sha256=4Grohtp44v1sSHZyIAYOwClxH8SLj_nnOrCcHPKp9p0,4361
+reconcile/utils/mr/update_access_report_base.py,sha256=0vhF-eZTIjl7keBAOb2bO7LrlRAiticuUGh5EmI5MWc,4357
 reconcile/utils/mr/user_maintenance.py,sha256=ZlR1Id_r2BUXsoerJW-0Ioh5bcbwlnQxBBhSs-ri9Dk,5099
 reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
@@ -750,7 +751,7 @@ tools/app_sre_tekton_access_reporter.py,sha256=o9prLUgQpwO3msRWc2as1xT1y9OB3znkp
 tools/app_sre_tekton_access_revalidation.py,sha256=66nHEaY-bIqxIhpcmwN8AvQZu6ZXenfkg4Fut0pVZRM,2726
 tools/glitchtip_access_reporter.py,sha256=o01A6b88t3Wie6tj_tJWWVo2J01LxQ_a9giGm4UzEaU,2901
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=fBoeBCni2_73Wg_GzAVoxypYv5jcsWm3Y0BA_p8eqGM,152447
+tools/qontract_cli.py,sha256=85CWZ6cxprlZ57408tqhCzpj_jvLhiJgbPlFwI-V1Jo,152244
 tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaBNFA,5062
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -777,7 +778,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev55.dist-info/METADATA,sha256=PJqP4T8BYuLvv02v5F24VKIzshsrUWKv6cFYcQ7ghgE,24665
-qontract_reconcile-0.10.2.dev55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev55.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev55.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev57.dist-info/METADATA,sha256=2qGhxgrqphXjBqRFzFHynTsQErFrGX6JcXRGzKPRwc4,24665
+qontract_reconcile-0.10.2.dev57.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev57.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev57.dist-info/RECORD,,

reconcile/aws_cloudwatch_log_retention/integration.py

@@ -3,7 +3,10 @@ import re
 import typing
 from collections import defaultdict
 from collections.abc import Iterable
-from datetime import UTC, datetime, timedelta
+from datetime import (
+    datetime,
+    timedelta,
+)
 from enum import Enum
 from typing import TYPE_CHECKING
 
@@ -15,9 +18,9 @@ from reconcile.queries import get_aws_accounts
 from reconcile.utils.aws_api import AWSApi
 
 if TYPE_CHECKING:
-    from mypy_boto3_logs.type_defs import LogGroupTypeDef
+    from mypy_boto3_logs import CloudWatchLogsClient  # type: ignore
 else:
-    LogGroupTypeDef = object
+    CloudWatchLogsClient = object
 
 QONTRACT_INTEGRATION = "aws_cloudwatch_log_retention"
 MANAGED_BY_INTEGRATION_KEY = "managed_by_integration"
@@ -66,17 +69,21 @@ def create_awsapi_client(accounts: list, thread_pool_size: int) -> AWSApi:
     return AWSApi(thread_pool_size, accounts, settings=settings, init_users=False)
 
 
-def is_empty(log_group: LogGroupTypeDef) -> bool:
+def is_empty(
+    log_group: dict,
+) -> bool:
     return log_group["storedBytes"] == 0
 
 
 def is_longer_than_retention(
-    log_group: LogGroupTypeDef,
+    log_group: dict,
     desired_retention_days: int,
 ) -> bool:
-    return datetime.fromtimestamp(log_group["creationTime"] / 1000, tz=UTC) + timedelta(
-        days=desired_retention_days
-    ) < datetime.now(tz=UTC)
+    return (
+        datetime.fromtimestamp(log_group["creationTime"] / 1000)
+        + timedelta(days=desired_retention_days)
+        < datetime.utcnow()
+    )
 
 
 class TagStatus(Enum):
@@ -86,7 +93,7 @@ class TagStatus(Enum):
 
 
 def get_tag_status(
-    log_group: LogGroupTypeDef,
+    log_group: dict,
     account_name: str,
     region: str,
     aws_api: AWSApi,
@@ -106,7 +113,7 @@ def get_tag_status(
 
 def _reconcile_log_group(
     dry_run: bool,
-    aws_log_group: LogGroupTypeDef,
+    aws_log_group: dict,
     desired_cleanup_options: Iterable[AWSCloudwatchCleanupOption],
     account_name: str,
     region: str,

reconcile/dashdotdb_dora.py

@@ -397,11 +397,10 @@ class DashdotdbDORA(DashdotdbBase):
         self, saastarget: SaasTarget, sha: str
     ) -> tuple[str | None, str | None]:
         try:
-            saas_file_yaml = self.gl_app_interface_get_file(saastarget.path, ref=sha)
-            if not saas_file_yaml:
-                LOG.info(f"failed to fetch saas file {saastarget.path} at {sha}")
-                return (None, None)
-            saas_file = yaml.safe_load(saas_file_yaml.decode())
+            saas_file_yaml = self.gl_app_interface_get_file(
+                saastarget.path, ref=sha
+            ).decode()
+            saas_file = yaml.safe_load(saas_file_yaml)
         except Exception as e:
             LOG.info(f"failed to decode saas file {saastarget.path} with error: {e}")
             return (None, None)

reconcile/gitlab_housekeeping.py

@@ -11,11 +11,10 @@ from datetime import (
     timedelta,
 )
 from operator import itemgetter
-from typing import Any, cast
+from typing import Any
 
 import gitlab
 from gitlab.v4.objects import (
-    ProjectCommit,
     ProjectIssue,
     ProjectMergeRequest,
 )
@@ -336,15 +335,12 @@ def is_good_to_merge(labels):
 
 def is_rebased(mr, gl: GitLabApi) -> bool:
     target_branch = mr.target_branch
-    head = cast(
-        list[ProjectCommit],
-        gl.project.commits.list(
-            ref_name=target_branch,
-            per_page=1,
-            page=1,
-        ),
+    head = gl.project.commits.list(
+        ref_name=target_branch,
+        per_page=1,
+        page=1,
     )[0].id
-    result = cast(dict, gl.project.repository_compare(mr.sha, head))
+    result = gl.project.repository_compare(mr.sha, head)
     return len(result["commits"]) == 0
 
 

reconcile/terraform_tgw_attachments.py

@@ -195,9 +195,9 @@ def _build_desired_state_tgw_connection(
         cluster_region,
         cluster_cidr_block,
         tags=peer_connection.tags or {},
-        route_tables=bool(peer_connection.manage_routes),
-        security_groups=bool(peer_connection.manage_security_groups),
-        route53_associations=bool(peer_connection.manage_route53_associations),
+        route_tables=peer_connection.manage_routes,
+        security_groups=peer_connection.manage_security_groups,
+        route53_associations=peer_connection.manage_route53_associations,
     )
     for tgw in account_tgws:
         connection_name = (
@@ -268,13 +268,13 @@ def _build_accepter(
     awsapi: AWSApi,
     private_hcp: bool = False,
 ) -> Accepter:
-    allow_hcp_private_api_access = bool(
+    allow_hcp_private_api_access = (
         private_hcp and peer_connection.allow_private_hcp_api_access
     )
     (vpc_id, route_table_ids, subnets_id_az, api_security_group_id) = (
         awsapi.get_cluster_vpc_details(
             account.dict(by_alias=True),
-            route_tables=bool(peer_connection.manage_routes),
+            route_tables=peer_connection.manage_routes,
             subnets=True,
             hcp_vpc_endpoint_sg=allow_hcp_private_api_access,
         )

reconcile/terraform_vpc_peerings.py

@@ -198,7 +198,7 @@ def build_desired_state_single_cluster(
                 f"{peer_connection_name}"
             )
 
-        accepter_manage_routes = peer_info.get("manageRoutes", False)
+        accepter_manage_routes = peer_info.get("manageRoutes")
 
         infra_account_name, req_aws, acc_aws = aws_assume_roles_for_cluster_vpc_peering(
             peer_connection, cluster_info, peer_info, peer_cluster, ocm

reconcile/utils/aggregated_list.py

@@ -1,27 +1,17 @@
 import json
 import logging
-from collections.abc import Callable, KeysView
-from typing import Any, TypedDict
-
-Action = Callable[[Any, list[Any]], bool]
-Cond = Callable[[Any], bool]
 
 
 class RunnerException(Exception):
     pass
 
 
-class AggregatedItem(TypedDict):
-    params: Any
-    items: list[Any]
-
-
 class AggregatedList:
-    def __init__(self) -> None:
-        self._dict: dict[int, AggregatedItem] = {}
+    def __init__(self):
+        self._dict = {}
 
-    def add(self, params: Any, new_items: Any | list[Any]) -> None:
-        params_hash: int = self.hash_params(params)
+    def add(self, params, new_items):
+        params_hash = self.hash_params(params)
 
         if self._dict.get(params_hash) is None:
             self._dict[params_hash] = {"params": params, "items": []}
@@ -33,20 +23,20 @@ class AggregatedList:
             if item not in self._dict[params_hash]["items"]:
                 self._dict[params_hash]["items"].append(item)
 
-    def get(self, params: Any) -> AggregatedItem:
+    def get(self, params):
         return self._dict[self.hash_params(params)]
 
-    def get_all_params_hash(self) -> KeysView[int]:
+    def get_all_params_hash(self):
         return self._dict.keys()
 
-    def get_by_params_hash(self, params_hash: int) -> AggregatedItem:
+    def get_by_params_hash(self, params_hash):
         return self._dict[params_hash]
 
-    def diff(self, right_state: "AggregatedList") -> dict[str, list[AggregatedItem]]:
+    def diff(self, right_state):
         left_params = self.get_all_params_hash()
         right_params = right_state.get_all_params_hash()
 
-        diff: dict[str, list[AggregatedItem]] = {
+        diff = {
             "insert": [
                 right_state.get_by_params_hash(p)
                 for p in right_params
@@ -62,11 +52,11 @@ class AggregatedList:
         union = [p for p in left_params if p in right_params]
 
         for p in union:
-            left: AggregatedItem = self.get_by_params_hash(p)
-            right: AggregatedItem = right_state.get_by_params_hash(p)
+            left = self.get_by_params_hash(p)
+            right = right_state.get_by_params_hash(p)
 
-            l_items: list[Any] = left["items"]
-            r_items: list[Any] = right["items"]
+            l_items = left["items"]
+            r_items = right["items"]
 
             update_insert = [i for i in r_items if i not in l_items]
             update_delete = [i for i in l_items if i not in r_items]
@@ -85,28 +75,28 @@ class AggregatedList:
 
         return diff
 
-    def dump(self) -> list[AggregatedItem]:
+    def dump(self):
         return list(self._dict.values())
 
-    def toJSON(self) -> str:
+    def toJSON(self):
         return json.dumps(self.dump(), indent=4)
 
     @staticmethod
-    def hash_params(params: Any) -> int:
+    def hash_params(params):
         return hash(json.dumps(params, sort_keys=True))
 
 
 class AggregatedDiffRunner:
-    def __init__(self, diff: dict[str, list[AggregatedItem]]) -> None:
+    def __init__(self, diff):
         self.diff = diff
-        self.actions: list[tuple[str, Action, Cond | None]] = []
+        self.actions = []
 
-    def register(self, on: str, action: Action, cond: Cond | None = None) -> None:
+    def register(self, on, action, cond=None):
         if on not in self.diff:
             raise Exception(f"Unknown diff key for 'on': {on}")
         self.actions.append((on, action, cond))
 
-    def run(self) -> bool:
+    def run(self):
         status = True
 
         for on, action, cond in self.actions: