From 7de2991925db74efd105496c0cadbc8367090c6d Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 08:07:41 -0500
Subject: [PATCH 01/57] Adding dry run for Docker Compose.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index b8ec4292..26128c4a 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -128,24 +128,33 @@ jobs:
             "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
   # Job 3: Merge PR if Quality Gate passes
-  # merge-pr:
-  #   runs-on: ubuntu-latest
-  #   needs: [check-and-create-pr, sonarqube-analysis]
-  #   if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
-  #   steps:
-  #     - name: Merge PR in Gitea
-  #       uses: prasiman/gocurl@v1
-  #       with:
-  #         url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-  #         method: "POST"
-  #         headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-  #         params: >-
-  #           {
-  #             "Do": "merge",
-  #             "delete_branch_after_merge": true,
-  #             "force_merge": true,
-  #             "merge_when_checks_succeed": true
-  #           }
+  dry-run-merge-pr:
+    runs-on: ubuntu-latest
+    needs: [check-and-create-pr, sonarqube-analysis]
+    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+    steps:
+      - name: Docker Compose Dry Run
+        uses: s3i7h/spin-up-docker-compose-action@v1.2
+        with:
+          file: docker-compose.yml
+          pull: true
+          pull-opts: --dry-run
+          up: true
+          up-opts: -d --dry-run
 
-  #     - name: Confirm Merge
-  #       run: echo "PR has been successfully merged into main."
+      # - name: Merge PR in Gitea
+      #   uses: prasiman/gocurl@v1
+      #   with:
+      #     url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+      #     method: "POST"
+      #     headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+      #     params: >-
+      #       {
+      #         "Do": "merge",
+      #         "delete_branch_after_merge": true,
+      #         "force_merge": true,
+      #         "merge_when_checks_succeed": true
+      #       }
+
+      # - name: Confirm Merge
+      #   run: echo "PR has been successfully merged into main."

From 501808583cedbfdaf171ad344f356c0b2df0cb66 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 08:59:01 -0500
Subject: [PATCH 02/57] Forgot to checkout code in 3rd job. Hah. Good morning.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 26128c4a..94dde973 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -133,6 +133,9 @@ jobs:
     needs: [check-and-create-pr, sonarqube-analysis]
     if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
     steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:
@@ -142,19 +145,19 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      # - name: Merge PR in Gitea
-      #   uses: prasiman/gocurl@v1
-      #   with:
-      #     url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-      #     method: "POST"
-      #     headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-      #     params: >-
-      #       {
-      #         "Do": "merge",
-      #         "delete_branch_after_merge": true,
-      #         "force_merge": true,
-      #         "merge_when_checks_succeed": true
-      #       }
+      - name: Merge PR in Gitea
+        uses: prasiman/gocurl@v1
+        with:
+          url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+          method: "POST"
+          headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+          params: >-
+            {
+              "Do": "merge",
+              "delete_branch_after_merge": true,
+              "force_merge": true,
+              "merge_when_checks_succeed": true
+            }
 
-      # - name: Confirm Merge
-      #   run: echo "PR has been successfully merged into main."
+      - name: Confirm Merge
+        run: echo "PR has been successfully merged into main."

From e5e4622b895eb9c8ac76c8f708fc62b910346d75 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 09:53:12 -0500
Subject: [PATCH 03/57] Running SQ scan and Docker dry run in same job.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 146 +++++++++---------
 1 file changed, 75 insertions(+), 71 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 94dde973..73d21059 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -11,7 +11,6 @@ jobs:
     name: Check and Create PR
     runs-on: ubuntu-latest
     outputs:
-      pr_created: ${{ steps.cc-pr.outputs.pr_created }}
       pr_number: ${{ steps.cc-pr.outputs.pr_index }}
     steps:
       - name: Checkout Code
@@ -53,10 +52,14 @@ jobs:
             exit 1
           fi
 
-  sonarqube-analysis:
+  sonarqube-analysis-dry-run:
     name: SonarQube Analysis
     runs-on: ubuntu-latest
     needs: check-and-create-pr
+    outputs:
+      qg_status_status: ${{ steps.quality-gate.outputs.quality-gate-status }}
+      qg_results: ${{ steps.quality-gate-check.outputs.quality-gate-result }}
+
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -82,60 +85,6 @@ jobs:
           sonar-host-url: ${{ secrets.SONARQUBE_HOST }}
           sonar-token: ${{ secrets.SONARQUBE_TOKEN }}
 
