From 289d99dff47fe62a5b842b5d9654e208b96bfdf8 Mon Sep 17 00:00:00 2001
From: gcs14 <lamelyte@gmail.com>
Date: Mon, 17 Apr 2023 20:38:23 -0500
Subject: [PATCH 1/2] refactor GitHub output command to current version

---
 .github/workflows/build.yaml              | 8 ++++----
 .github/workflows/draft-new-release.yaml  | 2 +-
 .github/workflows/helm-lint.yaml          | 2 +-
 .github/workflows/publish-new-release.yml | 2 +-
 .github/workflows/trivy.yml               | 2 +-
 .github/workflows/veracode.yaml           | 4 ++--
 .github/workflows/verify.yaml             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2c2dda9c2..582b1a810 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,10 +60,10 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
-          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "::set-output name=GPG_PRIVATE_KEY::true"
-          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "::set-output name=GPG_PASSPHRASE::true"
-          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "::set-output name=DOCKER_HUB_TOKEN::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "{SONAR_TOKEN}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "{GPG_PRIVATE_KEY}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "{GPG_PASSPHRASE}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "{DOCKER_HUB_TOKEN}={true}" >> $GITHUB_OUTPUT
           exit 0
 
   build-extensions:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 248f61bc4..414507e91 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -68,7 +68,7 @@ jobs:
           git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
-          echo "::set-output name=commit::$(git rev-parse HEAD)"
+          echo "{commit}={$(git rev-parse HEAD}" >> $GITHUB_OUTPUT
       -
         name: Push new branch
         run: git push origin release/${{ github.event.inputs.version }}
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index ae94c84a7..e3fc09dec 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -52,7 +52,7 @@ jobs:
       run: |
         changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
-          echo "::set-output name=changed::true"
+          echo "{changed}={true}" >> $GITHUB_OUTPUT
         fi
     -
       name: chart-testing (lint)
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index 373c892e7..c42c8cf1d 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -37,7 +37,7 @@ jobs:
         name: Output release version
         id: release-version
         run: |
-          echo "::set-output name=RELEASE_VERSION::${{ env.RELEASE_VERSION }}"
+          echo "{RELEASE_VERSION}={${{ env.RELEASE_VERSION }}}" >> $GITHUB_OUTPUT
 
   # Release: Maven Artifacts
   maven-release:
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index c315e8a07..daf7e9b91 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Resolve git 7-chars sha
         id: git-sha7
         run: |
-          echo "::set-output name=SHA7::${GITHUB_SHA::7}"
+          echo "{SHA7}={${GITHUB_SHA::7}}" >> $GITHUB_OUTPUT
 
   trivy-analyze-config:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index bba9df1b5..d8a8895d5 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -16,8 +16,8 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "::set-output name=ORG_VERACODE_API_ID::true"
-          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "::set-output name=ORG_VERACODE_API_KEY::true"
+          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "{ORG_VERACODE_API_ID}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "{ORG_VERACODE_API_KEY}={true}" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index d9dda3844..50175c652 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "::set-output name=SONAR_TOKEN::true"
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "{SONAR_TOKEN}={true}" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:

From b046cef6cf06d57838889ff3a235dabb0db81660 Mon Sep 17 00:00:00 2001
From: Garrett Smith <lamelyte@gmail.com>
Date: Tue, 18 Apr 2023 06:30:59 -0500
Subject: [PATCH 2/2] Remove curly braces from output statement

---
 .github/workflows/build.yaml              | 8 ++++----
 .github/workflows/draft-new-release.yaml  | 2 +-
 .github/workflows/helm-lint.yaml          | 2 +-
 .github/workflows/publish-new-release.yml | 2 +-
 .github/workflows/trivy.yml               | 2 +-
 .github/workflows/veracode.yaml           | 4 ++--
 .github/workflows/verify.yaml             | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 582b1a810..a701ae362 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -60,10 +60,10 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "{SONAR_TOKEN}={true}" >> $GITHUB_OUTPUT
-          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "{GPG_PRIVATE_KEY}={true}" >> $GITHUB_OUTPUT
-          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "{GPG_PASSPHRASE}={true}" >> $GITHUB_OUTPUT
-          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "{DOCKER_HUB_TOKEN}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PRIVATE_KEY }}" ] && echo "GPG_PRIVATE_KEY=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.GPG_PASSPHRASE }}" ] && echo "GPG_PASSPHRASE=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.DOCKER_HUB_TOKEN }}" ] && echo "DOCKER_HUB_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   build-extensions:
diff --git a/.github/workflows/draft-new-release.yaml b/.github/workflows/draft-new-release.yaml
index 414507e91..22222ba8a 100644
--- a/.github/workflows/draft-new-release.yaml
+++ b/.github/workflows/draft-new-release.yaml
@@ -68,7 +68,7 @@ jobs:
           git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
-          echo "{commit}={$(git rev-parse HEAD}" >> $GITHUB_OUTPUT
+          echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
       -
         name: Push new branch
         run: git push origin release/${{ github.event.inputs.version }}
diff --git a/.github/workflows/helm-lint.yaml b/.github/workflows/helm-lint.yaml
index e3fc09dec..7640d0a38 100644
--- a/.github/workflows/helm-lint.yaml
+++ b/.github/workflows/helm-lint.yaml
@@ -52,7 +52,7 @@ jobs:
       run: |
         changed=$(ct list-changed --config ct.yaml --target-branch main)
         if [[ -n "$changed" ]]; then
-          echo "{changed}={true}" >> $GITHUB_OUTPUT
+          echo "changed=true" >> $GITHUB_OUTPUT
         fi
     -
       name: chart-testing (lint)
diff --git a/.github/workflows/publish-new-release.yml b/.github/workflows/publish-new-release.yml
index c42c8cf1d..06ee58b61 100644
--- a/.github/workflows/publish-new-release.yml
+++ b/.github/workflows/publish-new-release.yml
@@ -37,7 +37,7 @@ jobs:
         name: Output release version
         id: release-version
         run: |
-          echo "{RELEASE_VERSION}={${{ env.RELEASE_VERSION }}}" >> $GITHUB_OUTPUT
+          echo "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
 
   # Release: Maven Artifacts
   maven-release:
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index daf7e9b91..819fec089 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Resolve git 7-chars sha
         id: git-sha7
         run: |
-          echo "{SHA7}={${GITHUB_SHA::7}}" >> $GITHUB_OUTPUT
+          echo "SHA7=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
   trivy-analyze-config:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/veracode.yaml b/.github/workflows/veracode.yaml
index d8a8895d5..c3e7cb7a1 100644
--- a/.github/workflows/veracode.yaml
+++ b/.github/workflows/veracode.yaml
@@ -16,8 +16,8 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "{ORG_VERACODE_API_ID}={true}" >> $GITHUB_OUTPUT
-          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "{ORG_VERACODE_API_KEY}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_VERACODE_API_ID }}" ] && echo "ORG_VERACODE_API_ID=true" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.ORG_VERACODE_API_KEY }}" ] && echo "ORG_VERACODE_API_KEY=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting:
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index 50175c652..a16da4681 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -52,7 +52,7 @@ jobs:
       - name: Check whether secrets exist
         id: secret-presence
         run: |
-          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "{SONAR_TOKEN}={true}" >> $GITHUB_OUTPUT
+          [ ! -z "${{ secrets.SONAR_TOKEN }}" ] && echo "SONAR_TOKEN=true" >> $GITHUB_OUTPUT
           exit 0
 
   verify-formatting: