qontract-reconcile 0.10.2.dev135__py3-none-any.whl → 0.10.2.dev136__py3-none-any.whl

{qontract_reconcile-0.10.2.dev135.dist-info → qontract_reconcile-0.10.2.dev136.dist-info}/METADATA

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

@@ -2,16 +2,16 @@ reconcile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/acs_notifiers.py,sha256=YIV9TrgWjBD8nFbrBvvU8-9s-AdezY4X5t90bFROCtM,4451
 reconcile/acs_policies.py,sha256=xNbhIlwE1u2URbEQcX-3C-pTu--XjrKAqGj0-Wd85dY,9152
 reconcile/acs_rbac.py,sha256=hOQNOzD9f2Nioxb9XlspqnpZXH1DurCTnMcJpgyeB4E,22598
-reconcile/aws_ami_share.py,sha256=cZeJadO6N_8SHCtldwK1SRxo7j7EnGxM6Ks2VQSFX3k,3743
-reconcile/aws_ecr_image_pull_secrets.py,sha256=TGEc_0nv8oxV2HqA8VdcM4HHP-B1YqmNOOU6FPwVFTY,2328
-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=hl_9L53yQYRQxKs3IWrd69Cc60XK067g_bJRM9B0udo,2975
+reconcile/aws_ami_share.py,sha256=M_gT7y3cSAyT_Pm90PBCNDSmbZtqREqe2jNETh0i9Qs,3808
+reconcile/aws_ecr_image_pull_secrets.py,sha256=F58PtX1GlB9XHqj8hGy9ItiTznXLAAKTNlWD9iT2MWI,2593
+reconcile/aws_garbage_collector.py,sha256=PG_0qccQIW347WhdLAhfT9x0P9Mq_ojacvSy5vbJWj8,471
+reconcile/aws_iam_keys.py,sha256=mw_lvmWqpJkzYW8Za6lHfxEMkT-_DOzWiCPhJAmYPIQ,3987
+reconcile/aws_iam_password_reset.py,sha256=O0JX2N5kNRKs3u2xzu4NNrI6p0ag5JWy3MTsvZmtleg,3173
+reconcile/aws_support_cases_sos.py,sha256=PDhilxQ4TBxVnxUPIUdTbKEaNUI0wzPiEsB91oHT2fY,3384
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=O1wFp52EyF538c6txaWBs8eMtUIy19gyHZ6VzJ6QXS8,3512
 reconcile/checkpoint.py,sha256=_JhMxrye5BgkRMxWYuf7Upli6XayPINKSsuo3ynHTRc,5010
 reconcile/cli.py,sha256=hwqPcZVmazrhzq1esPBk5jNHSzpfr7o9EmuuMqiPxfg,108430
-reconcile/closedbox_endpoint_monitoring_base.py,sha256=MvGKBqH9PdHWdMjhLuptze-dk0Tifhp3-0SZdI-7Fmo,4862
+reconcile/closedbox_endpoint_monitoring_base.py,sha256=al7m8EgnnYx90rY1REryW3byN_ItfJfAzEeLtjbCfi0,4921
 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
@@ -20,21 +20,21 @@ reconcile/dashdotdb_dvo.py,sha256=lCkZ0iby6HrNQb-3kYb6xrt8wCjVUZYxKzz9SiStfHU,89
 reconcile/dashdotdb_slo.py,sha256=PU1GzT6Uy07IIO3Y62cFfRfaBJYUPrMkMp71Up80_bg,8334
 reconcile/database_access_manager.py,sha256=Z3aAmw2LsmMIIor-bOGzziVZdVNC82Gmw8oHBUAFf-8,25577
 reconcile/deadmanssnitch.py,sha256=n-5W-djUgwzpmdDM4eQIZpkkDmHY0vndt-42LJXI4Y8,7491
-reconcile/email_sender.py,sha256=6KCJa0HV_ZRuUy3gUSB-b-oE3XBI-zxjWyiX3jXe-24,3481
+reconcile/email_sender.py,sha256=38Wvl6WHqCwlqLx4oxVJOIeDmoJsyitD3g1F4jTkAj8,4246
 reconcile/gabi_authorized_users.py,sha256=Jwvo97nzUX3NIl2VHKuZlT0-I40qk2VnACbafe91T2o,4854
-reconcile/gcr_mirror.py,sha256=KXdVlZ8EK69GeMeC4TvwnSZklbijUp4icjKOX3y8IWc,8742
-reconcile/github_org.py,sha256=4Jq7YMinWgfrTQDgewq7rhViS8fn8e65G09HiHfb9aw,13431
-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
-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/gcr_mirror.py,sha256=cdTd0CZU0qUsXJqe5k4dgpMQlyk__nyeGH0f_Cky3C0,8957
+reconcile/github_org.py,sha256=Wc5cZamatuWsW2ZJT2ib5ps8l3iY3RXHwNUxVJerqz0,14173
+reconcile/github_owners.py,sha256=viE1KJ-zaTxuZ5yItg2C263J0brn-Q-3hR_DkYDMbhY,3122
+reconcile/github_repo_invites.py,sha256=U9UCzNVwrZ7MqODtFah8ogH0NNY-XjBin7G9gqHtCUY,2690
+reconcile/github_repo_permissions_validator.py,sha256=DsM5IdEw3HvrpSRR9ZYjOLwE7QqD9cEhmFgM0QhHl5o,1784
+reconcile/github_users.py,sha256=QdX164LZrm8sqggMj-0beCzWofpS6OEBfzKNrWPrfj0,3934
+reconcile/github_validator.py,sha256=-j17tn3csFVjPMSPL3te48iWVkPZCncRXdeKeLdGjjQ,931
+reconcile/gitlab_fork_compliance.py,sha256=RbHckzLnE9zkOFHJANzoejEMMbMAivmqJVs3Suvp9lU,4591
 reconcile/gitlab_housekeeping.py,sha256=Gy1mhn33xGp9IyQFqs4VrBmhwJBD6x90XITDR_pU4MU,25416
-reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
+reconcile/gitlab_labeler.py,sha256=BA2dbXsN9hErUwJl22qcxfeH7XiPCuQ9LN3NddWdnpo,4540
 reconcile/gitlab_members.py,sha256=MUIgYDLeJx2-_vMypyq2Pa17cpKdXATYhtVACS2ghpQ,8297
-reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
-reconcile/gitlab_owners.py,sha256=qDiCe5So5IaNOQl9i2kbUryzJKMFqEy5nRaEj2sGf6A,13938
+reconcile/gitlab_mr_sqs_consumer.py,sha256=i_MDVfA3Uk_TJiNkfEJzhO6_rwR7z3I3dH9oEw686U4,2681
+reconcile/gitlab_owners.py,sha256=nIEsf3QWI3yIw_Bxy5oMaCmszTaNZDwQVaaZZxPgh4g,14447
 reconcile/gitlab_permissions.py,sha256=gSGH6gAdJbPy5Z0rQGUqiNQSHty_tXQ_3Y4OQP_8nFs,8067
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=CY7cOj5dzt2se4IOg11VQvGQ-eTvLML5Q42Z9SSgeSk,9463
@@ -94,7 +94,7 @@ reconcile/quay_mirror.py,sha256=0KtQFwrvMNtlsPJ9F_-ICaVIjgIUjFxqipvAPcvyg3Q,1533
 reconcile/quay_mirror_org.py,sha256=tXKuF6JtmaNRwu8_g_65U_Vpd6sFBYeXmJA-flVhylE,10764
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=ICAkBP8atJEZlPCniMJljb2hJAZdvSZdT1-ciLqVGl8,51560
+reconcile/queries.py,sha256=XU5ksCW6f8AmVHsg8WEAxiL4cwzLBkpvsYn9EqZ228Q,50890
 reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -179,9 +179,9 @@ reconcile/change_owners/tester.py,sha256=ijDaSbFYT8fPinhjPrRlw_TCarTTJK5nUgzHSi1
 reconcile/cluster_auth_rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/cluster_auth_rhidp/integration.py,sha256=KIAiP_XFjsOA2OE8oFJa8lD0T1a7EwOmhct2xbj7tr8,9560
 reconcile/cna/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/cna/client.py,sha256=t9gJDrKf4ApBlgu8c4QUbmzrYoSo1QPsnAGfucva2_U,1562