-      - name: JSON clean-up for proccessing...
-        id: json-cleanup
-        run: |
-          echo "Cleaning up quality gate response..."
-          echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt
-          sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
-          jq -c '.' qg_raw.json > qg_fixed_json.json
-          projstatus=$(jq -r '.projectStatus.status' qg_fixed_json.json)
-          caycStatus=$(jq -r '.projectStatus.caycStatus' qg_fixed_json.json)
-          conditions=$(jq -c '.projectStatus.conditions' qg_fixed_json.json)
-          echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
-          echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
-          echo "conditions=${conditions}" >> $GITHUB_OUTPUT
-
-      - name: Convert JSON to Markdown Table
-        id: convert-json-to-md
-        uses: buildingcash/json-to-markdown-table-action@v1.1.0
-        with:
-          json: "${{ steps.json-cleanup.outputs.conditions }}"
-
-      - name: Post SonarQube Results as Comment
-        env:
-          PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
-          SQ_RESULTS: ${{ steps.convert-json-to-md.outputs.table }}
-          QG_STATUS: ${{ steps.quality-gate.outputs.quality-gate-status }}
-          RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-          BOT_GITEA_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
-        run: |
-          formatted_results=$(echo "${SQ_RESULTS}" | sed 's/\\n/\
-          /g')
-          payload=$(jq -n \
-            --arg body "SonarQube analysis results:
-                <br>
-                ${{ env.SQ_RESULTS }}" \
-            '{ body: $body }')
-            
-          response=$(curl -s -o response.json -w "%{http_code}" \
-            -X POST \
-            -H "Accept: application/json" \
-            -H "Authorization: token ${BOT_GITEA_TOKEN}" \
-            -H "Content-Type: application/json" \
-            -d "$payload" \
-            "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
-
-  # Job 3: Merge PR if Quality Gate passes
-  dry-run-merge-pr:
-    runs-on: ubuntu-latest
-    needs: [check-and-create-pr, sonarqube-analysis]
-    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:
@@ -144,20 +93,75 @@ jobs:
           pull-opts: --dry-run
           up: true
           up-opts: -d --dry-run
+  # Job 3: Merge PR if Quality Gate passes
+  # dry-run-merge-pr:
+  #   runs-on: ubuntu-latest
+  #   needs: [check-and-create-pr, sonarqube-analysis]
+  #   if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+  #   steps:
+  #     - name: Checkout Code
+  #       uses: actions/checkout@v4
 
-      - name: Merge PR in Gitea
-        uses: prasiman/gocurl@v1
-        with:
-          url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-          method: "POST"
-          headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-          params: >-
-            {
-              "Do": "merge",
-              "delete_branch_after_merge": true,
-              "force_merge": true,
-              "merge_when_checks_succeed": true
-            }
+  #     - name: JSON clean-up for Custom Quality Gate Check...
+  #       id: json-cleanup
+  #       run: |
+  #         echo "Cleaning up quality gate response..."
+  #         echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt
+  #         sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
+  #         jq -c '.' qg_raw.json > qg_fixed_json.json
+  #         echo "qgfixedjson=$(cat qg_fixed_json.json)" >> $GITHUB_OUTPUT
+  #         echo "JSON cleanup complete.
+  #         projstatus=$(jq -r '.projectStatus.status' qg_fixed_json.json)
+  #         caycStatus=$(jq -r '.projectStatus.caycStatus' qg_fixed_json.json)
+  #         conditions=$(jq -c '.projectStatus.conditions' qg_fixed_json.json)
+  #         echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
+  #         echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
+  #         echo "conditions=${conditions}" >> $GITHUB_OUTPUT
+  #     - name: Post SonarQube Results as Comment
+  #       env:
+  #         PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
+  #         SQ_RESULTS: ${{ steps.convert-json-to-md.outputs.table }}
+  #         QG_STATUS: ${{ steps.quality-gate.outputs.quality-gate-status }}
+  #         RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
+  #         GITHUB_REPOSITORY: ${{ github.repository }}
+  #         BOT_GITEA_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
+  #       run: |
+  #         formatted_results=$(echo "${SQ_RESULTS}" | sed 's/\\n/\
+  #         /g')
+  #         payload=$(jq -n \
+  #           --arg body "SonarQube analysis results:
+  #               <br>
+  #               ${{ env.SQ_RESULTS }}" \
+  #           '{ body: $body }')
+            
+  #         response=$(curl -s -o response.json -w "%{http_code}" \
+  #           -X POST \
+  #           -H "Accept: application/json" \
+  #           -H "Authorization: token ${BOT_GITEA_TOKEN}" \
+  #           -H "Content-Type: application/json" \
+  #           -d "$payload" \
+  #           "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
-      - name: Confirm Merge
-        run: echo "PR has been successfully merged into main."
+  #     - name: Convert JSON to Markdown Table
+  #       id: convert-json-to-md
+  #       uses: buildingcash/json-to-markdown-table-action@v1.1.0
+  #       with:
+  #         json: "${{ steps.json-cleanup.outputs.conditions }}"
+
+
+  #     - name: Merge PR in Gitea
+  #       uses: prasiman/gocurl@v1
+  #       with:
+  #         url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+  #         method: "POST"
+  #         headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+  #         params: >-
+  #           {
+  #             "Do": "merge",
+  #             "delete_branch_after_merge": true,
+  #             "force_merge": true,
+  #             "merge_when_checks_succeed": true
+  #           }
+
+  #     - name: Confirm Merge
+  #       run: echo "PR has been successfully merged into main."

From 9c9d28ea22dda00c9fe4b11b4030738861ecba90 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 10:17:12 -0500
Subject: [PATCH 04/57] Added step for ephemeral env.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 73d21059..0d822c55 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -85,6 +85,10 @@ jobs:
           sonar-host-url: ${{ secrets.SONARQUBE_HOST }}
           sonar-token: ${{ secrets.SONARQUBE_TOKEN }}
 
+      - name: Generate Epemeral .env for Dry Run
+        run: |
+          echo "${{ secrets.RINOA_ENV }}" > .env
+
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:

From fadd1b97fe0895a8b68add46ecf9912a9c93bca2 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 10:55:29 -0500
Subject: [PATCH 05/57] Switching action for compose dry run.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 0d822c55..1f2b7abc 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -90,13 +90,10 @@ jobs:
           echo "${{ secrets.RINOA_ENV }}" > .env
 
       - name: Docker Compose Dry Run
-        uses: s3i7h/spin-up-docker-compose-action@v1.2
+        uses: hoverkraft-tech/compose-action@v2.0.2
         with:
-          file: docker-compose.yml
-          pull: true
-          pull-opts: --dry-run
-          up: true
-          up-opts: -d --dry-run
+          compose-file: ""
+          up-flags: --dry-run
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:
   #   runs-on: ubuntu-latest

From bf7a3642a137c77d00e73f1d00e28a5455f1f9fc Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 11:02:36 -0500
Subject: [PATCH 06/57] Spelling fix and compose file input.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 1f2b7abc..812f72fc 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -85,14 +85,14 @@ jobs:
           sonar-host-url: ${{ secrets.SONARQUBE_HOST }}
           sonar-token: ${{ secrets.SONARQUBE_TOKEN }}
 
-      - name: Generate Epemeral .env for Dry Run
+      - name: Generate Ephemeral .env for Dry Run
         run: |
           echo "${{ secrets.RINOA_ENV }}" > .env
 
       - name: Docker Compose Dry Run
         uses: hoverkraft-tech/compose-action@v2.0.2
         with:
-          compose-file: ""
+          compose-file: "./docker-compose.yml"
           up-flags: --dry-run
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:

From 5044b110be7893bbdb02041b0f753c687c732eb3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 11:14:36 -0500
Subject: [PATCH 07/57] Added env for docker_host in step (not even sure if
 that's a thing).

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 812f72fc..6b07e1cb 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -94,6 +94,8 @@ jobs:
         with:
           compose-file: "./docker-compose.yml"
           up-flags: --dry-run
+        env: 
+          DOCKER_HOST: tcp://localhost:2375
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:
   #   runs-on: ubuntu-latest

From bb0db07e6608c6cb62c8122dbdf6b0a1f4b02612 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 11:23:21 -0500
Subject: [PATCH 08/57] Damn AI copilots are getting in the way...

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 6b07e1cb..ba1b464f 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -53,7 +53,7 @@ jobs:
           fi
 
   sonarqube-analysis-dry-run:
-    name: SonarQube Analysis
+    name: SonarQube Analysis & Compose Dry-Run
     runs-on: ubuntu-latest
     needs: check-and-create-pr
     outputs:
@@ -95,7 +95,7 @@ jobs:
           compose-file: "./docker-compose.yml"
           up-flags: --dry-run
         env: 
-          DOCKER_HOST: tcp://localhost:2375
+          DOCKER_HOST: tcp://dockerproxy:2375
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:
   #   runs-on: ubuntu-latest

From 6861bffc556b28b6424a2b8cdc7892ba598c49f4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 12:47:54 -0500
Subject: [PATCH 09/57] Switching back compose dry run action.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index ba1b464f..ebdd8d2e 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -90,10 +90,13 @@ jobs:
           echo "${{ secrets.RINOA_ENV }}" > .env
 
       - name: Docker Compose Dry Run
-        uses: hoverkraft-tech/compose-action@v2.0.2
+        uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:
-          compose-file: "./docker-compose.yml"
-          up-flags: --dry-run
+          file: docker-compose.yml
+          pull: true
+          pull-opts: --dry-run
+          up: true
+          up-opts: -d --dry-run
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
   # Job 3: Merge PR if Quality Gate passes

From 435d384095b619a01d9c533ceea19618d0aba4b6 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:13:09 -0500
Subject: [PATCH 10/57] Dry run action doesn't appear to terminate on its own
 or return any outputs; adding log scanner.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index ebdd8d2e..c91c8eea 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -90,6 +90,7 @@ jobs:
           echo "${{ secrets.RINOA_ENV }}" > .env
 
       - name: Docker Compose Dry Run
+        id: docker-compose-dry-run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:
           file: docker-compose.yml
@@ -99,6 +100,15 @@ jobs:
           up-opts: -d --dry-run
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
+
+      - name: Parse Docker Compose Dry Run Output
+        uses: niklas-weber/scan-log
+        with:
+          error: 'level='
+          gh-token: ${{ secrets.BOT_GITEA_TOKEN }}
+          run-id: ${{ gitea.run_id }}
+          job-name: docker-compose-dry-run
+
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:
   #   runs-on: ubuntu-latest

From e25bf8273c165209001f6cb66b86941cedfd4447 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:19:50 -0500
Subject: [PATCH 11/57] Action fix.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index c91c8eea..0f522bf8 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -102,7 +102,7 @@ jobs:
           DOCKER_HOST: tcp://dockerproxy:2375
 
       - name: Parse Docker Compose Dry Run Output
-        uses: niklas-weber/scan-log
+        uses: niklas-weber/scan-log@v1.0.2
         with:
           error: 'level='
           gh-token: ${{ secrets.BOT_GITEA_TOKEN }}

From 345eaa40d3445aee719eddbeddb6ee727bc49799 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:35:29 -0500
Subject: [PATCH 12/57] Log scan tweaking.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 0f522bf8..b1726db4 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -107,7 +107,7 @@ jobs:
           error: 'level='
           gh-token: ${{ secrets.BOT_GITEA_TOKEN }}
           run-id: ${{ gitea.run_id }}
-          job-name: docker-compose-dry-run
+          job-name: sonarqube-analysis-dry-run
 
   # Job 3: Merge PR if Quality Gate passes
   # dry-run-merge-pr:

From 633c679ce93687b59dba0a8e7bb2450838862719 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:40:50 -0500
Subject: [PATCH 13/57] Log scan tweaking.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index b1726db4..4ac53fab 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -106,7 +106,7 @@ jobs:
         with:
           error: 'level='
           gh-token: ${{ secrets.BOT_GITEA_TOKEN }}
-          run-id: ${{ gitea.run_id }}
+          run-id: ${{ github.run_id }}
           job-name: sonarqube-analysis-dry-run
 
   # Job 3: Merge PR if Quality Gate passes

From 0cc325740767504cbdc460872170e2e33ed3bc36 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:47:36 -0500
Subject: [PATCH 14/57] Log scan tweaking.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 4ac53fab..eede4dde 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -101,23 +101,23 @@ jobs:
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
 
+  # Job 3: Merge PR if Quality Gate passes
+  scan-json-merge-pr:
+    runs-on: ubuntu-latest
+    needs: [check-and-create-pr, sonarqube-analysis]
+    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
       - name: Parse Docker Compose Dry Run Output
         uses: niklas-weber/scan-log@v1.0.2
         with:
           error: 'level='
           gh-token: ${{ secrets.BOT_GITEA_TOKEN }}
-          run-id: ${{ github.run_id }}
+          run-id: ${{ gitea.run_id }}
           job-name: sonarqube-analysis-dry-run
 
-  # Job 3: Merge PR if Quality Gate passes
-  # dry-run-merge-pr:
-  #   runs-on: ubuntu-latest
-  #   needs: [check-and-create-pr, sonarqube-analysis]
-  #   if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
-  #   steps:
-  #     - name: Checkout Code
-  #       uses: actions/checkout@v4
-
   #     - name: JSON clean-up for Custom Quality Gate Check...
   #       id: json-cleanup
   #       run: |

From 54a360df14feb2c461b534a25f554cdd3a72fcf5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 13:58:04 -0500
Subject: [PATCH 15/57] Log scan tweaking.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index eede4dde..37c52318 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-and-create-pr
     outputs:
-      qg_status_status: ${{ steps.quality-gate.outputs.quality-gate-status }}
+      qg_status: ${{ steps.quality-gate.outputs.quality-gate-status }}
       qg_results: ${{ steps.quality-gate-check.outputs.quality-gate-result }}
 
     steps:
@@ -103,9 +103,10 @@ jobs:
 
   # Job 3: Merge PR if Quality Gate passes
   scan-json-merge-pr:
+    name: Merge PR if checks pass
     runs-on: ubuntu-latest
-    needs: [check-and-create-pr, sonarqube-analysis]
-    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+    needs: [check-and-create-pr, sonarqube-analysis-dry-run]
+    if: needs.sonarqube-analysis-dry-run.outputs.quality_gate_status == 'PASSED'
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

From a7d7bb9ad0d66b8a6cb0abc005b37c22c470a2b7 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 14:13:44 -0500
Subject: [PATCH 16/57] Adjusting jobs needs.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 37c52318..74bf4570 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -105,7 +105,7 @@ jobs:
   scan-json-merge-pr:
     name: Merge PR if checks pass
     runs-on: ubuntu-latest
-    needs: [check-and-create-pr, sonarqube-analysis-dry-run]
+    needs: sonarqube-analysis-dry-run
     if: needs.sonarqube-analysis-dry-run.outputs.quality_gate_status == 'PASSED'
     steps:
       - name: Checkout Code

From 8f1fb9fd94128a55d087eae4a5fac95d8521fe85 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 14:21:03 -0500
Subject: [PATCH 17/57] Adjusting job params....

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 74bf4570..99675a73 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -106,7 +106,6 @@ jobs:
     name: Merge PR if checks pass
     runs-on: ubuntu-latest
     needs: sonarqube-analysis-dry-run
-    if: needs.sonarqube-analysis-dry-run.outputs.quality_gate_status == 'PASSED'
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

From 364f8b8f4707c8f74236e44b3a97ce559c4d79c3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 14:38:16 -0500
Subject: [PATCH 18/57] Action fix.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 99675a73..4fbee8b6 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -89,15 +89,11 @@ jobs:
         run: |
           echo "${{ secrets.RINOA_ENV }}" > .env
 
-      - name: Docker Compose Dry Run
-        id: docker-compose-dry-run
-        uses: s3i7h/spin-up-docker-compose-action@v1.2
+      - name: Docker Compose Lint
+        id: docker-compose-lint
+        uses: sjafferali/docker-compose-lint-action@v0.1.2
         with:
-          file: docker-compose.yml
-          pull: true
-          pull-opts: --dry-run
-          up: true
-          up-opts: -d --dry-run
+          compose-file: './docker-compose.yml'
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
 

From bb30b7b14f6101b57fd582b0db549e4ea24be93a Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 15:09:16 -0500
Subject: [PATCH 19/57] Re-validating comment post functionality.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 98 +++++++++----------
 1 file changed, 45 insertions(+), 53 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 4fbee8b6..22973e2c 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 jobs:
-  # Job 1: Check if PR exists and create one if the branch is new
+
   check-and-create-pr:
     name: Check and Create PR
     runs-on: ubuntu-latest
@@ -97,7 +97,6 @@ jobs:
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
 
-  # Job 3: Merge PR if Quality Gate passes
   scan-json-merge-pr:
     name: Merge PR if checks pass
     runs-on: ubuntu-latest
@@ -106,60 +105,53 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
-      - name: Parse Docker Compose Dry Run Output
-        uses: niklas-weber/scan-log@v1.0.2
+      - name: JSON clean-up for Custom Quality Gate Check...
+        id: json-cleanup
+        run: |
+          echo "Cleaning up quality gate response..."
+          echo '${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}' > qg_input.txt
+          sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
+          jq -c '.' qg_raw.json > qg_fixed_json.json
+          echo "qgfixedjson=$(cat qg_fixed_json.json)" >> $GITHUB_OUTPUT
+          echo "JSON cleanup complete."
+          projstatus=$(jq -r '.projectStatus.status' qg_fixed_json.json)
+          caycStatus=$(jq -r '.projectStatus.caycStatus' qg_fixed_json.json)
+          conditions=$(jq -c '.projectStatus.conditions' qg_fixed_json.json)
+          echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
+          echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
+          echo "conditions=${conditions}" >> $GITHUB_OUTPUT
+
+      - name: Convert JSON to Markdown Table
+        id: convert-json-to-md
+        uses: buildingcash/json-to-markdown-table-action@v1.1.0
         with:
-          error: 'level='
-          gh-token: ${{ secrets.BOT_GITEA_TOKEN }}
-          run-id: ${{ gitea.run_id }}
-          job-name: sonarqube-analysis-dry-run
+          json: "${{ steps.json-cleanup.outputs.conditions }}"
 
-  #     - name: JSON clean-up for Custom Quality Gate Check...
-  #       id: json-cleanup
-  #       run: |
-  #         echo "Cleaning up quality gate response..."
-  #         echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt
-  #         sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
-  #         jq -c '.' qg_raw.json > qg_fixed_json.json
-  #         echo "qgfixedjson=$(cat qg_fixed_json.json)" >> $GITHUB_OUTPUT
-  #         echo "JSON cleanup complete.
-  #         projstatus=$(jq -r '.projectStatus.status' qg_fixed_json.json)
-  #         caycStatus=$(jq -r '.projectStatus.caycStatus' qg_fixed_json.json)
-  #         conditions=$(jq -c '.projectStatus.conditions' qg_fixed_json.json)
-  #         echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
-  #         echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
-  #         echo "conditions=${conditions}" >> $GITHUB_OUTPUT
-  #     - name: Post SonarQube Results as Comment
-  #       env:
-  #         PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
-  #         SQ_RESULTS: ${{ steps.convert-json-to-md.outputs.table }}
-  #         QG_STATUS: ${{ steps.quality-gate.outputs.quality-gate-status }}
-  #         RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
-  #         GITHUB_REPOSITORY: ${{ github.repository }}
-  #         BOT_GITEA_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
-  #       run: |
-  #         formatted_results=$(echo "${SQ_RESULTS}" | sed 's/\\n/\
-  #         /g')
-  #         payload=$(jq -n \
-  #           --arg body "SonarQube analysis results:
-  #               <br>
-  #               ${{ env.SQ_RESULTS }}" \
-  #           '{ body: $body }')
+      - name: Post SonarQube Results as Comment
+        env:
+          PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
+          SQ_RESULTS: ${{ steps.convert-json-to-md.outputs.table }}
+          QG_STATUS: ${{ needs.quality-gate.outputs.qg_status }}
+          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
+          RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          BOT_GITEA_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
+        run: |
+          formatted_results=$(echo "${SQ_RESULTS}" | sed 's/\\n/\
+          /g')
+          payload=$(jq -n \
+            --arg body "SonarQube analysis results:
+                <br>
+                ${{ env.SQ_RESULTS }}" \
+            '{ body: $body }')
             
-  #         response=$(curl -s -o response.json -w "%{http_code}" \
-  #           -X POST \
-  #           -H "Accept: application/json" \
-  #           -H "Authorization: token ${BOT_GITEA_TOKEN}" \
-  #           -H "Content-Type: application/json" \
-  #           -d "$payload" \
-  #           "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
-
-  #     - name: Convert JSON to Markdown Table
-  #       id: convert-json-to-md
-  #       uses: buildingcash/json-to-markdown-table-action@v1.1.0
-  #       with:
-  #         json: "${{ steps.json-cleanup.outputs.conditions }}"
-
+          response=$(curl -s -o response.json -w "%{http_code}" \
+            -X POST \
+            -H "Accept: application/json" \
+            -H "Authorization: token ${BOT_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$payload" \
+            "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
   #     - name: Merge PR in Gitea
   #       uses: prasiman/gocurl@v1

From f2a7a69adabceb19bfdf3e33830e724d377047da Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 15:21:03 -0500
Subject: [PATCH 20/57] Re-validating comment post functionality.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 22973e2c..2abc8c01 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -109,7 +109,7 @@ jobs:
         id: json-cleanup
         run: |
           echo "Cleaning up quality gate response..."
-          echo '${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}' > qg_input.txt
+          echo '${QG_RESULTS}' > qg_input.txt
           sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
           jq -c '.' qg_raw.json > qg_fixed_json.json
           echo "qgfixedjson=$(cat qg_fixed_json.json)" >> $GITHUB_OUTPUT
@@ -120,6 +120,8 @@ jobs:
           echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
           echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
           echo "conditions=${conditions}" >> $GITHUB_OUTPUT
+        env:
+          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
 
       - name: Convert JSON to Markdown Table
         id: convert-json-to-md

From 57c284f5684e00bab52ac5563f2dc79932b7e533 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 15:41:07 -0500
Subject: [PATCH 21/57] Re-validating comment post functionality.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 2abc8c01..f370ffea 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -121,7 +121,7 @@ jobs:
           echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
           echo "conditions=${conditions}" >> $GITHUB_OUTPUT
         env:
-          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
+          QG_RESULTS: ${{ toJSON(needs.sonarqube-analysis-dry-run.outputs.qg_results) }}
 
       - name: Convert JSON to Markdown Table
         id: convert-json-to-md

From d21b97fa54fa344f38492cbf4ca3fcc60ccdcb2b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 16:08:06 -0500
Subject: [PATCH 22/57] Re-validating comment post functionality.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index f370ffea..0588bd98 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -107,6 +107,8 @@ jobs:
 
       - name: JSON clean-up for Custom Quality Gate Check...
         id: json-cleanup
+        env:
+          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
         run: |
           echo "Cleaning up quality gate response..."
           echo '${QG_RESULTS}' > qg_input.txt
@@ -120,8 +122,7 @@ jobs:
           echo "projstatus=${projstatus}" >> $GITHUB_OUTPUT
           echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
           echo "conditions=${conditions}" >> $GITHUB_OUTPUT
-        env:
-          QG_RESULTS: ${{ toJSON(needs.sonarqube-analysis-dry-run.outputs.qg_results) }}
+
 
       - name: Convert JSON to Markdown Table
         id: convert-json-to-md

From 940582a56fa4e3d328acd3a9e1aa6f25536329aa Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 17:54:25 -0500
Subject: [PATCH 23/57] Re-jiggery....

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 0588bd98..aaeacd96 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -91,9 +91,12 @@ jobs:
 
       - name: Docker Compose Lint
         id: docker-compose-lint
-        uses: sjafferali/docker-compose-lint-action@v0.1.2
+        uses: https://git.trez.wtf/Trez.One/spin-up-docker-compose-action@v1.3
         with:
-          compose-file: './docker-compose.yml'
+          compose-file: "./docker-compose.yml"
+          up-flags: --dry-run -d
+          pull: true
+          pull-opts: --dry-run
         env: 
           DOCKER_HOST: tcp://dockerproxy:2375
 

From 26b612872ecf61823c7014e2b3c5a7a410907840 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 18:04:44 -0500
Subject: [PATCH 24/57] Removing the compose linting for now.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index aaeacd96..580764ce 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -85,20 +85,20 @@ jobs:
           sonar-host-url: ${{ secrets.SONARQUBE_HOST }}
           sonar-token: ${{ secrets.SONARQUBE_TOKEN }}
 
-      - name: Generate Ephemeral .env for Dry Run
-        run: |
-          echo "${{ secrets.RINOA_ENV }}" > .env
+      # - name: Generate Ephemeral .env for Dry Run
+      #   run: |
+      #     echo "${{ secrets.RINOA_ENV }}" > .env
 
-      - name: Docker Compose Lint
-        id: docker-compose-lint
-        uses: https://git.trez.wtf/Trez.One/spin-up-docker-compose-action@v1.3
-        with:
-          compose-file: "./docker-compose.yml"
-          up-flags: --dry-run -d
-          pull: true
-          pull-opts: --dry-run
-        env: 
-          DOCKER_HOST: tcp://dockerproxy:2375
+      # - name: Docker Compose Lint
+      #   id: docker-compose-lint
+      #   uses: https://git.trez.wtf/Trez.One/spin-up-docker-compose-action@v1.3
+      #   with:
+      #     compose-file: "./docker-compose.yml"
+      #     up-flags: --dry-run -d
+      #     pull: true
+      #     pull-opts: --dry-run
+      #   env: 
+      #     DOCKER_HOST: tcp://dockerproxy:2375
 
   scan-json-merge-pr:
     name: Merge PR if checks pass

From 990cc72ca3ae9890df2bfc9c1d044f14f132f8ef Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 18:21:03 -0500
Subject: [PATCH 25/57] Reverting back to earlier version.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 94 ++++++++-----------
 1 file changed, 40 insertions(+), 54 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 580764ce..94dde973 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -6,11 +6,12 @@ on:
       - main
 
 jobs:
-
+  # Job 1: Check if PR exists and create one if the branch is new
   check-and-create-pr:
     name: Check and Create PR
     runs-on: ubuntu-latest
     outputs:
+      pr_created: ${{ steps.cc-pr.outputs.pr_created }}
       pr_number: ${{ steps.cc-pr.outputs.pr_index }}
     steps:
       - name: Checkout Code
@@ -52,14 +53,10 @@ jobs:
             exit 1
           fi
 
-  sonarqube-analysis-dry-run:
-    name: SonarQube Analysis & Compose Dry-Run
+  sonarqube-analysis:
+    name: SonarQube Analysis
     runs-on: ubuntu-latest
     needs: check-and-create-pr
-    outputs:
-      qg_status: ${{ steps.quality-gate.outputs.quality-gate-status }}
-      qg_results: ${{ steps.quality-gate-check.outputs.quality-gate-result }}
-
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -85,40 +82,13 @@ jobs:
           sonar-host-url: ${{ secrets.SONARQUBE_HOST }}
           sonar-token: ${{ secrets.SONARQUBE_TOKEN }}
 
-      # - name: Generate Ephemeral .env for Dry Run
-      #   run: |
-      #     echo "${{ secrets.RINOA_ENV }}" > .env
-
-      # - name: Docker Compose Lint
-      #   id: docker-compose-lint
-      #   uses: https://git.trez.wtf/Trez.One/spin-up-docker-compose-action@v1.3
-      #   with:
-      #     compose-file: "./docker-compose.yml"
-      #     up-flags: --dry-run -d
-      #     pull: true
-      #     pull-opts: --dry-run
-      #   env: 
-      #     DOCKER_HOST: tcp://dockerproxy:2375
-
-  scan-json-merge-pr:
-    name: Merge PR if checks pass
-    runs-on: ubuntu-latest
-    needs: sonarqube-analysis-dry-run
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: JSON clean-up for Custom Quality Gate Check...
+      - name: JSON clean-up for proccessing...
         id: json-cleanup
-        env:
-          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
         run: |
           echo "Cleaning up quality gate response..."
-          echo '${QG_RESULTS}' > qg_input.txt
+          echo '${{ steps.quality-gate-check.outputs.quality-gate-result }}' > qg_input.txt
           sed -E 's/([a-zA-Z0-9_]+):/\\"\1\\":/g; s/:([^",{}\[\]]+)/:"\1"/g' qg_input.txt > qg_raw.json
           jq -c '.' qg_raw.json > qg_fixed_json.json
-          echo "qgfixedjson=$(cat qg_fixed_json.json)" >> $GITHUB_OUTPUT
-          echo "JSON cleanup complete."
           projstatus=$(jq -r '.projectStatus.status' qg_fixed_json.json)
           caycStatus=$(jq -r '.projectStatus.caycStatus' qg_fixed_json.json)
           conditions=$(jq -c '.projectStatus.conditions' qg_fixed_json.json)
@@ -126,7 +96,6 @@ jobs:
           echo "caycStatus=${caycStatus}" >> $GITHUB_OUTPUT
           echo "conditions=${conditions}" >> $GITHUB_OUTPUT
 
-
       - name: Convert JSON to Markdown Table
         id: convert-json-to-md
         uses: buildingcash/json-to-markdown-table-action@v1.1.0
@@ -137,8 +106,7 @@ jobs:
         env:
           PR_NUMBER: ${{ needs.check-and-create-pr.outputs.pr_number }}
           SQ_RESULTS: ${{ steps.convert-json-to-md.outputs.table }}
-          QG_STATUS: ${{ needs.quality-gate.outputs.qg_status }}
-          QG_RESULTS: ${{ needs.sonarqube-analysis-dry-run.outputs.qg_results }}
+          QG_STATUS: ${{ steps.quality-gate.outputs.quality-gate-status }}
           RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
           GITHUB_REPOSITORY: ${{ github.repository }}
           BOT_GITEA_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
@@ -159,19 +127,37 @@ jobs:
             -d "$payload" \
             "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
-  #     - name: Merge PR in Gitea
-  #       uses: prasiman/gocurl@v1
-  #       with:
-  #         url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-  #         method: "POST"
-  #         headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-  #         params: >-
-  #           {
-  #             "Do": "merge",
-  #             "delete_branch_after_merge": true,
-  #             "force_merge": true,
-  #             "merge_when_checks_succeed": true
-  #           }
+  # Job 3: Merge PR if Quality Gate passes
+  dry-run-merge-pr:
+    runs-on: ubuntu-latest
+    needs: [check-and-create-pr, sonarqube-analysis]
+    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        
+      - name: Docker Compose Dry Run
+        uses: s3i7h/spin-up-docker-compose-action@v1.2
+        with:
+          file: docker-compose.yml
+          pull: true
+          pull-opts: --dry-run
+          up: true
+          up-opts: -d --dry-run
 
-  #     - name: Confirm Merge
-  #       run: echo "PR has been successfully merged into main."
+      - name: Merge PR in Gitea
+        uses: prasiman/gocurl@v1
+        with:
+          url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+          method: "POST"
+          headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+          params: >-
+            {
+              "Do": "merge",
+              "delete_branch_after_merge": true,
+              "force_merge": true,
+              "merge_when_checks_succeed": true
+            }
+
+      - name: Confirm Merge
+        run: echo "PR has been successfully merged into main."

From 2d50f7c8dd74593e384a5509035fb4c00a0d3b60 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 18:28:37 -0500
Subject: [PATCH 26/57] Re-testing flow.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 94dde973..c7fbaaa1 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -57,6 +57,8 @@ jobs:
     name: SonarQube Analysis
     runs-on: ubuntu-latest
     needs: check-and-create-pr
+    outputs:
+      qg_status: ${{ steps.quality-gate.outputs.quality-gate-status }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -130,8 +132,8 @@ jobs:
   # Job 3: Merge PR if Quality Gate passes
   dry-run-merge-pr:
     runs-on: ubuntu-latest
-    needs: [check-and-create-pr, sonarqube-analysis]
-    if: needs.sonarqube-analysis.outputs.quality_gate_status == 'PASSED'
+    needs: sonarqube-analysis
+    if: needs.sonarqube-analysis.outputs.qg_status == 'PASSED'
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -145,19 +147,19 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      - name: Merge PR in Gitea
-        uses: prasiman/gocurl@v1
-        with:
-          url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-          method: "POST"
-          headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-          params: >-
-            {
-              "Do": "merge",
-              "delete_branch_after_merge": true,
-              "force_merge": true,
-              "merge_when_checks_succeed": true
-            }
+      # - name: Merge PR in Gitea
+      #   uses: prasiman/gocurl@v1
+      #   with:
+      #     url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
+      #     method: "POST"
+      #     headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
+      #     params: >-
+      #       {
+      #         "Do": "merge",
+      #         "delete_branch_after_merge": true,
+      #         "force_merge": true,
+      #         "merge_when_checks_succeed": true
+      #       }
 
-      - name: Confirm Merge
-        run: echo "PR has been successfully merged into main."
+      # - name: Confirm Merge
+      #   run: echo "PR has been successfully merged into main."

From a815fbdf96dda6ed37b1b32ba021252e8e448ece Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 18:39:41 -0500
Subject: [PATCH 27/57] Re-testing flow.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index c7fbaaa1..d670459c 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -138,6 +138,9 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
         
+      - name: Generate Ephemeral .env for Docker Compose Dry Run
+        run: |
+          echo ${{ secrets.RINOA_ENV }}
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:

From bd1b2e5590a68e85a61789c5a7a5e01a49967e1a Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 18:56:09 -0500
Subject: [PATCH 28/57] Re-testing flow.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index d670459c..c479c276 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -140,7 +140,8 @@ jobs:
         
       - name: Generate Ephemeral .env for Docker Compose Dry Run
         run: |
-          echo ${{ secrets.RINOA_ENV }}
+          echo ${{ secrets.RINOA_ENV }} > .env
+          
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:

From 80626c8a356061770d4e257d5cdc5837911cb339 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 19:05:23 -0500
Subject: [PATCH 29/57] Re-testing flow.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index c479c276..9a459a71 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -140,8 +140,8 @@ jobs:
         
       - name: Generate Ephemeral .env for Docker Compose Dry Run
         run: |
-          echo ${{ secrets.RINOA_ENV }} > .env
-          
+          echo "${{ secrets.RINOA_ENV }}" > .env
+
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
         with:

From 29fae8b0b2a5aa3d534f15bb934be049dcb1f404 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 19:15:24 -0500
Subject: [PATCH 30/57] Forgot to re-add dockerproxy.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 9a459a71..715f89f3 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -144,6 +144,8 @@ jobs:
 
       - name: Docker Compose Dry Run
         uses: s3i7h/spin-up-docker-compose-action@v1.2
+        env:
+          DOCKER_HOST: tcp://dockerproxy:2375
         with:
           file: docker-compose.yml
           pull: true

From 2de412fb729ffa8ec4f1a2dbbbe32e78dca278a3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 20:08:23 -0500
Subject: [PATCH 31/57] Adding PR merge step.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 715f89f3..b5a25f11 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -129,7 +129,6 @@ jobs:
             -d "$payload" \
             "${RINOA_GITEA_URL}/api/v1/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/reviews")
 
-  # Job 3: Merge PR if Quality Gate passes
   dry-run-merge-pr:
     runs-on: ubuntu-latest
     needs: sonarqube-analysis
@@ -153,19 +152,27 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      # - name: Merge PR in Gitea
-      #   uses: prasiman/gocurl@v1
-      #   with:
-      #     url: "${{ secrets.GITEA_INSTANCE_URL }}/repos/${{ github.repository_owner }}/${{ github.event.repository.name }}/pulls/${{ needs.check-and-create-pr.outputs.pr_index }}"
-      #     method: "POST"
-      #     headers: '{ "Authorization": "token ${{ secrets.GITEA_API_TOKEN }}", "Content-Type": "application/json" }'
-      #     params: >-
-      #       {
-      #         "Do": "merge",
-      #         "delete_branch_after_merge": true,
-      #         "force_merge": true,
-      #         "merge_when_checks_succeed": true
-      #       }
+      - name: Merge PR
+        env:
+          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
+        run: |
+          merge_response=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${PR_INDEX}/merge -s \
+              -X 'POST' \
+              -H 'Accept: application/json' \
+              -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
+              -H 'Content-Type: application/json' \
+              -d '{
+                "Do": "merge",
+                "delete_branch_after_merge": true,
+                "force_merge": true,
+                "merge_when_checks_succeed": true
+              }' -w "{%http_code%}")
+          if [ "$merge_response" -eq 200 ]; then
+            echo "PR has been successfully merged into main."
+          else
+            echo "Failed to merge PR. Response code: {$merge_response}"
+            exit 1
+          fi
 
-      # - name: Confirm Merge
-      #   run: echo "PR has been successfully merged into main."
+      - name: Confirm Merge
+        run: echo "PR has been successfully merged into main."

From ae8de2dcfa292734963f10df4ac657a73f79a9ea Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 20:21:22 -0500
Subject: [PATCH 32/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index b5a25f11..1b2be37f 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -166,8 +166,8 @@ jobs:
                 "delete_branch_after_merge": true,
                 "force_merge": true,
                 "merge_when_checks_succeed": true
-              }' -w "{%http_code%}")
-          if [ "$merge_response" -eq 200 ]; then
+              }' -w "%{http_code}")
+          if [ "${merge_response}" -eq "200" ]; then
             echo "PR has been successfully merged into main."
           else
             echo "Failed to merge PR. Response code: {$merge_response}"

From 35cbf42f3ba4ca949e3f1a480a31600dd3e428cd Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 21:16:49 -0500
Subject: [PATCH 33/57] Small fixes.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 1b2be37f..97e3adb5 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,24 +155,14 @@ jobs:
       - name: Merge PR
         env:
           PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-        run: |
-          merge_response=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/${PR_INDEX}/merge -s \
-              -X 'POST' \
-              -H 'Accept: application/json' \
-              -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \
-              -H 'Content-Type: application/json' \
-              -d '{
-                "Do": "merge",
-                "delete_branch_after_merge": true,
-                "force_merge": true,
-                "merge_when_checks_succeed": true
-              }' -w "%{http_code}")
-          if [ "${merge_response}" -eq "200" ]; then
-            echo "PR has been successfully merged into main."
-          else
-            echo "Failed to merge PR. Response code: {$merge_response}"
-            exit 1
-          fi
-
-      - name: Confirm Merge
-        run: echo "PR has been successfully merged into main."
+        uses: Frozen-Tapestry/docker-run-action@v6
+        with:
+          image: tgerczei/tea
+          run: |
+            tea login add --token ${{ secrets.GITHUB_TOKEN }} --name github
+          env: |
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITEA_USER="gitea-sonarqube-bot"
+            GITEA_SERVER_URL=${{ vars.RINOA_GITEA_URL }}
+            GITEA_SERVER_TOKEN=${{ secrets.BOT_GITEA_TOKEN }}
+            DOCKER_HOST: tcp://dockerproxy:2375

From 6fe83fcc1c0b8c0c95f3635e64d34a00d94deccd Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 21:20:53 -0500
Subject: [PATCH 34/57] Testing merge PR step with Docker Action.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 97e3adb5..32b58885 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,14 +155,13 @@ jobs:
       - name: Merge PR
         env:
           PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITEA_USER: "gitea-sonarqube-bot"
+          GITEA_SERVER_URL: ${{ vars.RINOA_GITEA_URL }}
+          GITEA_SERVER_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
+          DOCKER_HOST: tcp://dockerproxy:2375
         uses: Frozen-Tapestry/docker-run-action@v6
         with:
           image: tgerczei/tea
-          run: |
-            tea login add --token ${{ secrets.GITHUB_TOKEN }} --name github
-          env: |
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            GITEA_USER="gitea-sonarqube-bot"
-            GITEA_SERVER_URL=${{ vars.RINOA_GITEA_URL }}
-            GITEA_SERVER_TOKEN=${{ secrets.BOT_GITEA_TOKEN }}
-            DOCKER_HOST: tcp://dockerproxy:2375
+          run: tea pr ls
+          socket: ${DOCKER_HOST}

From 773ad102aa33723d06985e3a756c203959978636 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 21:32:21 -0500
Subject: [PATCH 35/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 32b58885..d5aa4aab 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -164,4 +164,3 @@ jobs:
         with:
           image: tgerczei/tea
           run: tea pr ls
-          socket: ${DOCKER_HOST}

From 0aa64e92559372ac48fd6dcb2100f1aa9d4feb94 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 21:46:01 -0500
Subject: [PATCH 36/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index d5aa4aab..116c3326 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -162,5 +162,6 @@ jobs:
           DOCKER_HOST: tcp://dockerproxy:2375
         uses: Frozen-Tapestry/docker-run-action@v6
         with:
-          image: tgerczei/tea
+          image: gitea/tea:latest
+          sheLL: /bin/bash
           run: tea pr ls

From c2aafeaea0e84017b2237c11a0e2b5be92009206 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 21:56:42 -0500
Subject: [PATCH 37/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 116c3326..37c1ca9c 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -163,5 +163,5 @@ jobs:
         uses: Frozen-Tapestry/docker-run-action@v6
         with:
           image: gitea/tea:latest
-          sheLL: /bin/bash
+          sheLL: /bin/sh
           run: tea pr ls

From cb7742ea67be6d222c2a85d861a2373181ba6406 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 22:04:59 -0500
Subject: [PATCH 38/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 37c1ca9c..29f1bfdc 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -163,5 +163,4 @@ jobs:
         uses: Frozen-Tapestry/docker-run-action@v6
         with:
           image: gitea/tea:latest
-          sheLL: /bin/sh
           run: tea pr ls

From bd955c3cc5ffa7a471f673dfcf2c47401e46b794 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 20 Dec 2024 22:20:06 -0500
Subject: [PATCH 39/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 29f1bfdc..b9882af0 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -164,3 +164,4 @@ jobs:
         with:
           image: gitea/tea:latest
           run: tea pr ls
+          shell: tea

From 0dd4182bbbc14074e03083040f01e85fec4daf3b Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 09:12:18 -0500
Subject: [PATCH 40/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index b9882af0..961631c5 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -163,5 +163,5 @@ jobs:
         uses: Frozen-Tapestry/docker-run-action@v6
         with:
           image: gitea/tea:latest
-          run: tea pr ls
-          shell: tea
+          run: pr ls
+          shell: /tea

From 980ec39a795276217770ef554c2e4f59289584a6 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 09:42:07 -0500
Subject: [PATCH 41/57] Tea CLI set up.

---
 .../workflows/branch-sonarscan-pr-merge.yml   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 961631c5..e81f946c 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -131,6 +131,7 @@ jobs:
 
   dry-run-merge-pr:
     runs-on: ubuntu-latest
+    name: Dry Run & PR Merge
     needs: sonarqube-analysis
     if: needs.sonarqube-analysis.outputs.qg_status == 'PASSED'
     steps:
@@ -152,16 +153,15 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      - name: Merge PR
+      - name: Install & Setup Tea CLI
+        run: |
+          curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
+          chmod +x /usr/local/bin/tea
+          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
+
+      - name: Merge PR with Tea CLI
         env:
           PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITEA_USER: "gitea-sonarqube-bot"
-          GITEA_SERVER_URL: ${{ vars.RINOA_GITEA_URL }}
-          GITEA_SERVER_TOKEN: ${{ secrets.BOT_GITEA_TOKEN }}
-          DOCKER_HOST: tcp://dockerproxy:2375
-        uses: Frozen-Tapestry/docker-run-action@v6
-        with:
-          image: gitea/tea:latest
-          run: pr ls
-          shell: /tea
+        run: |
+          echo "${{ gitea.event.pull_request.number }}"
+          tea pr m --message "Automatically merged by Gitea Actions" --output table "${PR_INDEX}"

From e81953459d5bff5b9e489ac712ff39edec1ae1d4 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 09:51:28 -0500
Subject: [PATCH 42/57] Tweaking PR merge step.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index e81f946c..c034ac99 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -153,15 +153,13 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      - name: Install & Setup Tea CLI
+      - name: ITea CLI Setup & PR Merge
+        env:
+            PR_NUMBER: ${{ github.event.pull_request.number }}
+            RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
         run: |
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-
-      - name: Merge PR with Tea CLI
-        env:
-          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-        run: |
-          echo "${{ gitea.event.pull_request.number }}"
-          tea pr m --message "Automatically merged by Gitea Actions" --output table "${PR_INDEX}"
+          tea pr m --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
+          

From 941790ae4674cc0214af62f5a0c883749bbe17df Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 10:03:21 -0500
Subject: [PATCH 43/57] Tweaking PR merge step.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index c034ac99..520616f7 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,11 +155,10 @@ jobs:
 
       - name: ITea CLI Setup & PR Merge
         env:
-            PR_NUMBER: ${{ github.event.pull_request.number }}
-            RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
+          PR_INDEX: ${{ needs.check-pr-status.outputs.pr_number }}
+          RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
         run: |
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
-          tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_SERVER }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
+          tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
           tea pr m --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
-          

From 031639383fb5eb3ca022bee7737b441a1a5980e5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 10:10:08 -0500
Subject: [PATCH 44/57] Tweaking PR merge step.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 520616f7..7512ca5f 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -161,4 +161,4 @@ jobs:
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-          tea pr m --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
+          tea pr m --repo ${{ github.repository }}--message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}

From cd7b7decbf039fc9b5d7561f208fd74b616d5973 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 10:10:50 -0500
Subject: [PATCH 45/57] Typo fix, L156

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 7512ca5f..162fd2d4 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -153,7 +153,7 @@ jobs:
           up: true
           up-opts: -d --dry-run
 
-      - name: ITea CLI Setup & PR Merge
+      - name: Tea CLI Setup & PR Merge
         env:
           PR_INDEX: ${{ needs.check-pr-status.outputs.pr_number }}
           RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}

From 0f129818a8f15ac00f5cc9f6fe182566fca4bce5 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 10:17:43 -0500
Subject: [PATCH 46/57] Typo fix, L158

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 162fd2d4..3ed68e99 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,10 +155,11 @@ jobs:
 
       - name: Tea CLI Setup & PR Merge
         env:
-          PR_INDEX: ${{ needs.check-pr-status.outputs.pr_number }}
+          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
           RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
         run: |
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
+          echo "${PR_INDEX}"
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
           tea pr m --repo ${{ github.repository }}--message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}

From 75a25d155afefb1fe39d858e4a904303209ba612 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 11:27:33 -0500
Subject: [PATCH 47/57] Echo debug for merge

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 3ed68e99..a38eadec 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -158,6 +158,7 @@ jobs:
           PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
           RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
         run: |
+          echo ${PR_INDEX}
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           echo "${PR_INDEX}"

From 93c8da4f0976e31d3907961b802cdd382e0c953f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 11:29:55 -0500
Subject: [PATCH 48/57] Echo debug for merge

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index a38eadec..03416379 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -163,4 +163,4 @@ jobs:
           chmod +x /usr/local/bin/tea
           echo "${PR_INDEX}"
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-          tea pr m --repo ${{ github.repository }}--message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
+          tea pr m --repo ${{ github.repository }}--message "Automatically merged by Gitea Actions" ${PR_INDEX}

From 6da70adef87f179e123e18a233660b425bda3f40 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 11:37:39 -0500
Subject: [PATCH 49/57] Typo fix, L166

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 03416379..36899537 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -163,4 +163,4 @@ jobs:
           chmod +x /usr/local/bin/tea
           echo "${PR_INDEX}"
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-          tea pr m --repo ${{ github.repository }}--message "Automatically merged by Gitea Actions" ${PR_INDEX}
+          tea pr m --repo ${{ github.repository }} --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}

From 785258035be64bb1ee001d76e4dfc49a852047cf Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 11:51:33 -0500
Subject: [PATCH 50/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 36899537..b978289e 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -154,13 +154,10 @@ jobs:
           up-opts: -d --dry-run
 
       - name: Tea CLI Setup & PR Merge
-        env:
-          PR_INDEX: ${{ needs.check-and-create-pr.outputs.pr_number }}
-          RINOA_GITEA_URL: ${{ vars.RINOA_GITEA_URL }}
         run: |
           echo ${PR_INDEX}
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
-          echo "${PR_INDEX}"
-          tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"          
-          tea pr m --repo ${{ github.repository }} --message "Automatically merged by Gitea Actions" --output table ${PR_INDEX}
+          tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
+          tea pr ls --repo ${{ github.repository }} --state open --output csv
+          
\ No newline at end of file

From 7b5d1ed92a64dde1c13c25093696e491daaf2b87 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 11:59:00 -0500
Subject: [PATCH 51/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index b978289e..46320249 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,7 +155,7 @@ jobs:
 
       - name: Tea CLI Setup & PR Merge
         run: |
-          echo ${PR_INDEX}
+          echo ${{ gitea.ref_name }}
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"

From ba84803f2694a2e5f443f91366cf4e43ffd8a821 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 12:09:07 -0500
Subject: [PATCH 52/57] Curiosity...

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 46320249..a3c4fe1a 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -156,8 +156,21 @@ jobs:
       - name: Tea CLI Setup & PR Merge
         run: |
           echo ${{ gitea.ref_name }}
+          echo ${{ gitea.server_url }}
+          echo ${{ gitea.repository.full_name }}
+          echo ${{ gitea.actor }}
+          echo ${{ gitea.event.pull_request.number }}
+          echo ${{ gitea.event.pull_request.head.sha }}
+          echo ${{ gitea.event.pull_request.base.sha }}
+          echo ${{ gitea.event.pull_request.title }}
+          echo ${{ gitea.event.pull_request.body }}
+          echo ${{ gitea.event.pull_request.user.login }}
+          echo ${{ gitea.event.pull_request.user.email }}
+          echo ${{ gitea.event.pull_request.user.name }}
+          echo ${{ gitea.event.pull_request.user.username }}
+          echo ${{ gitea.event.pull_request.user.full_name }}
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
-          tea pr ls --repo ${{ github.repository }} --state open --output csv
+          tea pr ls --repo ${{ github.repository }} --state open --output csv 
           
\ No newline at end of file

From 8631d241b0594ae6fcc33a93efd2eaf1f589b76c Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 12:23:52 -0500
Subject: [PATCH 53/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index a3c4fe1a..8c108a1a 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -156,21 +156,9 @@ jobs:
       - name: Tea CLI Setup & PR Merge
         run: |
           echo ${{ gitea.ref_name }}
-          echo ${{ gitea.server_url }}
-          echo ${{ gitea.repository.full_name }}
-          echo ${{ gitea.actor }}
-          echo ${{ gitea.event.pull_request.number }}
-          echo ${{ gitea.event.pull_request.head.sha }}
-          echo ${{ gitea.event.pull_request.base.sha }}
-          echo ${{ gitea.event.pull_request.title }}
-          echo ${{ gitea.event.pull_request.body }}
-          echo ${{ gitea.event.pull_request.user.login }}
-          echo ${{ gitea.event.pull_request.user.email }}
-          echo ${{ gitea.event.pull_request.user.name }}
-          echo ${{ gitea.event.pull_request.user.username }}
-          echo ${{ gitea.event.pull_request.user.full_name }}
+
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
-          tea pr ls --repo ${{ github.repository }} --state open --output csv 
+          tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | xargs -I {} tea pr merge --repo ${{ github.repository }} --title "Auto-merging PR" --output table 
           
\ No newline at end of file

From 4a0236220ccc2deb783a4167e26ee43eff0b2af2 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 12:30:37 -0500
Subject: [PATCH 54/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 8c108a1a..9fcc4a7a 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -160,5 +160,5 @@ jobs:
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
-          tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | xargs -I {} tea pr merge --repo ${{ github.repository }} --title "Auto-merging PR" --output table 
+          tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}'
           
\ No newline at end of file

From e50041f69ba8675c261f8d8812b8f09a3cf711f3 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 12:46:01 -0500
Subject: [PATCH 55/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 9fcc4a7a..953e733f 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -155,10 +155,9 @@ jobs:
 
       - name: Tea CLI Setup & PR Merge
         run: |
-          echo ${{ gitea.ref_name }}
-
           curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea
           chmod +x /usr/local/bin/tea
+          echo "Merging PR..."
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
-          tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}'
-          
\ No newline at end of file
+          pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | sed -e 's|"||g')
+          tea pr m --repo ${{ gitea.ref_name }} --output table --title "Auto Merge" --message "Merged by ${{ gitea.actor }}"
\ No newline at end of file

From a43c9ef0406b6fa752f02551dd68eb2e0f25f51e Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 12:52:18 -0500
Subject: [PATCH 56/57] Small fixes.

---
 .gitea/workflows/branch-sonarscan-pr-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/branch-sonarscan-pr-merge.yml b/.gitea/workflows/branch-sonarscan-pr-merge.yml
index 953e733f..dbfd2629 100644
--- a/.gitea/workflows/branch-sonarscan-pr-merge.yml
+++ b/.gitea/workflows/branch-sonarscan-pr-merge.yml
@@ -160,4 +160,4 @@ jobs:
           echo "Merging PR..."
           tea login add --name gitea-rinoa --url "${{ vars.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token "${{ secrets.BOT_GITEA_TOKEN }}"
           pr_index=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep "${{ gitea.ref_name }}" | awk -F, '{print $1}' | sed -e 's|"||g')
-          tea pr m --repo ${{ gitea.ref_name }} --output table --title "Auto Merge" --message "Merged by ${{ gitea.actor }}"
\ No newline at end of file
+          tea pr m --repo ${{ gitea.ref_name }} --output table --title "Auto Merge" --message "Merged by ${{ gitea.actor }}" ${pr_index}
\ No newline at end of file

From e9367e26d86a99bffa3075e82e286e8810a89b2f Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Sat, 21 Dec 2024 13:09:50 -0500
Subject: [PATCH 57/57] Removing Zitadel as part of testing.

---
 docker-compose.yml | 50 ----------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c3b47446..1cd8800a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6991,56 +6991,6 @@ services:
         target: /opt/zammad/storage
         type: volume
         volume: {}
-  zitadel:
-    container_name: zitadel
-    image: ghcr.io/zitadel/zitadel:latest
-    command: 'start-from-init --masterkeyFromEnv --tlsMode external'
-    # depends_on:
-    #   zitadel-pg-db:
-    #     condition: 'service_healthy'
-    environment:
-      ZITADEL_DATABASE_POSTGRES_HOST: zitadel-pg-db
-      ZITADEL_DATABASE_POSTGRES_PORT: 5432
-      ZITADEL_DATABASE_POSTGRES_DATABASE: zitadel
-      ZITADEL_DATABASE_POSTGRES_USER_USERNAME: zitadel
-      ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: ${ZITADEL_DB_PASSWORD}
-      ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE: disable
-      ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME: postgres
-      ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
-      ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE: disable
-      ZITADEL_EXTERNALSECURE: true
-      ZITADEL_EXTERNALPORT: 443
-      ZITADEL_EXTERNALDOMAIN: zitadel.trez.wtf
-      ZITADEL_MASTERKEY: ${ZITADEL_MASTER_KEY}
-    expose:
-      - 8080
-    labels:
-      - swag=enable
-      - swag_proto=http
-      - swag_port=8080
-      - swag_url=zitadel.${MY_TLD}
-      - homepage.group=System Administration
-      - homepage.name=Zitadel
-      - homepage.href=https://zitadel.${MY_TLD}
-      - homepage.icon=zitadel.svg
-      - homepage.description=Centralized authentication management
-  zitadel-pg-db:
-    container_name: zitadel-pg-db
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
-    expose:
-      - 5432
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-d", "zitadel", "-U", "postgres"]
-      interval: '10s'
-      timeout: '30s'
-      retries: 5
-      start_period: '20s'
-    image: postgres:16-alpine
-    restart: always
-    volumes: 
-      - zitadel-pg-db:/var/lib/postgresql/data
 volumes:
   authelia-pg-db:
     name: compose_authelia-pg-db