qontract-reconcile 0.10.2.dev501__py3-none-any.whl → 0.10.2.dev502__py3-none-any.whl

{qontract_reconcile-0.10.2.dev501.dist-info → qontract_reconcile-0.10.2.dev502.dist-info}/METADATA

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

@@ -98,7 +98,7 @@ reconcile/service_dependencies.py,sha256=KydjllianL0lUwhroBAPui7jrnhHSq7j2PB6CoV
 reconcile/signalfx_endpoint_monitoring.py,sha256=Nqgsg1cflSd2nNnm89y_e8c--7xLUqTrKOHkDs-qADE,2868
 reconcile/slack_base.py,sha256=I-msunWxfgu5bSwXYulGbtLjxUB_tRmTCAUCU-3nabI,3484
 reconcile/slack_usergroups.py,sha256=C36L64wb95tf2tIqJ8T1xXmREpxHvxbhnglk0QOfUVc,30939
-reconcile/slack_usergroups_api.py,sha256=4-UJTaGcAatcJADZTfeGlEnFH1vGDc7UL9YMfnav3Mo,24713
+reconcile/slack_usergroups_api.py,sha256=_L0I1CTKVUDxbPksSlTomn4ufBFvs9jnuLsu2FQZBo8,25687
 reconcile/sql_query.py,sha256=Go_H36p3YTW4Xv-elYDxW_Fe6Q4ErFhD6eQoFh9Jylw,26424
 reconcile/status.py,sha256=h73oaSxO5sftEGqFrXVAlySBvNYPWpowDaYYplcky5A,565
 reconcile/status_board.py,sha256=iv2CR3IsX_uDY5aXHjTOySeTR5d3vsABykYNiYNjZew,15316
@@ -764,7 +764,7 @@ reconcile/utils/rosa/session.py,sha256=o7RCTazHRQbDOC_E89qYaQBiHIoj4mfcCjC6ndlA8
 reconcile/utils/runtime/__init__.py,sha256=sfk92MGfsBh9tKYHl_FH17NdEsrGBwgDFTb7KNKoIfY,107
 reconcile/utils/runtime/desired_state_diff.py,sha256=Bw4zqel-klXCMZGqD1gyh8zkFq4h5qzv8rJn7K6WTXs,8132
 reconcile/utils/runtime/environment.py,sha256=rRrj4t11R1JSQO08RcJxkQkyHhRGI8ePo-hjq9Tua1Y,2214
-reconcile/utils/runtime/integration.py,sha256=ZvaRX6huhPqlX4wX2GHVwIdoi5kJgdhXMLLlgtyrYnU,14634
+reconcile/utils/runtime/integration.py,sha256=etpSg6D9iqud3mG6UMmovBrRFBWHpjKLW6AUdlu5q5w,15172
 reconcile/utils/runtime/meta.py,sha256=M_EOxrb0KhQA4TwpHekbog2jOZqaBPVTIijXyRuMjn0,255
 reconcile/utils/runtime/runner.py,sha256=p7xCT1IDlDz6wKYMDMPOTEdztM4hbcxo0fw9gQf4q-A,9028
 reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFcnpA_k4,16142
@@ -817,7 +817,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev501.dist-info/METADATA,sha256=5KI3nXk5biUIU2VnNoJUtQz4jzIspX_1Pfp5SZoGpO4,24958
-qontract_reconcile-0.10.2.dev501.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev501.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev501.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev502.dist-info/METADATA,sha256=V4uymS3aui-wKLLPkxJciLRiD47I8KWdErfh7XLW5N4,24958
+qontract_reconcile-0.10.2.dev502.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev502.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev502.dist-info/RECORD,,

reconcile/slack_usergroups_api.py

@@ -49,6 +49,8 @@ from qontract_api_client.api.integrations.slack_usergroups_task_status import (
     asyncio as slack_usergroups_task_status,
 )
 from qontract_api_client.models import (
+    SlackUsergroupActionCreate,
+    SlackUsergroupActionUpdateMetadata,
     SlackUsergroupActionUpdateUsers,
 )
 from qontract_api_client.models.secret import Secret
@@ -614,6 +616,8 @@ class SlackUsergroupsIntegration(
         response = await reconcile_slack_usergroups(
             client=self.qontract_api_client, body=request_data
         )
+        # Always log the request id! It won't be forwarded to #reconcile channel via fluentd filter!
+        logging.info(f"request_id: {response.id}")
         return response
 
     async def async_run(self, dry_run: bool) -> None:
@@ -647,6 +651,10 @@ class SlackUsergroupsIntegration(
 
         task = await self.reconcile(workspaces=workspaces, dry_run=dry_run)
 
+        # TODO: APPSRE-13196
+        # as soon as qontract-api can send event to the #reconcile channel, we don't need to log and wait here
+        # for a non-dry-run reconciliation!
+
         # wait for task completion and get the action list
         task_result = await slack_usergroups_task_status(
             client=self.qontract_api_client, task_id=task.id, timeout=300
@@ -657,12 +665,21 @@ class SlackUsergroupsIntegration(
 
         if task_result.actions:
             for action in task_result.actions or []:
-                if isinstance(action, SlackUsergroupActionUpdateUsers):
-                    logging.info(
-                        f"{action.usergroup=} {action.users_to_add=} {action.users_to_remove=}"
-                    )
-                else:
-                    logging.info(action)
+                match action:
+                    case SlackUsergroupActionUpdateUsers():
+                        logging.info(
+                            f"{action.action_type=} {action.usergroup=} {action.users_to_add=} {action.users_to_remove=} total_users={len(action.users)}"
+                        )
+                    case SlackUsergroupActionCreate():
+                        logging.info(
+                            f"{action.action_type=} {action.usergroup=} {action.users=} {action.description=}"
+                        )
+                    case SlackUsergroupActionUpdateMetadata():
+                        logging.info(
+                            f"{action.action_type=} {action.usergroup=} {action.channels=} {action.description=}"
+                        )
+                    case _:
+                        logging.info(action)
 
         if task_result.errors:
             logging.error(f"Errors encountered: {len(task_result.errors)}")

reconcile/utils/runtime/integration.py

@@ -1,3 +1,4 @@
+import os
 from abc import (
     ABC,
     abstractmethod,
@@ -264,12 +265,23 @@ class QontractReconcileApiIntegration[RunParamsTypeVar: RunParams](ABC):
         Returns the qontract-api client.
         """
         config = get_config()
+
+        # send some envirionment specific information via headers
+        environment_headers = {}
+        if "BUILD_URL" in os.environ:
+            # e.g. https://ci.int.devshift.net/job/service-app-interface-gl-pr-check/643806/
+            environment_headers["X-Build-Url"] = os.environ["BUILD_URL"]
+        if "gitlabMergeRequestIid" in os.environ:
+            # e.g. "643806"
+            environment_headers["X-GitLab-MR-ID"] = os.environ["gitlabMergeRequestIid"]  # noqa: SIM112
+
         return AuthenticatedClient(
             base_url=urlparse(config["qontract-api"]["server"]).geturl(),
             token=config["qontract-api"].get("token", ""),
             httpx_args={
                 "event_hooks": {"response": [self._raise_on_4xx_5xx]},
             },
+            headers=environment_headers,
         )
 
     @property