qontract-reconcile 0.9.1rc132__py3-none-any.whl → 0.9.1rc133__py3-none-any.whl

{qontract_reconcile-0.9.1rc132.dist-info → qontract_reconcile-0.9.1rc133.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ reconcile/aws_iam_password_reset.py,sha256=Fequr4Zs7oARnp0rpC4B4rVfyZvl6LXZ3kaDs
 reconcile/aws_support_cases_sos.py,sha256=UJEs3lpmCioUxLu9ek2WuySCI3sYyc2dVP9zU0FIh1s,2888
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=4MrHEFUCaHDtSL8DPAo7iJgZ95Nl1HiVzNFvshAJ0_M,3552
 reconcile/checkpoint.py,sha256=figtZRuWUvdpdSnkhAqeGvO5dI02TT6J3heyeFhlwqM,5016
-reconcile/cli.py,sha256=BH6ADj_EGy3ruZ9k_W1fA9hNUC5Yehr3jYZvr8jZpOc,70745
+reconcile/cli.py,sha256=_CnhmVbwH6d97ud04cX2Y5GqxrKyMg1-pIAI3T502pM,70825
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=Yl1_BzgIQbLS6Y16W-u0I82WMcXADpIUOpfQ4J88umY,4888
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=Ca75-OQiu5HeA8Q6zQpEYuhyCSjeuWe99K4y9ipTORM,4032
@@ -87,7 +87,7 @@ reconcile/openshift_resources.py,sha256=Lkn3KdIqxUCmOzlwoKjM2xVotTbJDfgjMGySvWtB
 reconcile/openshift_resources_base.py,sha256=tWUCzZNEEOTjrl-9Fj2BUwSMt1xNyhqiqwSLBPXlZr4,40756
 reconcile/openshift_rolebindings.py,sha256=1k0o3hb3ZhhlbUjc8cP7IjKFux0oZApT8kLT8Y-pvqI,6579
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=4Ufk_dbd2ZkeAI8Q-blAgDrnXg9qqtq63LrkPNiBSZs,7857
+reconcile/openshift_saas_deploy.py,sha256=URaGXvp5C4rrQS3rgBLS-Czw5eJadByvYh1wvbENajI,8710
 reconcile/openshift_saas_deploy_change_tester.py,sha256=gdEke-uNKv1v8vuveThCn8_zEdP-BpiltS_OugqDFhg,9105
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=WARMn3elQ8TN0Z-9NKQLQZMhtSN2JO6iD3pRaaa44GY,13343
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=fbSO48dnIMPV6XKPDoPD0pEFrhHYWfZcmvQfxAwQ-Ps,2728
@@ -95,7 +95,7 @@ reconcile/openshift_saas_deploy_trigger_configs.py,sha256=uWzUV5D5CW0frdi1ys7BOb
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=Yl4lMtxqab-c04I2Ju8isAJuYuNTbHN01Bk3dF9nTos,967
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0WFPqGIJVgYkdq_UrTHcVusBzOFgMY,973
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=etfBGj7GDXTOhNHKc40ee5QM0Chq3oHE40HrbWgopc8,971
-reconcile/openshift_saas_deploy_wrapper.py,sha256=VhOYalFNOK0-szqU9W5f-kfwwobKf-8LMxoOgpiNbjk,1701
+reconcile/openshift_saas_deploy_wrapper.py,sha256=worob8HdaQ31kndkQoWXqD-wK2jAIa4IR5um6KRsyf4,1854
 reconcile/openshift_serviceaccount_tokens.py,sha256=UlBRjfAxzf9-h4uxQwHqrYnBWMUGFqqfp6KvW2lM76k,6369
 reconcile/openshift_tekton_resources.py,sha256=nSJDPqL6Rl3jeUQKS6mFIqkWPdbXu_FNCeHER8w_GyY,13552
 reconcile/openshift_upgrade_watcher.py,sha256=4LtXziBS1tGfUiioGGzx6h7ZHXdGk97DSMLNblcGmHk,4843
@@ -482,8 +482,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc132.dist-info/METADATA,sha256=TLuvu9giLnYV33cluVk3hrGVytV6lAYuznjfmdrK69w,2259
-qontract_reconcile-0.9.1rc132.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-qontract_reconcile-0.9.1rc132.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc132.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc132.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc133.dist-info/METADATA,sha256=Y6ZjvDqi2URKKdxZeGYrSJwCyJ2Xv3yYZRFNRJHCR44,2259
+qontract_reconcile-0.9.1rc133.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+qontract_reconcile-0.9.1rc133.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc133.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc133.dist-info/RECORD,,

reconcile/cli.py

@@ -1044,12 +1044,12 @@ def openshift_saas_deploy(
     run_integration(
         reconcile.openshift_saas_deploy,
         ctx.obj,
-        thread_pool_size,
-        io_dir,
-        use_jump_host,
-        saas_file_name,
-        env_name,
-        gitlab_project_id,
+        thread_pool_size=thread_pool_size,
+        io_dir=io_dir,
+        use_jump_host=use_jump_host,
+        saas_file_name=saas_file_name,
+        env_name=env_name,
+        gitlab_project_id=gitlab_project_id,
     )
 
 

reconcile/openshift_saas_deploy.py

@@ -1,5 +1,10 @@
 import logging
 import sys
+from collections.abc import Callable
+from typing import (
+    Any,
+    Optional,
+)
 
 import reconcile.jenkins_plugins as jenkins_base
 import reconcile.openshift_base as ob
@@ -16,12 +21,15 @@ from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.saasherder import SaasHerder
 from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
+from reconcile.utils.slack_api import SlackApi
 
 QONTRACT_INTEGRATION = "openshift-saas-deploy"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def compose_console_url(saas_file, saas_file_name, env_name):
+def compose_console_url(
+    saas_file: dict[str, Any], saas_file_name: str, env_name: str
+) -> str:
     pp = saas_file["pipelinesProvider"]
     pp_ns = pp["namespace"]
     pp_ns_name = pp_ns["name"]
@@ -46,7 +54,14 @@ def compose_console_url(saas_file, saas_file_name, env_name):
     )
 
 
-def slack_notify(saas_file_name, env_name, slack, ri, console_url, in_progress):
+def slack_notify(
+    saas_file_name: str,
+    env_name: str,
+    slack: SlackApi,
+    ri: ResourceInventory,
+    console_url: str,
+    in_progress: bool,
+) -> None:
     success = not ri.has_error_registered()
     if in_progress:
         icon = ":yellow_jenkins_circle:"
@@ -67,15 +82,15 @@ def slack_notify(saas_file_name, env_name, slack, ri, console_url, in_progress):
 
 @defer
 def run(
-    dry_run,
-    thread_pool_size=10,
-    io_dir="throughput/",
-    use_jump_host=True,
-    saas_file_name=None,
-    env_name=None,
-    gitlab_project_id=None,
-    defer=None,
-):
+    dry_run: bool,
+    thread_pool_size: int = 10,
+    io_dir: str = "throughput/",
+    use_jump_host: bool = True,
+    saas_file_name: Optional[str] = None,
+    env_name: Optional[str] = None,
+    gitlab_project_id: Optional[str] = None,
+    defer: Optional[Callable] = None,
+) -> None:
     all_saas_files = queries.get_saas_files()
     saas_files = queries.get_saas_files(saas_file_name, env_name)
     if not saas_files:
@@ -91,6 +106,11 @@ def run(
         saas_file = saas_files[0]
         slack_info = saas_file.get("slack")
         if slack_info:
+            if not saas_file_name or not env_name:
+                raise RuntimeError(
+                    "saas_file_name and env_name must be provided "
+                    + "when using slack notifications"
+                )
             slack = slackapi_from_slack_workspace(
                 slack_info,
                 SecretReader(queries.get_secret_reader_settings()),
@@ -99,17 +119,20 @@ def run(
             )
             ri = ResourceInventory()
             console_url = compose_console_url(saas_file, saas_file_name, env_name)
-            # deployment result notification
-            defer(
-                lambda: slack_notify(
-                    saas_file_name,
-                    env_name,
-                    slack,
-                    ri,
-                    console_url,
-                    in_progress=False,
+            if (
+                defer
+            ):  # defer is provided by the method decorator. this makes just mypy happy
+                # deployment result notification
+                defer(
+                    lambda: slack_notify(
+                        saas_file_name,
+                        env_name,
+                        slack,
+                        ri,
+                        console_url,
+                        in_progress=False,
+                    )
                 )
-            )
             # deployment start notification
             slack_notifications = slack_info.get("notifications")
             if slack_notifications and slack_notifications.get("start"):
@@ -163,7 +186,8 @@ def run(
         cluster_admin=saasherder.cluster_admin,
         use_jump_host=use_jump_host,
     )
-    defer(oc_map.cleanup)
+    if defer:  # defer is provided by the method decorator. this makes just mypy happy
+        defer(oc_map.cleanup)
     saasherder.populate_desired_state(ri)
 
     # validate that this deployment is valid

reconcile/openshift_saas_deploy_wrapper.py

@@ -1,4 +1,5 @@
 import sys
+from typing import Optional
 
 from sretoolbox.utils import threaded
 
@@ -13,8 +14,12 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
 def osd_run_wrapper(
-    diff, dry_run, available_thread_pool_size, use_jump_host, gitlab_project_id
-):
+    diff: dict[str, str],
+    dry_run: bool,
+    available_thread_pool_size: int,
+    use_jump_host: bool,
+    gitlab_project_id: Optional[str],
+) -> int:
     saas_file_name = diff["saas_file_name"]
     env_name = diff["environment"]
     exit_code = 0
@@ -33,12 +38,12 @@ def osd_run_wrapper(
 
 
 def run(
-    dry_run,
-    thread_pool_size=10,
-    io_dir="throughput/",
-    use_jump_host=True,
-    gitlab_project_id=None,
-):
+    dry_run: bool,
+    thread_pool_size: int = 10,
+    io_dir: str = "throughput/",
+    use_jump_host: bool = True,
+    gitlab_project_id: Optional[str] = None,
+) -> None:
     saas_file_owners_diffs = read_saas_file_owners_diffs(io_dir)
     if len(saas_file_owners_diffs) == 0:
         return