gitops 0.13.2__tar.gz → 0.14.1__tar.gz

{gitops-0.13.2 → gitops-0.14.1}/.github/workflows/release-please.yaml

@@ -38,11 +38,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Publish Helm charts
-        uses: helm/chart-releaser-action@v1.6.0
+        uses: stefanprodan/helm-gh-pages@master
         with:
-          charts_dir: charts/gitops
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          token: ${{ secrets.GITHUB_TOKEN }}
+
   publish_to_pypi:
     name: Publishes tag to pypi
     runs-on: ubuntu-latest
@@ -72,11 +71,11 @@ jobs:
       SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
     #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
     with:
-      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
+      aws-iam-role-arn: "arn:aws:iam::610829907584:role/default-github-actions-ci-role"
       docker-enabled: true
       docker-context: "."
       docker-tag: "${{ needs.release-please.outputs.server-version }}"
       docker-tag-latest: true
       docker-image-platforms: linux/amd64
-      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      docker-repository: "610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
       command: echo $SECRET_ENV | base64 -d > cluster.key

{gitops-0.13.2 → gitops-0.14.1}/.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: Test
 on:
   push:
     branches:
-    - develop
+      - develop
   pull_request: ~
 
 permissions:
@@ -31,13 +31,11 @@ jobs:
       SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
     #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
     with:
-      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
+      aws-iam-role-arn: "arn:aws:iam::610829907584:role/default-github-actions-ci-role"
       docker-enabled: true
       docker-context: "."
       docker-prefix: test
       docker-tag-latest: false
       docker-image-platforms: linux/amd64
-      docker-push: false
-      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
+      docker-repository: "610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
       command: echo $SECRET_ENV | base64 -d > cluster.key
-

gitops-0.14.1/.release-please-manifest.json

@@ -0,0 +1,5 @@
+{
+    ".": "0.14.1",
+    "gitops_server": "0.15.1",
+    "charts/gitops": "0.13.2"
+}

