From a56c27c892be1c2fcae90deb982c35a245893d7d Mon Sep 17 00:00:00 2001
From: Tom Proctor <tomhjp@users.noreply.github.com>
Date: Wed, 31 May 2023 12:27:18 +0100
Subject: [PATCH] Fix syntax for actionlint workflow (#903)

* Fix syntax for actionlint workflow
* Move .github/workflows/setup-test-tools/ -> .github/actions/setup-test-tools/
* Fix reported actionlint failures
---
 .github/{workflows => actions}/setup-test-tools/action.yaml | 0
 .github/workflows/acceptance.yaml                           | 2 +-
 .github/workflows/actionlint.yml                            | 4 +---
 .github/workflows/tests.yaml                                | 6 +++---
 .github/workflows/update-helm-charts-index.yml              | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)
 rename .github/{workflows => actions}/setup-test-tools/action.yaml (100%)

diff --git a/.github/workflows/setup-test-tools/action.yaml b/.github/actions/setup-test-tools/action.yaml
similarity index 100%
rename from .github/workflows/setup-test-tools/action.yaml
rename to .github/actions/setup-test-tools/action.yaml
diff --git a/.github/workflows/acceptance.yaml b/.github/workflows/acceptance.yaml
index 11c33b6..b5ef45a 100644
--- a/.github/workflows/acceptance.yaml
+++ b/.github/workflows/acceptance.yaml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: Setup test tools
-        uses: ./.github/workflows/setup-test-tools
+        uses: ./.github/actions/setup-test-tools
       - name: Create K8s Kind Cluster
         uses: helm/kind-action@fa81e57adff234b2908110485695db0f181f3c67 # v1.7.0
         with:
diff --git a/.github/workflows/actionlint.yml b/.github/workflows/actionlint.yml
index bdee70f..ec209f5 100644
--- a/.github/workflows/actionlint.yml
+++ b/.github/workflows/actionlint.yml
@@ -11,6 +11,4 @@ permissions:
   contents: read
 jobs:
   actionlint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: hashicorp/vault-workflows-common/.github/workflows/actionlint.yaml@main
+    uses: hashicorp/vault-workflows-common/.github/workflows/actionlint.yaml@main
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 661307a..6e90a09 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - uses: ./.github/workflows/setup-test-tools
+      - uses: ./.github/actions/setup-test-tools
       - run: bats --tap --timing ./test/unit
   chart-verifier:
     runs-on: ubuntu-latest
@@ -14,11 +14,11 @@ jobs:
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: Setup test tools
-        uses: ./.github/workflows/setup-test-tools
+        uses: ./.github/actions/setup-test-tools
       - uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
         with:
           go-version: '1.19.2'
-      - run: go install github.com/redhat-certification/chart-verifier@${CHART_VERIFIER_VERSION}
+      - run: go install "github.com/redhat-certification/chart-verifier@${CHART_VERIFIER_VERSION}"
       - run: bats --tap --timing ./test/chart
 permissions:
   contents: read
diff --git a/.github/workflows/update-helm-charts-index.yml b/.github/workflows/update-helm-charts-index.yml
index 4154349..450cc1d 100644
--- a/.github/workflows/update-helm-charts-index.yml
+++ b/.github/workflows/update-helm-charts-index.yml
@@ -15,7 +15,7 @@ jobs:
       - name: verify Chart version matches tag version
         run: |-
           export TAG=${{ github.ref_name }}
-          git_tag=$(echo "${TAG#v}")
+          git_tag="${TAG#v}"
           chart_tag=$(yq r Chart.yaml version)
           if [ "${git_tag}" != "${chart_tag}" ]; then
             echo "chart version (${chart_tag}) did not match git version (${git_tag})"