qontract-reconcile 0.10.1rc968__py3-none-any.whl → 0.10.1rc970__py3-none-any.whl

{qontract_reconcile-0.10.1rc968.dist-info → qontract_reconcile-0.10.1rc970.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc968
+Version: 0.10.1rc970
 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.1rc968.dist-info → qontract_reconcile-0.10.1rc970.dist-info}/RECORD

@@ -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=5joAIGOOLhHme1ipa7ZQeQkUOVe3dKbRO1wJtTwyNR4,4178
-reconcile/gitlab_housekeeping.py,sha256=1ewS9HQRK-m14Uvok8ZbSb_yn_TksMontSk3blTe7ZM,22043
+reconcile/gitlab_housekeeping.py,sha256=BjqIwA3rJQYMh-v0fr2s5L_BkFvtW4fRGHuHY5pcwf4,22099
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
 reconcile/gitlab_mr_sqs_consumer.py,sha256=O46mdziPgGOndbU-0_UJKJVUaiEoVzJPEgKm4_UvYoI,2571
@@ -113,7 +113,7 @@ reconcile/terraform_cloudflare_dns.py,sha256=NfgUqXL218D9pW6sprtUAJQlMzFHa2FXKp_
 reconcile/terraform_cloudflare_resources.py,sha256=41Mj1WkuS75slCDpmhG2GGf1nh3BwfxcdNC73-PNadc,15000
 reconcile/terraform_cloudflare_users.py,sha256=AzIhQwnJtsUh7GlZpvJE0um-_7Q6zYRxzUVJYoSU3dY,13943
 reconcile/terraform_repo.py,sha256=D6JFKLLJbsMHcIG3--oUNeuQteXqT6E5tJ18qzb9YXM,16218
-reconcile/terraform_resources.py,sha256=HmTrDTpPbWOvvyPdEM7bXbLPsTS8Tcg1mPu8nZTvAlE,19288
+reconcile/terraform_resources.py,sha256=4X1x4eUQfZjgRu75-_T53tmOCCXf3WONA91Ti0ZAIcs,19288
 reconcile/terraform_tgw_attachments.py,sha256=dhtqrckfB3CN90PnrKAepPFRzFB0Ecoh1vk3IkpZ2uE,18657
 reconcile/terraform_users.py,sha256=HqSm3ev3b8dZ9J6F_phDZB-FQsnlsdeKp9RPoY1cU94,10188
 reconcile/terraform_vpc_peerings.py,sha256=WhGvDHwllM36yTJPE5EzQ1Z0Oc-tT9ksXbBn5cpFBBg,27676
@@ -637,7 +637,7 @@ reconcile/unleash_feature_toggles/integration.py,sha256=FLSgqSobefNUWH5ZWpTizbNe
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=sNWCJdoXAkBpER5HTy8wisER8fZ7CN5_ymowGB54PVE,3364
 reconcile/utils/amtool.py,sha256=ngtBuVPETH6oAy5RnKzvreVbjwQCaATS_PYYwBprzjQ,2288
-reconcile/utils/aws_api.py,sha256=_kMmCuEg9WpszAtR6XNzbNl7wROffCbM2Ox5qCkA640,66091
+reconcile/utils/aws_api.py,sha256=50U9jeWVWHozJcWUuI3cJdmDrNjWjdeK0uLPGmSvvR4,66133
 reconcile/utils/aws_helper.py,sha256=MDbv5jrNdqqJ5pfBxniGdJXBBO_EYc2_Uf2w9ZzeMNs,2854
 reconcile/utils/batches.py,sha256=TtEm64a8lWhFuNbUVpFEmXVdU2Q0sTBrP_I0Cjbgh7g,320
 reconcile/utils/binary.py,sha256=L27rEhEtIxczw0x2mNdDvRGDIw5clW3dCx9yz32h0FU,2294
@@ -709,7 +709,7 @@ reconcile/utils/sqs_gateway.py,sha256=RiIfkBuGC15Q2178caG1_5hg53gY6QdRL1tWbK3FOM
 reconcile/utils/state.py,sha256=sJbfxvSTnHlHfgQRc_vRz-U_9NnVFGq-W8DX3ZHkfeY,16352
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=hyMtNVBuDHbqQNSsdG5kTIvJRyOt23tFuWAspPf_Lqo,32161
+reconcile/utils/terraform_client.py,sha256=hbEwwoUOkKR2qv9MdsiPZWxx8wnu63nbnnIhGYmUnls,31784
 reconcile/utils/terrascript_aws_client.py,sha256=i0ubNIacvKv4pvWfXoO4mkAJumED3DCTgCD8n7TlFXA,276720
 reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8uM1ccjWaiXxiV8,4895
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -851,8 +851,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.1rc968.dist-info/METADATA,sha256=9_cctR46UDeQ8KvizoJx12uh1u7_W-xYEprAgQpq_DQ,2262
-qontract_reconcile-0.10.1rc968.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc968.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc968.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc968.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc970.dist-info/METADATA,sha256=J24BLwq4hq7Kmnhuevwim4xtUXN3duD8qWv72Cl6PUM,2262
+qontract_reconcile-0.10.1rc970.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc970.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc970.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc970.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -98,7 +98,7 @@ merge_requests_waiting = Gauge(
 gitlab_token_expiration = Gauge(
     name="qontract_reconcile_gitlab_token_expiration_days",
     documentation="Time until personal access tokens expire",
-    labelnames=["name"],
+    labelnames=["name", "active"],
 )
 
 
@@ -559,7 +559,9 @@ def publish_access_token_expiration_metrics(gl: GitLabApi) -> None:
     for pat in pats:
         expiration_date = datetime.strptime(pat.expires_at, EXPIRATION_DATE_FORMAT)
         days_until_expiration = expiration_date.date() - datetime.now(UTC).date()
-        gitlab_token_expiration.labels(pat.name).set(days_until_expiration.days)
+        gitlab_token_expiration.labels(name=pat.name, active=pat.active).set(
+            days_until_expiration.days
+        )
 
 
 def run(dry_run, wait_for_pipeline):

reconcile/terraform_resources.py

@@ -66,7 +66,7 @@ from reconcile.utils.vault import (
 )
 
 QONTRACT_INTEGRATION = "terraform_resources"
-QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 4)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 5, 5)
 QONTRACT_TF_PREFIX = "qrtf"
 
 

reconcile/utils/aws_api.py

@@ -1621,7 +1621,9 @@ class AWSApi:  # pylint: disable=too-many-public-methods
 
         rds = self._account_rds_client(account_name, **optional_kwargs)
         response = rds.describe_db_engine_versions(
-            Engine=engine, EngineVersion=engine_version
+            Engine=engine,
+            EngineVersion=engine_version,
+            IncludeAll=True,
         )
 
         if versions := response["DBEngineVersions"]:

reconcile/utils/terraform_client.py

@@ -762,13 +762,6 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             valid_upgrade_target = self._aws_api.get_db_valid_upgrade_target(
                 account_name, engine, before_version, region_name=region_name
             )
-            if not valid_upgrade_target:
-                # valid_upgrade_target can be empty when current version is no longer supported by AWS.
-                # In this case, we can't validate it, so skip.
-                logging.warning(
-                    f"No valid upgrade target available, skip validation for {resource_name}."
-                )
-                return
             target = next(
                 (
                     t