Backport of fix: golangci-lint issues into release/1.21.x#22646

hc-github-team-consul-core wants to merge 1 commit intorelease/1.21.xhashicorp/consul:release/1.21.xfrom

backport/sreeram77/linter-fix/nationally-welcomed-solehashicorp/consul:backport/sreeram77/linter-fix/nationally-welcomed-soleCopy head branch name to clipboard