-reconcile/cna/integration.py,sha256=OKL4VCDEhcBqhd0KBcRugxGbfFDclsnUucEJc6Jln6c,5090
-reconcile/cna/state.py,sha256=FIF8Vqq996IKf79sVlNbpSGJcDZUp-aB9QGK7dKWkmk,4477
+reconcile/cna/client.py,sha256=32-G3fDZfVvkCN1vg0EbcsMNYBdJvXoXYI2ShFg6lbc,1586
+reconcile/cna/integration.py,sha256=dybEWkSCl7V5OC7ZQYIN2j4QV2yWstIUEQy1GpYI2oI,5106
+reconcile/cna/state.py,sha256=mJghfMGZZtyh8e6GwNNajI2AxEEJQ4e51tAgQ26zEuQ,4501
 reconcile/cna/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/cna/assets/asset.py,sha256=KWgA4fuDAEGsJwmR52WwK_YgSJMW-1cV2la3lmNf4iE,834
 reconcile/cna/assets/asset_factory.py,sha256=7T7X_J6xIsoGETqBRI45_EyIKEdQcnRPt_GAuVuLQcc,785
@@ -309,6 +309,10 @@ reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=MYYpVOc8Ze
 reconcile/gql_definitions/dynatrace_token_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/dynatrace_token_provider/dynatrace_bootstrap_tokens.py,sha256=5gTuAnR2rnx2k6Rn7FMEAzw6GCZ6F5HZbqkmJ9-3NI4,2244
 reconcile/gql_definitions/dynatrace_token_provider/token_specs.py,sha256=XGsMuB8gowRpqJjkD_KRomx-1OswzyWbF4qjVdhionk,2555
+reconcile/gql_definitions/email_sender/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+reconcile/gql_definitions/email_sender/apps.py,sha256=prqXdFkeTQ31hF2E7e9sldr3F8iklGHsPAsTx3cOkeM,1715
+reconcile/gql_definitions/email_sender/emails.py,sha256=JoEL_Urtepeho4VZGlHjrYOTImibtNtaj2va0zMaSFU,3454
+reconcile/gql_definitions/email_sender/users.py,sha256=RAqJ3QqtR0ku_mumqQ4jZkP1hFqLExleJajEu5KVhIs,1670
 reconcile/gql_definitions/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/endpoints_discovery/apps.py,sha256=aBWRAwDUJQ32ghJS4cPQcR9SNl20Fcwd3pxHDB3YJQY,3172
 reconcile/gql_definitions/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -331,6 +335,8 @@ reconcile/gql_definitions/fragments/aws_vpc_request.py,sha256=o0qUsPrFXs8GAbtgMX
 reconcile/gql_definitions/fragments/aws_vpc_request_subnet.py,sha256=qaTFT8cGzEslw51nUeb45Nfnv6kFxUm4CWrRR3xfBvA,760
 reconcile/gql_definitions/fragments/deplopy_resources.py,sha256=0u3xYqL5NpMf149BJLfPhHqAOWu06aLULdNk_2Mulxg,1089
 reconcile/gql_definitions/fragments/disable.py,sha256=Ojw98OSxcovrtmw_aAyhaVHhIa1MSUbBfKX4i2IpI74,715
+reconcile/gql_definitions/fragments/email_service.py,sha256=0wKpICsg4pcMfr2lszvnqbuPX7wVYoJ5cYFU2uQkHbY,803
+reconcile/gql_definitions/fragments/email_user.py,sha256=UOKbXXNH2Z_7ckgCeCMiBvbfs4qMMYs4PVqxSKNNmBQ,690
 reconcile/gql_definitions/fragments/jumphost_common_fields.py,sha256=FOqqDRqzPdt4ZNTRRZPFYCKE1HIa1ATF0u0NsdZzyaw,1034
 reconcile/gql_definitions/fragments/membership_source.py,sha256=rVjAIAhhAoH0_fUfltlFlGvYbvpRRAK4S6dH8OJ5hHE,1390
 reconcile/gql_definitions/fragments/minimal_ocm_organization.py,sha256=G7uEwGR2qjtXl3yUUMWAzbihNKor0jj1_fcSd9qQOjw,731
@@ -645,7 +651,7 @@ reconcile/utils/secret_reader.py,sha256=MaP56KZaAE35EyYbgAitdm6fUSxdzWeGFSOym9qi
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=DDBHfs5TT9UgjmzewiXUjbncnrPuceAZWeOA4veGa7s,843
 reconcile/utils/slack_api.py,sha256=iaOFzv3wiZRhcgYK2NB4lsG6ymNsGk2MEuj0PgZVp7w,17355
