Backport of Pin version of lint-consul-retry into release/1.14.x

backport of commit c9a08b3fe0

.github/workflows/go-tests.yml

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches-ignore:
       - stable-website
-      - 'docs/**'
+      - "docs/**"
-      - 'ui/**'
+      - "ui/**"
-      - 'mktg-**' # Digital Team Terraform-generated branches' prefix
+      - "mktg-**" # Digital Team Terraform-generated branches' prefix
-      - 'backport/docs/**'
+      - "backport/docs/**"
-      - 'backport/ui/**'
+      - "backport/ui/**"
-      - 'backport/mktg-**'
+      - "backport/mktg-**"
   push:
     branches:
       # Push events on the main branch
@@ -64,7 +64,7 @@ jobs:
         run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
       - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
         with:
-        go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - run: make proto-tools
         name: Install protobuf
       - run: make proto-format
@@ -85,14 +85,14 @@ jobs:
       - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     steps:
-    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       # 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@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
         with:
-        go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - run: make codegen-tools
         name: Install deep-copy
       - run: make --always-make deep-copy
@@ -110,14 +110,14 @@ jobs:
       - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large) }}
     steps:
-    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       # 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@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
+      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
         with:
-        go-version-file: 'go.mod'
+          go-version-file: "go.mod"
       - run: go install github.com/reillywatson/enumcover/cmd/enumcover@master && enumcover ./...
       - name: Notify Slack
         if: ${{ failure() }}
@@ -135,8 +135,8 @@ jobs:
         run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
       - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
         with:
-        go-version-file: 'go.mod'
+          go-version-file: "go.mod"
-    - run: go install github.com/hashicorp/lint-consul-retry@master && lint-consul-retry
+      - run: go install github.com/hashicorp/lint-consul-retry@v1.3.0 && lint-consul-retry
       - name: Notify Slack
         if: ${{ failure() }}
         run: .github/scripts/notify_slack.sh

GNUmakefile

@@ -15,6 +15,7 @@ MOG_VERSION='v0.4.0'
 PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
 PROTOC_GEN_GO_BINARY_VERSION="v0.0.1"
 DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
+LINT_CONSUL_RETRY_VERSION='v1.3.0'
 
 MOCKED_PB_DIRS= pbdns
 

build-support/scripts/devtools.sh

@@ -128,12 +128,16 @@ function proto_tools_install {
 }
 
 function lint_install {
+    local lint_consul_retry_version
+    lint_consul_retry_version="$(make --no-print-directory print-LINT_CONSUL_RETRY_VERSION)"
     local golangci_lint_version
     golangci_lint_version="$(make --no-print-directory print-GOLANGCI_LINT_VERSION)"
 
-    install_unversioned_tool \
+    install_versioned_tool \
         'lint-consul-retry' \
-        'github.com/hashicorp/lint-consul-retry@master'
+        'github.com/hashicorp/lint-consul-retry' \
+        "${lint_consul_retry_version}" \
+        'github.com/hashicorp/lint-consul-retry'
 
     install_unversioned_tool \
         'enumcover' \