From de0abcc9106e10a4072be1d492fc2180505b7b3c Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <lucas.bajolet@hashicorp.com>
Date: Fri, 7 Jun 2024 18:22:31 +0000
Subject: [PATCH 1/2] backport of commit
 596d2e0998deac2976ca047bf9b9bb5d5de9dbee

---
 .golangci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 656b0373a..d62815ea5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -30,7 +30,6 @@ issues:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - errcheck
     - goimports
     - gosimple
@@ -39,7 +38,6 @@ linters:
     - staticcheck
     - unconvert
     - unused
-    - varcheck
   fast: true
 
 # options for analysis running

From 39953e10a22b65032d79151e4a1aced566f847e9 Mon Sep 17 00:00:00 2001
From: Lucas Bajolet <lucas.bajolet@hashicorp.com>
Date: Fri, 7 Jun 2024 18:23:36 +0000
Subject: [PATCH 2/2] backport of commit
 61bb8e872e8b06590f4fe2c24833b67ce221418c

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ed4630368..2186d22f7 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ install-gen-deps: ## Install dependencies for code generation
 
 install-lint-deps: ## Install linter dependencies
 	@echo "==> Updating linter dependencies..."
-	@curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.52.0
+	@curl -sSfL -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.54.0
 
 dev: ## Build and install a development build
 	@grep 'const VersionPrerelease = ""' version/version.go > /dev/null ; if [ $$? -eq 0 ]; then \