From 18d79a8070f2d4d76891b4217af7b093f7aa34c6 Mon Sep 17 00:00:00 2001
From: Eddie Torres <torredil@amazon.com>
Date: Mon, 9 Oct 2023 18:58:30 +0000
Subject: [PATCH] Update GitHub workflows

Signed-off-by: Eddie Torres <torredil@amazon.com>
---
 .github/workflows/generate-code-coverage.yaml | 12 ++++----
 .github/workflows/helm-chart-release.yaml     |  2 +-
 .github/workflows/trivy-containers.yaml       |  4 +--
 .github/workflows/trivy.yaml                  |  2 +-
 .github/workflows/unit-tests.yaml             | 19 +++---------
 .github/workflows/verify.yaml                 | 30 -------------------
 6 files changed, 14 insertions(+), 55 deletions(-)
 delete mode 100644 .github/workflows/verify.yaml

diff --git a/.github/workflows/generate-code-coverage.yaml b/.github/workflows/generate-code-coverage.yaml
index 5bb1fa318c..950cb9427a 100644
--- a/.github/workflows/generate-code-coverage.yaml
+++ b/.github/workflows/generate-code-coverage.yaml
@@ -7,14 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout base
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.base.ref }}
 
-      - name: Set up go
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '^1.20.2'
+          go-version-file: 'go.mod'
 
       - name: Generate report
         run: |
@@ -32,12 +32,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PR
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up go
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '^1.20.2'
+          go-version-file: 'go.mod'
 
       - name: Generate report
         run: |
diff --git a/.github/workflows/helm-chart-release.yaml b/.github/workflows/helm-chart-release.yaml
index 1eb790f51b..0c90c77bbf 100644
--- a/.github/workflows/helm-chart-release.yaml
+++ b/.github/workflows/helm-chart-release.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Configure Git
diff --git a/.github/workflows/trivy-containers.yaml b/.github/workflows/trivy-containers.yaml
index 33cc834308..69de477769 100644
--- a/.github/workflows/trivy-containers.yaml
+++ b/.github/workflows/trivy-containers.yaml
@@ -14,7 +14,7 @@ jobs:
     
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - id: set-matrix
         uses: mikefarah/yq@master
@@ -31,7 +31,7 @@ jobs:
     
     steps:
       - name: Scan container image
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@0.12.0
         with:
           image-ref: '${{ matrix.image }}'
           output: 'results.sarif'
diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml
index 275f48e192..bb4b37a44b 100644
--- a/.github/workflows/trivy.yaml
+++ b/.github/workflows/trivy.yaml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@master
+        uses: aquasecurity/trivy-action@0.12.0
         with:
           scan-type: 'fs'
           ignore-unfixed: true
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index 63f9d1f52a..258084ea3f 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -12,25 +12,14 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
     steps:
-      - id: go-cache-paths
-        run: |
-          echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
-          echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
-        shell: bash
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.20.2
-
-      - name: Go Build Cache
-        uses: actions/cache@v3
+        uses: actions/setup-go@v4
         with:
-          path: ${{ steps.go-cache-paths.outputs.go-build }}
-          key: ${{ runner.os }}-cache-${{ hashFiles('**/go.sum') }}
+          go-version-file: 'go.mod'
 
       - name: Run tests
         run: |
-          go test -v  ./cmd/... ./pkg/...
+          go test -v ./cmd/... ./pkg/...
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
deleted file mode 100644
index a20ef41d72..0000000000
--- a/.github/workflows/verify.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Verify
-
-on:
-  push:
-jobs:
-  buildx:
-    runs-on: ubuntu-latest
-    steps:
-      - id: go-cache-paths
-        run: |
-          echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
-          echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.20.2
-
-      - name: Go Build Cache
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.go-cache-paths.outputs.go-build }}
-          key: ${{ runner.os }}-cache-${{ hashFiles('**/go.sum') }}
-
-    # Runs ./hack/verify-all
-      - name: Run make verify
-        run: |
-          make verify