{gitops-0.13.2 → gitops-0.14.1}/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.14.1](https://github.com/uptick/gitops/compare/cli-v0.14.0...cli-v0.14.1) (2024-12-06)
+
+
+### Bug Fixes
+
+* change charts directory for helm ci ([105357a](https://github.com/uptick/gitops/commit/105357a831f9efdf4f743fc5abc7937aa0d266f0))
+* revert our helm chart publisher action ([3f558d8](https://github.com/uptick/gitops/commit/3f558d85d631e3384a2417a20fd32f25a94fc13e))
+
+## [0.14.0](https://github.com/uptick/gitops/compare/cli-v0.13.2...cli-v0.14.0) (2024-12-06)
+
+
+### Features
+
+* **server:** add an updating emoji during deployments ([002d160](https://github.com/uptick/gitops/commit/002d160daa4a90ebf158cd3e0fc224cb3854baba))
+
 ## [0.13.2](https://github.com/uptick/gitops/compare/cli-v0.13.1...cli-v0.13.2) (2024-12-05)
 
 

{gitops-0.13.2 → gitops-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: gitops
-Version: 0.13.2
+Version: 0.14.1
 Summary: Manage multiple apps across one or more k8s clusters.
 Author-email: Jarek Głowacki <jarekwg@gmail.com>
 Requires-Python: >=3.12
@@ -17,6 +17,7 @@ Requires-Dist: fastapi==0.109.2; extra == 'server'
 Requires-Dist: httpx<0.24.0,>=0.23.0; extra == 'server'
 Requires-Dist: kubernetes-asyncio>=25.1.2; extra == 'server'
 Requires-Dist: sentry-sdk>=1.3.0; extra == 'server'
+Requires-Dist: slack-sdk>=3.33.5; extra == 'server'
 Requires-Dist: uptick-observability[fastapi]>=0.2.2; extra == 'server'
 Requires-Dist: uvicorn>=0.17.6; extra == 'server'
 Description-Content-Type: text/markdown

{gitops-0.13.2/charts/gitops → gitops-0.14.1}/charts/gitops/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.13.2](https://github.com/uptick/gitops/compare/helm-v0.13.1...helm-v0.13.2) (2024-12-06)
+
+
+### Bug Fixes
+
+* change charts directory for helm ci ([105357a](https://github.com/uptick/gitops/commit/105357a831f9efdf4f743fc5abc7937aa0d266f0))
+* revert our helm chart publisher action ([3f558d8](https://github.com/uptick/gitops/commit/3f558d85d631e3384a2417a20fd32f25a94fc13e))
+
+## [0.13.1](https://github.com/uptick/gitops/compare/helm-v0.13.0...helm-v0.13.1) (2024-12-06)
+
+
+### Bug Fixes
+
+* add more memory to gitops ([3ca722f](https://github.com/uptick/gitops/commit/3ca722f1f1e03131979a4de66e17f23052a14c24))
+
 ## [0.13.0](https://github.com/uptick/gitops/compare/helm-v0.12.1...helm-v0.13.0) (2024-11-15)
 
 

{gitops-0.13.2 → gitops-0.14.1}/charts/gitops/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: GitOps Server Helm chart.
 name: gitops
-version: 0.13.0
+version: 0.13.2

{gitops-0.13.2 → gitops-0.14.1}/charts/gitops/templates/deployment.yml

@@ -39,18 +39,14 @@ spec:
         - containerPort: 8000
         resources:
           requests:
-            memory: "200Mi"
+            memory: "750Mi"
           limits:
-            memory: "1000Mi"
+            memory: "1500Mi"
+
         envFrom:
         - configMapRef:
             name: {{ .Release.Name }}-environment
         env:
-          - name: SLACK_URL
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Release.Name }}-secret
-                key: SLACK_URL
           - name: SLACK_TOKEN
             valueFrom:
               secretKeyRef:

{gitops-0.13.2 → gitops-0.14.1}/charts/gitops/values.yaml

@@ -7,10 +7,11 @@ environment:
   CLUSTER_NAME: "test"
   # Specify the timezone for logging purposes. EG: Australia/Melbourne
   TZ: "UTC"
+  # The channel id to send slack messages to
+  SLACK_CHANNEL_ID: ""
 
 secrets:
   ACCOUNT_ID: ""
-  SLACK_URL: ""
   SLACK_TOKEN: ""
   GITHUB_OAUTH_TOKEN: ""
   GITHUB_WEBHOOK_KEY: ""

{gitops-0.13.2 → gitops-0.14.1}/gitops/__init__.py

@@ -6,7 +6,7 @@ from gitops.utils.apps import App, get_app_details, get_apps
 
 from .utils.cli import success, warning
 
-__version__ = "0.13.2"
+__version__ = "0.14.1"
 
 
 # Checking gitops version matches cluster repo version.

{gitops-0.13.2 → gitops-0.14.1}/gitops/common/app.py

@@ -79,7 +79,10 @@ class App:
         def encode(value: str) -> str:
             return b64encode(str(value).encode()).decode() if self.encode_secrets else value
 
-        values = {**deployments, "secrets": {**{k: encode(v) for k, v in secrets.items()}}}
+        values = {
+            **deployments,
+            "secrets": {**{k: encode(v) for k, v in secrets.items()}},
+        }
 
         image = self._make_image(deployments)
         if image:
@@ -101,7 +104,7 @@ class App:
 
     @property
     def image(self) -> str:
-        """[305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:yoink-9f03ac80f3]"""
+        """[610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:yoink-9f03ac80f3]"""
         image = self.values.get("image", "")
         if isinstance(image, dict):
             return f"{image['repository']}:{image.get('tag','latest')}"
@@ -110,23 +113,23 @@ class App:
 
     @property
     def image_repository_name(self) -> str:
-        """305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/[uptick]:yoink-9f03ac80f3"""
+        """610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/[uptick]:yoink-9f03ac80f3"""
         return self.image.split(":")[0].split("/")[-1]
 
     @property
     def image_repository(self) -> str:
-        """[305686791668.dkr.ecr.ap-southeast-2.amazonaws.com]/uptick:yoink-9f03ac80f3"""
+        """[610829907584.dkr.ecr.ap-southeast-2.amazonaws.com]/uptick:yoink-9f03ac80f3"""
         return self.image.split("/")[0]
 
     @property
     def image_tag(self) -> str:
-        """305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink-9f03ac80f3]"""
+        """610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink-9f03ac80f3]"""
         return self.image.split(":")[-1]
 
     @property
     def image_prefix(self) -> str:
         """Gets the image prefix portion of {prefix}-{git hash}
-        305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink]-9f03ac80f3
+        610829907584.dkr.ecr.ap-southeast-2.amazonaws.com/uptick:[yoink]-9f03ac80f3
 
         eg: qa-server-12345 -> qa-server
         """

{gitops-0.13.2 → gitops-0.14.1}/gitops/utils/images.py

@@ -28,7 +28,7 @@ def get_image(tag: str) -> str:
 def get_latest_image(repository_name: str, prefix: str, ecr_repository: str | None = None) -> str | None:  # noqa:C901
     """Finds latest image in ECR with the given prefix and returns the image tag
 
-    param ecr_repository is expected in this format: 305686791668.dkr.ecr.ap-southeast-2.amazonaws.com
+    param ecr_repository is expected in this format: 610829907584.dkr.ecr.ap-southeast-2.amazonaws.com
     """
     describe_image_args = {}
     region_name = None

{gitops-0.13.2/gitops_server → gitops-0.14.1}/gitops_server/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.15.1](https://github.com/uptick/gitops/compare/server-v0.15.0...server-v0.15.1) (2024-12-06)
+
+
+### Bug Fixes
+
+* deploy new gitops fix ([4994131](https://github.com/uptick/gitops/commit/49941316d85f320a77a3abf9f08970871f2fd3dc))
+
+## [0.15.0](https://github.com/uptick/gitops/compare/server-v0.14.0...server-v0.15.0) (2024-12-06)
+
+
+### Features
+
+* **server:** add an updating emoji during deployments ([002d160](https://github.com/uptick/gitops/commit/002d160daa4a90ebf158cd3e0fc224cb3854baba))
+
 ## [0.14.0](https://github.com/uptick/gitops/compare/server-v0.13.0...server-v0.14.0) (2024-11-26)
 
 

gitops-0.14.1/gitops_server/settings.py

@@ -0,0 +1,15 @@
+import os
+
+CLUSTER_NAME = os.getenv("CLUSTER_NAME", "")
+# Namespace to search/deploy into
+CLUSTER_NAMESPACE = os.getenv("CLUSTER_NAMESPACE", "")
+ACCOUNT_ID = os.getenv("ACCOUNT_ID", "")
+GITHUB_WEBHOOK_KEY = os.getenv("GITHUB_WEBHOOK_KEY", "")
+
+SLACK_API_USERS_URL = os.environ.get("SLACK_API_USERS_URL", "https://slack.com/api/users.list")
+SLACK_TOKEN = os.environ.get("SLACK_TOKEN")
+# The slack channel ID starts with C
+SLACK_CHANNEL_ID = os.environ.get("SLACK_CHANNEL_ID", "")
+
+# How many parallel deploys can be done at once
+GITOPS_MAX_PARALLEL_DEPLOYS = os.environ.get("GITOPS_MAX_PARALLEL_DEPLOYS", "5")

{gitops-0.13.2 → gitops-0.14.1}/gitops_server/utils/slack.py

@@ -1,15 +1,14 @@
 import dataclasses
 import logging
-import os
 from collections.abc import Iterable
 
 import httpx
+import slack_sdk
 
-logger = logging.getLogger("gitops")
+from gitops_server import settings
 
-SLACK_URL = os.environ.get("SLACK_URL")
-SLACK_API_USERS_URL = os.environ.get("SLACK_API_USERS_URL", "https://slack.com/api/users.list")
-SLACK_TOKEN = os.environ.get("SLACK_TOKEN")
+logger = logging.getLogger("gitops")
+client = slack_sdk.WebClient(token=settings.SLACK_TOKEN)
 
 
 @dataclasses.dataclass
@@ -28,31 +27,43 @@ class SlackGroup(SlackUser):
         return f"<!subteam^{self.id}|{self.name}>"
 
 
-async def post(message: str) -> None:
-    """Post a message to a slack channel
+async def post(message: str) -> str | None:
+    """Post a message to a slack channel"""
+    logger.info("POSTING TO SLACK")
+    if settings.SLACK_TOKEN and settings.SLACK_CHANNEL_ID:
+        response = client.chat_postMessage(channel=settings.SLACK_CHANNEL_ID, text=message)
+        if response.status_code >= 300:
+            logger.warning("Failed to post a message to slack (see below):")
+            logger.error(f"{message}", exc_info=True)
+        else:
+            return response.data["ts"]  # type: ignore
+    return None
+
 
-    Uses the environment variable `SLACK_URL` to know which channel to post to.
-    This URL is obtained by registering an integration with Slack.
+async def update(*, ts: str, message: str) -> str | None:
+    """Update an existing  message to a slack channel
+
+    https://api.slack.com/methods/chat.update
     """
-    logger.info("POSTING TO SLACK")
-    data = {"text": message}
-    async with httpx.AsyncClient() as client:
-        if SLACK_URL:
-            response = await client.post(SLACK_URL, json=data)
-            if response.status_code >= 300:
-                logger.warning("Failed to post a message to slack (see below):")
-                logger.error(f"{message}", exc_info=True)
+    if settings.SLACK_TOKEN and settings.SLACK_CHANNEL_ID:
+        response = client.chat_update(channel=settings.SLACK_CHANNEL_ID, ts=ts, text=message)
+        if response.status_code >= 300:
+            logger.warning("Failed to post a message to slack (see below):")
+            logger.error(f"{message}", exc_info=True)
+        else:
+            return response.data["ts"]  # type: ignore
+    return None
 
 
 async def find_commiter_slack_user(name: str, email: str) -> SlackUser | None:
     """Find a slack user by name or email using the slack API"""
-    if not SLACK_TOKEN:
+    if not settings.SLACK_TOKEN:
         return None
 
     async with httpx.AsyncClient() as client:
         response = await client.get(
-            f"{SLACK_API_USERS_URL}?limit=5&pretty=1",
-            headers={"Authorization": f"Bearer {SLACK_TOKEN}"},
+            f"{settings.SLACK_API_USERS_URL}?limit=5&pretty=1",
+            headers={"Authorization": f"Bearer {settings.SLACK_TOKEN}"},
             params={"name": name, "email": email},
         )
         data = response.json()

{gitops-0.13.2 → gitops-0.14.1}/gitops_server/workers/deployer/deploy.py

@@ -5,6 +5,7 @@ import os
 import tempfile
 import time
 import uuid
+from typing import Any
 
 from opentelemetry import trace
 
@@ -21,38 +22,9 @@ tracer = trace.get_tracer(__name__)
 BASE_REPO_DIR = "/var/gitops/repos"
 ROLE_ARN = f"arn:aws:iam::{settings.ACCOUNT_ID}:role/GitopsAccess"
 logger = logging.getLogger("gitops")
-GITOPS_MAX_PARALLEL_DEPLOYS = os.environ.get("GITOPS_MAX_PARALLEL_DEPLOYS", "5")
 MAX_HELM_HISTORY = 3
 
 
-@tracer.start_as_current_span("post_init_summary")
-async def post_init_summary(source, username, added_apps, updated_apps, removed_apps, commit_message):
-    deltas = ""
-    for typ, d in [("Adding", added_apps), ("Updating", updated_apps), ("Removing", removed_apps)]:
-        if d:
-            deltas += f"\n\t• {typ}: {', '.join(f'`{app}`' for app in sorted(d))}"
-    await slack.post(
-        f"A deployment from `{source}` has been initiated by *{username}* for cluster"
-        f" `{settings.CLUSTER_NAME}`, the following apps will be updated:{deltas}\nCommit Message:"
-        f" {commit_message}"
-    )
-
-
-@tracer.start_as_current_span("post_result")
-async def post_result(app: App, result: UpdateAppResult, deployer: "Deployer", **kwargs):
-    if result["exit_code"] != 0:
-        deploy_result = await handle_failed_deploy(app, result, deployer, **kwargs)
-        message = (
-            deploy_result["slack_message"]
-            or f"Failed to deploy app `{result['app_name']}` for cluster `{settings.CLUSTER_NAME}`:\n>>>{result['output']}"
-        )
-
-        await slack.post(message)
-
-    else:
-        await handle_successful_deploy(app, result, deployer)
-
-
 @tracer.start_as_current_span("post_result_summary")
 async def post_result_summary(source: str, results: list[UpdateAppResult]):
     n_success = sum([r["exit_code"] == 0 for r in results])
@@ -91,7 +63,13 @@ class Deployer:
         self.skip_migrations = skip_migrations
         # Max parallel helm installs at a time
         # Kube api may rate limit otherwise
-        self.semaphore = asyncio.Semaphore(int(GITOPS_MAX_PARALLEL_DEPLOYS))
+        self.semaphore = asyncio.Semaphore(int(settings.GITOPS_MAX_PARALLEL_DEPLOYS))
+
+        # Track which ones we've deployed and which ones failed
+        self.successful_apps: set[str] = set()
+        self.failed_apps: set[str] = set()
+
+        self.post_ts: str | None = None
 
     @classmethod
     async def from_push_event(cls, push_event):
@@ -116,35 +94,28 @@ class Deployer:
         )
 
     async def deploy(self):
-        added_apps, updated_apps, removed_apps = self.calculate_app_deltas()
+        self.added_apps, self.updated_apps, self.removed_apps = self.calculate_app_deltas()
         current_span = trace.get_current_span()
         if current_span:
-            current_span.set_attribute("gitops.added_apps", len(added_apps))
-            current_span.set_attribute("gitops.updated_aps", len(updated_apps))
-            current_span.set_attribute("gitops.removed_app", len(removed_apps))
-        if not (added_apps | updated_apps | removed_apps):
+            current_span.set_attribute("gitops.added_apps", len(self.added_apps))
+            current_span.set_attribute("gitops.updated_aps", len(self.updated_apps))
+            current_span.set_attribute("gitops.removed_app", len(self.removed_apps))
+        if not (self.added_apps | self.updated_apps | self.removed_apps):
             logger.info("No deltas; aborting.")
             return
         logger.info(
-            f"Running deployment for these deltas: A{list(added_apps)}, U{list(updated_apps)},"
-            f" R{list(removed_apps)}"
-        )
-        await post_init_summary(
-            source=self.current_app_definitions.name,
-            username=self.author_name,
-            added_apps=added_apps,
-            updated_apps=updated_apps,
-            removed_apps=removed_apps,
-            commit_message=self.commit_message,
+            f"Running deployment for these deltas: A{list(self.added_apps)}, U{list(self.updated_apps)},"
+            f" R{list(self.removed_apps)}"
         )
+        await self.post_deploy_summary()
         update_results = await asyncio.gather(
             *[
                 self.update_app_deployment(self.current_app_definitions.apps[app_name])
-                for app_name in (added_apps | updated_apps)
+                for app_name in (self.added_apps | self.updated_apps)
             ]
         )
         uninstall_results = await asyncio.gather(
-            *[self.uninstall_app(self.previous_app_definitions.apps[app_name]) for app_name in removed_apps]
+            *[self.uninstall_app(self.previous_app_definitions.apps[app_name]) for app_name in self.removed_apps]
         )
         await post_result_summary(self.current_app_definitions.name, update_results + uninstall_results)
 
@@ -155,7 +126,7 @@ class Deployer:
                 result = await run(f"helm uninstall {app.name} -n {app.namespace}", suppress_errors=True)
                 if result:
                     update_result = UpdateAppResult(app_name=app.name, slack_message="", **result)
-                await post_result(
+                await self.post_result(
                     app=app,
                     result=update_result,
                     deployer=self,
@@ -163,13 +134,12 @@ class Deployer:
             return update_result
 
     async def update_app_deployment(self, app: App) -> UpdateAppResult | None:
-        with tracer.start_as_current_span("update_app_deployment", attributes={"app": app.name}) as span:
-            app.set_value("deployment.labels.gitops/deploy_id", self.deploy_id)
-            app.set_value("deployment.labels.gitops/status", github.STATUSES.in_progress)
-            if github_deployment_url := app.values.get("github/deployment_url"):
-                app.set_value("deployment.annotations.github/deployment_url", github_deployment_url)
-
-            async with self.semaphore:
+        app.set_value("deployment.labels.gitops/deploy_id", self.deploy_id)
+        app.set_value("deployment.labels.gitops/status", github.STATUSES.in_progress)
+        if github_deployment_url := app.values.get("github/deployment_url"):
+            app.set_value("deployment.annotations.github/deployment_url", github_deployment_url)
+        async with self.semaphore:
+            with tracer.start_as_current_span("update_app_deployment", attributes={"app": app.name}) as span:
                 logger.info(f"Deploying app {app.name!r}.")
                 from_timestamp = time.time()
                 if app.chart.type == "git":
@@ -226,10 +196,10 @@ class Deployer:
 
                 update_result = UpdateAppResult(app_name=app.name, slack_message="", **result)
 
-                await post_result(app=app, result=update_result, deployer=self, from_timestamp=from_timestamp)
+                await self.post_result(app=app, result=update_result, deployer=self, from_timestamp=from_timestamp)
             return update_result
 
-    def calculate_app_deltas(self):
+    def calculate_app_deltas(self) -> tuple[set[str], set[str], set[str]]:
         cur = self.current_app_definitions.apps.keys()
         prev = self.previous_app_definitions.apps.keys()
 
@@ -237,7 +207,7 @@ class Deployer:
         common = cur & prev
         removed = prev - cur
 
-        updated = set()
+        updated: set[str] = set()
         for app_name in common:
             cur_app = self.current_app_definitions.apps[app_name]
             prev_app = self.previous_app_definitions.apps[app_name]
@@ -247,3 +217,50 @@ class Deployer:
                     continue
                 updated.add(app_name)
         return added, updated, removed
+
+    @tracer.start_as_current_span("post_result")
+    async def post_result(self, app: App, result: UpdateAppResult, deployer: "Deployer", **kwargs: Any) -> None:
+        if result["exit_code"] != 0:
+            self.failed_apps.add(app.name)
+            deploy_result = await handle_failed_deploy(app, result, deployer, **kwargs)
+            message = (
+                deploy_result["slack_message"]
+                or f"Failed to deploy app `{result['app_name']}` for cluster `{settings.CLUSTER_NAME}`:\n>>>{result['output']}"
+            )
+            await slack.post(message)
+        else:
+            self.successful_apps.add(app.name)
+            await handle_successful_deploy(app, result, deployer)
+
+        # TODO: Fix this in the future. We want to update the message with the latest status.
+        # But we can't because of the messge length (when messaging > 4000 characters)
+        # We need to figure out a better way to update the current status (especially when it is split over multiple messages)
+        # Maybe a grafana dashboard? Or maybe a count / eta...
+
+        # await self.post_deploy_summary()
+
+    @tracer.start_as_current_span("post_init_summary")
+    async def post_deploy_summary(self) -> None:
+        def get_app_formatted(app: str) -> str:
+            if app in self.successful_apps:
+                return f":tick: `{app}`"
+            elif app in self.failed_apps:
+                return f":x: `{app}`"
+            else:
+                return f"`{app}`"
+
+        deltas = ""
+        for typ, d in [("Adding", self.added_apps), ("Updating", self.updated_apps), ("Removing", self.removed_apps)]:
+            if d:
+                deltas += f"\n\t• {typ}: {', '.join(get_app_formatted(app) for app in sorted(d))}"
+
+        message = (
+            f"A deployment from `{self.current_app_definitions.name}` has been initiated by *{self.author_email}* for cluster"
+            f" `{settings.CLUSTER_NAME}`, the following apps will be updated:{deltas}\nCommit Message:"
+            f" {self.commit_message}"
+        )
+        # We have a problem here; we can't update a message if it is > 4000 characters long.
+        if not self.post_ts:
+            self.post_ts = await slack.post(message=message)
+        else:
+            await slack.update(ts=self.post_ts, message=message)

{gitops-0.13.2 → gitops-0.14.1}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "gitops"
-version = "0.13.2"
+version = "0.14.1"
 description = "Manage multiple apps across one or more k8s clusters."
 requires-python = ">=3.12"
 readme = "README.md"
@@ -29,6 +29,7 @@ server = [
     "kubernetes_asyncio>=25.1.2",
     "sentry-sdk>=1.3.0",
     "uptick-observability[fastapi]>=0.2.2",
+    "slack-sdk>=3.33.5",
 ]
 
 [build-system]

{gitops-0.13.2 → gitops-0.14.1}/release-please-config.json

@@ -13,7 +13,7 @@
       "gitops_server": {
         "package-name": "server",
         "release-type": "python",
-        "changelog-path": "gitops_server/CHANGELOG.md",
+        "changelog-path": "CHANGELOG.md",
         "extra-files": [
             {
               "type": "yaml",
@@ -25,7 +25,7 @@
       "charts/gitops": {
         "package-name": "helm",
         "release-type": "helm",
-        "changelog-path": "charts/gitops/CHANGELOG.md"
+        "changelog-path": "CHANGELOG.md"
       }
     }
 }

{gitops-0.13.2 → gitops-0.14.1}/secrets.example.env

@@ -1,4 +1,4 @@
-SLACK_URL=
 GITHUB_OAUTH_TOKEN=
 GITHUB_WEBHOOK_KEY=
 GIT_CRYPT_KEY_FILE=
+SLACK_CHANNEL_ID=

{gitops-0.13.2 → gitops-0.14.1}/tests/test_deploy.py

@@ -41,19 +41,9 @@ class TestDeploy:
             run_mock.call_args_list[3][0][0],
         )
         assert post_mock.call_count == 2
-        check_in_run_mock = [
-            (0, "mock-repo"),
-            (0, "Author Fullname"),
-            (0, "sample-app-1"),
-            (0, "sample-app-2"),
-            (1, "2 succeeded"),
-            (1, "0 failed"),
-        ]
-        for where, check in check_in_run_mock:
-            assert check in post_mock.call_args_list[where][0][0]
 
     @patch("gitops_server.workers.deployer.deploy.run")
-    @patch("gitops_server.workers.deployer.deploy.post_result")
+    @patch("gitops_server.workers.deployer.deploy.Deployer.post_result")
     @patch("gitops_server.workers.deployer.deploy.load_app_definitions", mock_load_app_definitions)
     @patch("gitops_server.workers.deployer.deploy.temp_repo")
     async def test_deployer_update_helm_app(self, temp_repo_mock, post_mock, run_mock):
@@ -111,16 +101,6 @@ class TestDeploy:
             run_mock.call_args_list[3][0][0],
         )
         assert post_mock.call_count == 2
-        check_in_run_mock = [
-            (0, "mock-repo"),
-            (0, "Author Fullname"),
-            (0, "sample-app-1"),
-            (0, "sample-app-2"),
-            (1, "2 succeeded"),
-            (1, "0 failed"),
-        ]
-        for where, check in check_in_run_mock:
-            assert check in post_mock.call_args_list[where][0][0]
 
 
 class TestLoadAppDefinitions:

{gitops-0.13.2 → gitops-0.14.1}/uv.lock

@@ -277,7 +277,7 @@ wheels = [
 
 [[package]]
 name = "gitops"
-version = "0.11.3"
+version = "0.14.0"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
@@ -296,6 +296,7 @@ server = [
     { name = "httpx" },
     { name = "kubernetes-asyncio" },
     { name = "sentry-sdk" },
+    { name = "slack-sdk" },
     { name = "uptick-observability", extra = ["fastapi"] },
     { name = "uvicorn" },
 ]
@@ -325,6 +326,7 @@ requires-dist = [
     { name = "packaging", specifier = ">=24.1" },
     { name = "pyyaml", specifier = ">=6.0.2" },
     { name = "sentry-sdk", marker = "extra == 'server'", specifier = ">=1.3.0" },
+    { name = "slack-sdk", marker = "extra == 'server'", specifier = ">=3.33.5" },
     { name = "tabulate", specifier = ">=0.8.9" },
     { name = "uptick-observability", extras = ["fastapi"], marker = "extra == 'server'", specifier = ">=0.2.2" },
     { name = "uvicorn", marker = "extra == 'server'", specifier = ">=0.17.6" },
@@ -1090,6 +1092,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/d9/5a/e7c31adbe875f2abbb91bd84cf2dc52d792b5a01506781dbcf25c91daf11/six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254", size = 11053 },
 ]
 
+[[package]]
+name = "slack-sdk"
+version = "3.33.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/48/06/2b567dbd5869b4a27e0612bf0cd5a8b852a94a2fc877a4488f420b8506ed/slack_sdk-3.33.5.tar.gz", hash = "sha256:a5e74c00c99dc844ad93e501ab764a20d86fa8184bbc9432af217496f632c4ee", size = 233265 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fc/1c/b8e4bc3c26ebcdf360fd70c58a7bc01552f440fd119523204fa005681a40/slack_sdk-3.33.5-py2.py3-none-any.whl", hash = "sha256:b8cccadfa3d4005a5e6529f52000d25c583f46173fda8e9136fdd2bc58923ff6", size = 292279 },
+]
+
 [[package]]
 name = "sniffio"
 version = "1.3.1"

gitops-0.13.2/.github/workflows/publish.yml

@@ -1,62 +0,0 @@
-name: Release
-on:
-  release:
-    types: [published]
-  workflow_dispatch: {}
-
-
-permissions:
-  actions: read # Read the metrics
-  contents: write # to be able to publish a GitHub release
-  issues: write # to be able to comment on released issues
-  pull-requests: write # to be able to comment on released pull requests
-  id-token: write # to enable use of OIDC for npm provenance / AWS
-
-env:
-  MISE_PYTHON_COMPILE: false
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  build:
-    name: Build and Push Docker Image
-    uses: uptick/actions/.github/workflows/ci.yaml@main
-    secrets:
-      SECRET_ENV: "${{ secrets.CLUSTER_KEY }}"
-    #https://github.com/uptick/actions/blob/main/.github/workflows/ci.yaml
-    with:
-      aws-iam-role-arn: "arn:aws:iam::305686791668:role/default-github-actions-ci-role"
-      docker-enabled: true
-      docker-context: "."
-      docker-tag: ${{github.event.release.tag_name}}
-      docker-tag-latest: true
-      docker-image-platforms: linux/amd64
-      docker-repository: "305686791668.dkr.ecr.ap-southeast-2.amazonaws.com/gitops"
-      command: echo $SECRET_ENV | base64 -d > cluster.key
-
-  publish_helm_chart:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Publish Helm charts
-      uses: stefanprodan/helm-gh-pages@master
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-  publish_to_pypi:
-    name: Publishes tag to pypi
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: jdx/mise-action@v2
-      with:
-        install: true
-        cache: true
-        experimental: true
-
-    - run: |
-        mise run build
-      shell: bash
-
-    - name: Publish Pypi Package
-      uses: pypa/gh-action-pypi-publish@release/v1

gitops-0.13.2/.release-please-manifest.json

@@ -1,5 +0,0 @@
-{
-    ".": "0.13.2",
-    "gitops_server": "0.14.0",
-    "charts/gitops": "0.13.0"
-}

gitops-0.13.2/gitops_server/settings.py

@@ -1,7 +0,0 @@
-import os
-
-CLUSTER_NAME = os.getenv("CLUSTER_NAME", "")
-# Namespace to search/deploy into
-CLUSTER_NAMESPACE = os.getenv("CLUSTER_NAMESPACE", "")
-ACCOUNT_ID = os.getenv("ACCOUNT_ID", "")
-GITHUB_WEBHOOK_KEY = os.getenv("GITHUB_WEBHOOK_KEY", "")

{gitops-0.13.2 → gitops-0.14.1}/gitops_server/utils/__init__.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
-from pathlib import Path
 from collections.abc import Callable
+from pathlib import Path
 
 from ..types import RunOutput