From e27631b969e7042c338f9356f3f74f1030e38c6e Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Wed, 29 Nov 2023 23:24:11 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20flux=20diff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/flux-diff.yaml   | 49 ++++++++++++++++++++++++++++++
 .github/workflows/flux-differ.yaml | 45 ---------------------------
 2 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 .github/workflows/flux-diff.yaml
 delete mode 100644 .github/workflows/flux-differ.yaml

diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
new file mode 100644
index 000000000..95311a159
--- /dev/null
+++ b/.github/workflows/flux-diff.yaml
@@ -0,0 +1,49 @@
+---
+name: "Flux Diff"
+
+on:
+  pull_request:
+    branches: ["main"]
+    paths: ["kubernetes/**.yaml"]
+
+jobs:
+  flux-diff:
+    name: Flux Diff
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    strategy:
+      matrix:
+        path: ["kubernetes"]
+        resource: ["helmrelease", "kustomization"]
+    steps:
+      - name: Generate Token
+        uses: actions/create-github-app-token@e995b4e40ace2eb5bf13137d9abe242c98f3aab6 # v1.6.0
+        id: app-token
+        with:
+          app-id: "${{ secrets.BOT_APP_ID }}"
+          private-key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
+
+      - name: Setup Flux
+        uses: fluxcd/flux2/action@a18d4f345021182d6516bf3e8e00210567f46ab5 # v2.1.2
+
+      - name: Diff Resources
+        # uses: allenporter/flux-local/action/diff@19bfc6920e8964a479363bc230e6c329120ead02 # 3.2.0
+        uses: allenporter/flux-local/action/diff@flux-build
+        id: diff
+        with:
+          sources: home-ops-kubernetes
+          path: "${{ matrix.path }}"
+          resource: "${{ matrix.resource }}"
+
+      - if: ${{ steps.diff.outputs.diff != '' }}
+        name: Add comment
+        uses: mshick/add-pr-comment@7c0890544fb33b0bdd2e59467fbacb62e028a096 # v2.8.1
+        with:
+          repo-token: "${{ steps.app-token.outputs.token }}"
+          message-id: "${{ github.event.pull_request.number }}/${{ matrix.path }}/${{ matrix.resource }}"
+          message-failure: Diff was not successful
+          message: |
+            ```diff
+            ${{ steps.diff.outputs.diff }}
+            ```
diff --git a/.github/workflows/flux-differ.yaml b/.github/workflows/flux-differ.yaml
deleted file mode 100644
index 2dae4b157..000000000
--- a/.github/workflows/flux-differ.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: Flux differ
-
-on:
-  pull_request:
-    branches: ['*']
-    paths: ['kubernetes/**.yaml']
-
-jobs:
-  flux-differ:
-    name: Flux differ
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    strategy:
-      matrix:
-        path: ["kubernetes"]
-        resource: ["helmrelease", "kustomization"]
-    steps:
-      - name: Generate token
-        uses: tibdex/github-app-token@v2
-        id: generate-token
-        with:
-          app_id: "${{ secrets.BOT_APP_ID }}"
-          private_key: "${{ secrets.BOT_APP_PRIVATE_KEY }}"
-
-      - name: Diff resources
-        uses: allenporter/flux-local/action/diff@3.2.0
-        id: diff
-        with:
-          live-branch: main
-          path: "${{ matrix.path }}"
-          resource: "${{ matrix.resource }}"
-
-      - if: ${{ steps.diff.outputs.diff != '' }}
-        name: Add comment
-        uses: mshick/add-pr-comment@v2.8.1
-        with:
-          repo-token: "${{ steps.generate-token.outputs.token }}"
-          message-id: "${{ github.event.pull_request.number }}/${{ matrix.path }}/${{ matrix.resource }}"
-          message-failure: Diff was not successful
-          message: |
-            ```diff
-            ${{ steps.diff.outputs.diff }}
-            ```