-reconcile/utils/smtp_client.py,sha256=ee8FHnCMt_uhDBJOvIfFtyutbToq-Ni5MECC_c8DXnA,2769
+reconcile/utils/smtp_client.py,sha256=0xefB4I9E5eBB-FlxFJYjvz3Kvuqi_K3Ma_Wk0NAQKM,2779
 reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41Fg,2265
 reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,16378
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
@@ -688,7 +694,7 @@ 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=JfO_14APySBPidsMvHXG-8dULNPddZCE15Umjk_aSBk,4830
-reconcile/utils/jinja2/utils.py,sha256=adxVFY4WvBGIToEEr8KwqLzp6uDxSipTBzZWwnRqbNQ,8700
+reconcile/utils/jinja2/utils.py,sha256=AQYEhrA4eEl7-tjf8KyVheSGWS3n-56K7zoJIH9IMF4,8819
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/jobcontroller/controller.py,sha256=Vh08lZuCSIIceWGSDhBB00iFwTI9eeKZW1sfHlkAvSo,15373
 reconcile/utils/jobcontroller/models.py,sha256=x9YIvWfYOOvXNKToFVx1H7qDrZb0Sa1KI_4Y0gl7rMM,6336
@@ -791,7 +797,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.dev135.dist-info/METADATA,sha256=OmObsM9l7n-M8XKiFzj-KByzt8R4NLvzOLm22SNnumM,24568
-qontract_reconcile-0.10.2.dev135.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev135.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev135.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev136.dist-info/METADATA,sha256=UzAvn2oHDRdlTZTyBA6HDVAVsDtCEsw4ubf7GYLIiI0,24568
+qontract_reconcile-0.10.2.dev136.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev136.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev136.dist-info/RECORD,,

reconcile/aws_ami_share.py

@@ -1,5 +1,6 @@
 import logging
 from collections.abc import (
+    Callable,
     Iterable,
     Mapping,
 )
