From 39c5be1c46e7a11d18e1277e2ce93b5321dedd44 Mon Sep 17 00:00:00 2001
From: Michael Zalimeni <michael.zalimeni@hashicorp.com>
Date: Tue, 16 Jan 2024 10:12:28 -0500
Subject: [PATCH] ci: Use Consul Go version for Vault int tests

Unlike the Nomad tests (where Nomad is compiled from source and provides
the tests), Vault is installed as a binary, and local Consul tests are
run.

Fixes incorrect version change introduced in #20058.
---
 .github/workflows/test-integrations.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index 73f63ab29a770..700b4fbddd70d 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -80,7 +80,6 @@ jobs:
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     needs:
       - setup
-      - get-go-version
       - dev-build
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -95,7 +94,7 @@ jobs:
           repository: hashicorp/nomad
           ref: ${{ matrix.nomad-version }}
 
-      - name: Install Go (Nomad build)
+      - name: Install Go
         uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
         with:
           # Do not explicitly set Go version here, as it should depend on what Nomad declares.
@@ -114,11 +113,6 @@ jobs:
       - name: Make Nomad dev build
         run: make pkg/linux_amd64/nomad
 
-      - name: Install Go (Consul tests)
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
       - name: Run integration tests
         run: |
           go install gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} && \
@@ -183,17 +177,18 @@ jobs:
         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@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+        with:
+          # We use the current Consul Go version here since Vault is installed as a binary
+          # and tests are run from the Consul repo.
+          go-version: ${{ needs.get-go-version.outputs.go-version }}
+
       - name: Install Vault
         run: |
           wget -q -O /tmp/vault.zip "https://releases.hashicorp.com/vault/${{ env.VAULT_BINARY_VERSION }}/vault_${{ env.VAULT_BINARY_VERSION }}_linux_amd64.zip"
           unzip -d /tmp /tmp/vault.zip
           echo "/tmp" >> $GITHUB_PATH
 
-      - name: Install Go (Consul tests)
-        uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
-        with:
-          go-version: ${{ needs.get-go-version.outputs.go-version }}
-
       - name: Run Connect CA Provider Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"