Backport of update goldenfile checker for running in ent repo into re…

…lease/1.19.x (#21618) backport of commit 678d745 Co-authored-by: jm96441n <[email protected]>
hashicorp · Aug 19, 2024 · c7b9668 · c7b9668
1 parent 94e3ae7
commit c7b9668
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/.github/scripts/goldenfile_checker.sh b/.github/scripts/goldenfile_checker.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 
 # check if there is a diff in the xds testdata directory after running `make envoy-regen`
 echo "regenerating xds files"
-make envoy-regen &>/dev/null
+make envoy-regen
 
 echo "calculating changed files"
 changed_xds_files=$(git --no-pager diff --name-only HEAD "$(git merge-base HEAD "origin/$GITHUB_BRANCH_REF")" | egrep "agent/xds/testdata/.*" || true)

diff --git a/.github/workflows/goldenfile-checker.yml b/.github/workflows/goldenfile-checker.yml
@@ -15,16 +15,29 @@ on:
       - release/*
 
 jobs:
+  get-go-version:
+    uses: ./.github/workflows/reusable-get-go-version.yml
   # checks that there is no diff between the existing golden files
   goldenfile-check:
     runs-on: ubuntu-latest
-
+    needs: 
+      - get-go-version
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # by default the checkout action doesn't checkout all branches
+      # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
+      - name: Setup Git
+        if: ${{ endsWith(github.repository, '-enterprise') }}
+        run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
+      - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+        with:
+          go-version: ${{ needs.get-go-version.outputs.go-version }}
+      - name: Download Modules
+        run: go mod download
       - name: Check for golden file xds tests in diff
         run: ./.github/scripts/goldenfile_checker.sh
         env:
           GITHUB_BRANCH_REF: ${{ github.event.pull_request.head.ref }}
+          CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}