@@ -37,12 +38,13 @@ def get_region(
 
 
 @defer
-def run(dry_run, defer=None):
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     accounts = queries.get_aws_accounts(sharing=True)
     sharing_accounts = filter_accounts(accounts)
     settings = queries.get_app_interface_settings()
     aws_api = AWSApi(1, sharing_accounts, settings=settings, init_users=False)
-    defer(aws_api.cleanup)
+    if defer:
+        defer(aws_api.cleanup)
 
     for src_account in sharing_accounts:
         sharing = src_account.get("sharing")

reconcile/aws_ecr_image_pull_secrets.py

@@ -1,6 +1,8 @@
 import base64
 import json
 import logging
+from collections.abc import Mapping
+from typing import Any
 
 from reconcile import queries
 from reconcile.utils.aws_api import AWSApi
@@ -9,15 +11,15 @@ from reconcile.utils.vault import VaultClient
 QONTRACT_INTEGRATION = "aws-ecr-image-pull-secrets"
 
 
-def enc_dec(data):
+def enc_dec(data: str) -> str:
     return base64.b64encode(data.encode("utf-8")).decode("utf-8")
 
 
-def get_password(token):
+def get_password(token: str) -> str:
     return base64.b64decode(token).decode("utf-8").split(":")[1]
 
 
-def construct_dockercfg_secret_data(data):
+def construct_dockercfg_secret_data(data: Mapping[str, Any]) -> dict[str, str]:
     auth_data = data["authorizationData"][0]
     server = auth_data["proxyEndpoint"]
     token = auth_data["authorizationToken"]
@@ -36,7 +38,7 @@ def construct_dockercfg_secret_data(data):
     return {".dockerconfigjson": enc_dec(json.dumps(data))}
 
 
-def construct_basic_auth_secret_data(data):
+def construct_basic_auth_secret_data(data: Mapping[str, Any]) -> dict[str, str]:
     auth_data = data["authorizationData"][0]
     token = auth_data["authorizationToken"]
     password = get_password(token)
@@ -44,17 +46,23 @@ def construct_basic_auth_secret_data(data):
     return {"user": enc_dec("AWS"), "token": enc_dec(password), "url": url}
 
 
-def write_output_to_vault(dry_run, vault_path, account, secret_data, name):
+def write_output_to_vault(
+    dry_run: bool,
+    vault_path: str,
+    account: str,
+    secret_data: Mapping[str, str],
+    name: str,
+) -> None:
     integration_name = QONTRACT_INTEGRATION
     secret_path = f"{vault_path}/{integration_name}/{account}/{name}"
     secret = {"path": secret_path, "data": secret_data}
     logging.info(["write_secret", secret_path])
     vault_client = VaultClient()
     if not dry_run:
-        vault_client.write(secret)
+        vault_client.write(secret)  # type: ignore
 
 
-def run(dry_run, vault_output_path=""):
+def run(dry_run: bool, vault_output_path: str = "") -> None:
     accounts = [a for a in queries.get_aws_accounts() if a.get("ecrs")]
     settings = queries.get_app_interface_settings()
     with AWSApi(1, accounts, settings=settings, init_ecr_auth_tokens=True) as aws:

reconcile/aws_garbage_collector.py

@@ -4,7 +4,7 @@ from reconcile.utils.aws_api import AWSApi
 QONTRACT_INTEGRATION = "aws-garbage-collector"
 
 
-def run(dry_run, thread_pool_size=10):
+def run(dry_run: bool, thread_pool_size: int = 10) -> None:
     accounts = [a for a in queries.get_aws_accounts() if a.get("garbageCollection")]
     settings = queries.get_app_interface_settings()
     with AWSApi(thread_pool_size, accounts, settings=settings) as aws:

reconcile/aws_iam_keys.py

@@ -1,28 +1,28 @@
 import logging
 import shutil
 import sys
+from collections.abc import Callable, Iterable, Mapping
 from typing import Any
 
 from reconcile import queries
 from reconcile.utils.aws_api import AWSApi
 from reconcile.utils.defer import defer
-from reconcile.utils.state import (
-    State,
-    init_state,
-)
+from reconcile.utils.state import State, init_state
 from reconcile.utils.terrascript_aws_client import TerrascriptClient as Terrascript
 
 QONTRACT_INTEGRATION = "aws-iam-keys"
 
 
-def filter_accounts(accounts, account_name):
+def filter_accounts(
+    accounts: Iterable[dict[str, Any]], account_name: str | None
+) -> list[dict[str, Any]]:
     accounts = [a for a in accounts if a.get("deleteKeys")]
     if account_name:
         accounts = [a for a in accounts if a["name"] == account_name]
     return accounts
 
 
-def get_keys_to_delete(accounts) -> dict[str, list[str]]:
+def get_keys_to_delete(accounts: Iterable[dict[str, Any]]) -> dict[str, list[str]]:
     return {
         account["name"]: account["deleteKeys"]
         for account in accounts
@@ -37,13 +37,17 @@ def should_run(state: State, keys_to_delete: dict[str, list[str]]) -> bool:
     return False
 
 
-def update_state(state: State, keys_to_update: dict[str, list[str]]):
+def update_state(state: State, keys_to_update: dict[str, list[str]]) -> None:
     for account_name, keys in keys_to_update.items():
         if state.get(account_name, []) != keys:
             state.add(account_name, keys, force=True)
 
 
-def init_tf_working_dirs(accounts, thread_pool_size, settings):
+def init_tf_working_dirs(
+    accounts: Iterable[dict[str, Any]],
+    thread_pool_size: int,
+    settings: Mapping[str, Any],
+) -> dict[str, str]:
     # copied here to avoid circular dependency
     QONTRACT_INTEGRATION = "terraform_resources"
     QONTRACT_TF_PREFIX = "qrtf"
@@ -64,19 +68,19 @@ def init_tf_working_dirs(accounts, thread_pool_size, settings):
     return ts.dump()
 
 
-def cleanup(working_dirs):
+def cleanup(working_dirs: Mapping[str, str]) -> None:
     for wd in working_dirs.values():
         shutil.rmtree(wd)
 
 
 @defer
 def run(
-    dry_run,
-    thread_pool_size=10,
-    disable_service_account_keys=False,
-    account_name=None,
-    defer=None,
-):
+    dry_run: bool,
+    thread_pool_size: int = 10,
+    disable_service_account_keys: bool = False,
+    account_name: str | None = None,
+    defer: Callable | None = None,
+) -> None:
     accounts = filter_accounts(
         queries.get_aws_accounts(terraform_state=True), account_name
     )
@@ -88,7 +92,8 @@ def run(
 
     settings = queries.get_app_interface_settings()
     state = init_state(integration=QONTRACT_INTEGRATION)
-    defer(state.cleanup)
+    if defer:
+        defer(state.cleanup)
     keys_to_delete = get_keys_to_delete(accounts)
     if not should_run(state, keys_to_delete):
         logging.debug("nothing to do here")
@@ -97,7 +102,9 @@ def run(
         return
 
     working_dirs = init_tf_working_dirs(accounts, thread_pool_size, settings)
-    defer(lambda: cleanup(working_dirs))
+    if defer:
+        defer(lambda: cleanup(working_dirs))
+
     with AWSApi(thread_pool_size, accounts, settings=settings) as aws:
         error, service_account_recycle_complete = aws.delete_keys(
             dry_run, keys_to_delete, working_dirs, disable_service_account_keys

reconcile/aws_iam_password_reset.py

@@ -1,6 +1,7 @@
 import logging
 import sys
 from collections.abc import (
+    Callable,
     Iterable,
     Mapping,
 )
@@ -44,12 +45,13 @@ class AwsAccountWithResets(BaseModel):
 
 
 @defer
-def run(dry_run, defer=None):
+def run(dry_run: bool, defer: Callable | None = None) -> None:
     accounts = queries.get_aws_accounts(reset_passwords=True)
     settings = queries.get_app_interface_settings()
     roles = queries.get_roles(aws=True, saas_files=False)
     state = init_state(integration=QONTRACT_INTEGRATION)
-    defer(state.cleanup)
+    if defer:
+        defer(state.cleanup)
 
     accounts_to_reset: list[AwsAccountWithResets] = []
 

reconcile/aws_support_cases_sos.py

@@ -1,5 +1,7 @@
 import itertools
 import logging
+from collections.abc import Callable, Iterable, Mapping
+from typing import Any
 
 from reconcile import (
     mr_client_gateway,
@@ -12,11 +14,11 @@ from reconcile.utils.mr import CreateDeleteAwsAccessKey
 QONTRACT_INTEGRATION = "aws-support-cases-sos"
 
 
-def filter_accounts(accounts):
+def filter_accounts(accounts: Iterable[dict[str, Any]]) -> list[dict[str, Any]]:
     return [a for a in accounts if a.get("premiumSupport")]
 
 
-def get_deleted_keys(accounts):
+def get_deleted_keys(accounts: Iterable[dict[str, Any]]) -> dict[str, list[str]]:
     return {
         account["name"]: account["deleteKeys"]
         for account in accounts
@@ -24,7 +26,9 @@ def get_deleted_keys(accounts):
     }
 
 
-def get_keys_to_delete(aws_support_cases):
+def get_keys_to_delete(
+    aws_support_cases: Mapping[str, Iterable[Mapping[str, Any]]],
+) -> list[dict[str, str]]:
     search_pattern = "We have become aware that the AWS Access Key "
     keys = []
     # ref:
@@ -43,10 +47,17 @@ def get_keys_to_delete(aws_support_cases):
 
 
 @defer
-def act(dry_run, gitlab_project_id, accounts, keys_to_delete, defer=None):
+def act(
+    dry_run: bool,
+    gitlab_project_id: str | None,
+    accounts: Iterable[dict[str, Any]],
+    keys_to_delete: list[dict[str, str]],
+    defer: Callable | None = None,
+) -> None:
     if not dry_run and keys_to_delete:
         mr_cli = mr_client_gateway.init(gitlab_project_id=gitlab_project_id)
-        defer(mr_cli.cleanup)
+        if defer:
+            defer(mr_cli.cleanup)
 
     for k in keys_to_delete:
         account = k["account"]
@@ -59,7 +70,9 @@ def act(dry_run, gitlab_project_id, accounts, keys_to_delete, defer=None):
             mr.submit(cli=mr_cli)
 
 
-def run(dry_run, gitlab_project_id=None, thread_pool_size=10, enable_deletion=False):
+def run(
+    dry_run: bool, gitlab_project_id: str | None = None, thread_pool_size: int = 10
+) -> None:
     accounts = filter_accounts(queries.get_aws_accounts())
     settings = queries.get_app_interface_settings()
     deleted_keys = get_deleted_keys(accounts)

reconcile/closedbox_endpoint_monitoring_base.py

@@ -63,7 +63,7 @@ class EndpointMonitoringProvider:
         return None
 
     @property
-    def metric_labels(self):
+    def metric_labels(self) -> dict[str, Any]:
         return json.loads(self.metricLabels) if self.metricLabels else {}
 
 
@@ -136,7 +136,7 @@ def run_for_provider(
     thread_pool_size: int,
     internal: bool,
     use_jump_host: bool,
-    defer=None,
+    defer: Callable | None = None,
 ) -> None:
     # prepare
     desired_endpoints = get_endpoints(provider)
@@ -152,7 +152,8 @@ def run_for_provider(
             integration_version=integration_version,
             override_managed_types=["Probe"],
         )
-        defer(oc_map.cleanup)
+        if defer:
+            defer(oc_map.cleanup)
 
         # reconcile
         for ep_mon_provider, endpoints in desired_endpoints.items():

reconcile/cna/client.py

@@ -23,7 +23,7 @@ class CNAClient:
         cnas = self._ocm_client.get(api_path="/api/cna-management/v1/cnas")
         return cnas.get("items", [])
 
-    def create(self, asset: Asset, dry_run: bool = False):
+    def create(self, asset: Asset, dry_run: bool = False) -> None:
         if dry_run:
             logging.info("CREATE %s", asset)
             return
@@ -32,7 +32,7 @@ class CNAClient:
             data=asset.api_payload(),
         )
 
-    def delete(self, asset: Asset, dry_run: bool = False):
+    def delete(self, asset: Asset, dry_run: bool = False) -> None:
         if dry_run:
             logging.info("DELETE %s", asset)
             return
@@ -41,7 +41,7 @@ class CNAClient:
                 api_path=asset.href,
             )
 
-    def update(self, asset: Asset, dry_run: bool = False):
+    def update(self, asset: Asset, dry_run: bool = False) -> None:
         if dry_run:
             logging.info("UPDATE %s", asset)
             return

reconcile/cna/integration.py

@@ -46,13 +46,13 @@ class CNAIntegration:
         namespaces: Iterable[NamespaceV1],
         desired_states: Mapping[str, State] | None = None,
         current_states: Mapping[str, State] | None = None,
-    ):
+    ) -> None:
         self._cna_clients = cna_clients
         self._namespaces = namespaces
         self._desired_states = desired_states or defaultdict(State)
         self._current_states = current_states or defaultdict(State)
 
-    def assemble_desired_states(self):
+    def assemble_desired_states(self) -> None:
         self._desired_states = defaultdict(State)
         for namespace in self._namespaces:
             for provider in namespace.external_resources or []:
@@ -64,7 +64,7 @@ class CNAIntegration:
                         asset_factory_from_schema(resource)
                     )
 
