Makefile: fix lint-go with workflow version and project Go toolchain

This patch updates Makefile to use GOLANGCI_VERSION from
ci.yaml (fallback to tools/go.mod) and GOTOOLCHAIN from go.mod
when installing so golangci-lint is built with the project’s Go version
also adds inline comments to skip gosec and revive lint.

Signed-off-by: Shiv Verma <shverma@redhat.com>

Author: pratap0007

Makefile

@@ -12,8 +12,8 @@ M = $(shell printf "\033[34;1m🐱\033[0m")
 TIMEOUT_UNIT = 5m
 TIMEOUT_E2E  = 20m
 
-# Get golangci_version from tools/go.mod to eliminate the manual bump
-GOLANGCI_VERSION = $(shell cat tools/go.mod | grep golangci-lint | awk '{ print $$3 }')
+# Get golangci version from workflow to match CI; fallback to tools/go.mod
+GOLANGCI_VERSION = $(or $(shell yq '.jobs.linting.steps[] | select(.name == "golangci-lint") | .with.version' .github/workflows/ci.yaml 2>/dev/null),$(shell grep 'golangci/golangci-lint/v2' tools/go.mod | awk '{print $$3}'))
 
 YAML_FILES := $(shell find . -type f -regex ".*y[a]ml" -print)
 
@@ -96,14 +96,14 @@ test: test-unit ## run all tests
 .PHONY: lint
 lint: lint-go goimports lint-yaml  ## run all linters
 
-GOLANGCILINT = $(BIN)/golangci-lint
+GOLANGCILINT = $(or $(GOLANGCILINT_BIN),$(BIN)/golangci-lint)
 $(BIN)/golangci-lint: ; $(info $(M) getting golangci-lint $(GOLANGCI_VERSION))
-	cd tools; GOBIN=$(BIN) $(GO) install -mod=mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_VERSION)
+	@mkdir -p $(BIN)
+	GOTOOLCHAIN=go$$(grep '^go ' go.mod | awk '{print $$2}') GOBIN=$(BIN) $(GO) install -mod=mod github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_VERSION)
 
 .PHONY: lint-go
 lint-go: | $(GOLANGCILINT) ; $(info $(M) running golangci-lint…) @ ## Run golangci-lint
 	$Q $(GOLANGCILINT) run --modules-download-mode=vendor --max-issues-per-linter=0 --max-same-issues=0 --timeout 10m
-	@rm -f $(GOLANGCILINT)
 
 GOIMPORTS = $(BIN)/goimports
 $(GOIMPORTS): ; $(info $(M) getting goimports )

cmd/tkn/main.go

@@ -39,6 +39,7 @@ func main() {
 		}
 
 		// if we have found the plugin then sysexec it by replacing current process.
+		// #nosec G702 -- exCmd is from our plugin discovery path, not user input
 		if err := syscall.Exec(exCmd, append([]string{exCmd}, os.Args[2:]...), os.Environ()); err != nil {
 			fmt.Fprintf(os.Stderr, "Command finished with error: %v", err)
 			os.Exit(127)

pkg/cmd/version/version.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//nolint:revive // package name matches stdlib by design
 package version
 
 import (
@@ -216,6 +217,7 @@ func (cli *Client) getRelease(url string) (ghversion GHVersion, err error) {
 		return ghversion, errors.Wrap(err, "failed to fetch the latest version")
 	}
 
+	// #nosec G704 -- URL is from our release API, not user-controlled
 	res, err := cli.httpClient.Do(req)
 	defer func() {
 		err := res.Body.Close()

pkg/cmd/version/version_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package version
+package version //nolint:revive
 
 import (
 	"context"

pkg/log/log.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//nolint:revive // package name matches stdlib by design
 package log
 
 import "k8s.io/apimachinery/pkg/runtime/schema"

pkg/log/writer.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package log
+package log //nolint:revive
 
 import (
 	"fmt"

pkg/plugins/plugins.go

@@ -71,6 +71,7 @@ func GetAllTknPluginFromPaths() []string {
 					continue
 				}
 				fpath := filepath.Join(path, file.Name())
+				// #nosec G703 -- fpath is from filepath.Join with validated path
 				info, err := os.Stat(fpath)
 				if err != nil {
 					continue

pkg/version/version.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package version
+package version //nolint:revive
 
 import (
 	"context"

pkg/version/version_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package version
+package version //nolint:revive
 
 import (
 	"context"