qontract-reconcile 0.10.1rc1083__py3-none-any.whl → 0.10.1rc1085__py3-none-any.whl

{qontract_reconcile-0.10.1rc1083.dist-info → qontract_reconcile-0.10.1rc1085.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1083
+Version: 0.10.1rc1085
 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.1rc1083.dist-info → qontract_reconcile-0.10.1rc1085.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=fgmR_Q-RHchGhYky-Q78f0Wzx4xQ_mk8-0mpDgfFsMI,22193
+reconcile/gitlab_housekeeping.py,sha256=S5sDsGbCBqP4_1af2fgeuR9YkdlkC3mNd--5SfUNe9c,22363
 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
@@ -819,7 +819,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 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=qYnVoBydM0lMMW0J4xvMWFi6kBZzpvguqEbQgm2c1QM,85683
+reconcile/utils/saasherder/saasherder.py,sha256=6JE3WfpJKuAN1fdRKJb04L4zMfFHq5vdEwxLWt6yn64,85894
 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
@@ -870,8 +870,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.1rc1083.dist-info/METADATA,sha256=sA9ZtmEWYJHRfuBkfV9bkRULVM1ywEHcwa7akplQY2U,2213
-qontract_reconcile-0.10.1rc1083.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1083.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1083.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1083.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1085.dist-info/METADATA,sha256=rFWbl2gk-5OsdTryaCSZixYUHz3SoF6cg34GaSVPCvM,2213
+qontract_reconcile-0.10.1rc1085.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1085.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1085.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1085.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -563,6 +563,9 @@ def publish_access_token_expiration_metrics(gl: GitLabApi) -> None:
         gitlab_token_expiration.labels(name=pat.name, active=pat.active).set(
             days_until_expiration.days
         )
+        # ensure that inactive tokens no longer send out alerts
+        if not pat.active:
+            gitlab_token_expiration.labels(name=pat.name, active=True).clear()
 
 
 def run(dry_run, wait_for_pipeline):

reconcile/utils/saasherder/saasherder.py

@@ -251,7 +251,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 valid_app_names.add(saas_file.app.parent_app.name)
             if target.namespace.app.name not in valid_app_names:
                 logging.error(
-                    f"[{saas_file.name}] targets must be within app(s) {valid_app_names}"
+                    f"[{saas_file.name}] all targets (i.e., namespaces that you deploy to) within the saas file '{saas_file.name}' must belong to app(s) {valid_app_names}. However, your saas file also deploys to namespace '{target.namespace.name}' which belongs to app '{target.namespace.app.name}'."
                 )
                 self.valid = False