-    def assemble_current_states(self):
+    def assemble_current_states(self) -> None:
         self._current_states = defaultdict(State)
         for name, client in self._cna_clients.items():
             cnas = client.list_assets()
@@ -72,7 +72,7 @@ class CNAIntegration:
             state.add_raw_data(cnas)
             self._current_states[name] = state
 
-    def provision(self, dry_run: bool = False):
+    def provision(self, dry_run: bool = False) -> None:
         for provisioner_name, cna_client in self._cna_clients.items():
             desired_state = self._desired_states[provisioner_name]
             current_state = self._current_states[provisioner_name]
@@ -119,7 +119,6 @@ def run(
     dry_run: bool,
     # TODO: Threadpool not used yet - will be used once we understand scopes in more detail
     thread_pool_size: int,
-    defer=None,
 ) -> None:
     settings = get_app_interface_vault_settings()
     secret_reader = create_secret_reader(use_vault=settings.vault)

reconcile/cna/state.py

@@ -50,7 +50,7 @@ class State:
         # pytest should show nice diff
         return str(self._assets)
 
-    def _validate_addition(self, asset: Asset):
+    def _validate_addition(self, asset: Asset) -> None:
         if asset.kind not in self._assets:
             raise CNAStateError(f"State doesn't know asset_kind {asset.kind}")
         if asset.name in self._assets[asset.kind]:
@@ -58,11 +58,11 @@ class State:
                 f"Duplicate asset name found in state: kind={asset.kind}, name={asset.name}"
             )
 
-    def add_asset(self, asset: Asset):
+    def add_asset(self, asset: Asset) -> None:
         self._validate_addition(asset=asset)
         self._assets[asset.kind][asset.name] = asset
 
-    def add_raw_data(self, data: Iterable[Mapping[str, Any]]):
+    def add_raw_data(self, data: Iterable[Mapping[str, Any]]) -> None:
         for cna in data:
             asset = asset_factory_from_raw_data(cna)
             self._validate_addition(asset=asset)