From e8b6b8487e11419efd446e0b104e775cd083f77b Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <t+github@chainguard.dev>
Date: Tue, 5 Aug 2025 05:51:21 -0400
Subject: [PATCH] fix makefile template, lint issues

---
 .golangci.yml   | 4 +++-
 Makefile        | 4 ++--
 Makefile.tmpl   | 4 ++--
 lint-install.go | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index a9622e3..fc9536d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -175,7 +175,7 @@ linters:
           arguments:
             - max-lit-count: "5"
               allow-strs: '"","\n"'
-              allow-ints: "0,1,2,3,256,1024"
+              allow-ints: "0,1,2,3,256,1024,0o600,0o700,0o755"
               allow-floats: "0.0,0.,1.0,1.,2.0,2."
         - name: cognitive-complexity
           arguments: [50]
@@ -189,6 +189,8 @@ linters:
           disabled: true
         - name: max-public-structs
           arguments: [10]
+        - name: flag-parameter # fixes are difficult
+          disabled: true
 
     rowserrcheck:
       # database/sql is always checked.
diff --git a/Makefile b/Makefile
index b9018c2..4c0bbea 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ endif
 LINTERS :=
 FIXERS :=
 
-SHELLCHECK_VERSION ?= v0.8.0
+SHELLCHECK_VERSION ?= v0.10.0
 SHELLCHECK_BIN := $(LINT_ROOT)/out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)
 $(SHELLCHECK_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
@@ -70,7 +70,7 @@ FIXERS += golangci-lint-fix
 golangci-lint-fix: $(GOLANGCI_LINT_BIN)
 	find . -name go.mod -execdir "$(GOLANGCI_LINT_BIN)" run -c "$(GOLANGCI_LINT_CONFIG)" --fix \;
 
-YAMLLINT_VERSION ?= 1.27.1
+YAMLLINT_VERSION ?= 1.37.1
 YAMLLINT_ROOT := $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
 YAMLLINT_BIN := $(YAMLLINT_ROOT)/dist/bin/yamllint
 $(YAMLLINT_BIN):
diff --git a/Makefile.tmpl b/Makefile.tmpl
index 4826cd0..25ff3e9 100644
--- a/Makefile.tmpl
+++ b/Makefile.tmpl
@@ -44,7 +44,7 @@ shellcheck-fix: $(SHELLCHECK_BIN)
 {{ end -}}
 
 {{ if .Dockerfile -}}
-HADOLINT_VERSION ?= v2.12.0
+HADOLINT_VERSION ?= v2.12.1-beta
 HADOLINT_BIN := $(LINT_ROOT)/out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)
 $(HADOLINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
@@ -61,7 +61,7 @@ hadolint-lint: $(HADOLINT_BIN)
 
 {{ if .Go -}}
 GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.3.0
+GOLANGCI_LINT_VERSION ?= v2.3.1
 GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
diff --git a/lint-install.go b/lint-install.go
index 4191c3d..d2ad684 100644
--- a/lint-install.go
+++ b/lint-install.go
@@ -72,6 +72,7 @@ func applicableLinters(root string) (map[Language]bool, error) {
 				found[Shell] = true
 			case strings.HasSuffix(path, ".yml"), strings.HasSuffix(path, ".yaml"):
 				found[YAML] = true
+			default:
 			}
 
 			return nil