Run go-makefile-maker

Author: sapcc-bot

.github/workflows/checks.yaml

@@ -29,7 +29,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           check-latest: true
-          go-version: 1.24.3
+          go-version: 1.24.4
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:

.github/workflows/ci.yaml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           check-latest: true
-          go-version: 1.24.3
+          go-version: 1.24.4
       - name: Build all binaries
         run: make build-all
   test:
@@ -47,7 +47,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           check-latest: true
-          go-version: 1.24.3
+          go-version: 1.24.4
       - name: Run tests and generate coverage report
         run: make build/cover.out
       - name: Upload coverage report to Coveralls

.github/workflows/codeql.yaml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/setup-go@v5
         with:
           check-latest: true
-          go-version: 1.24.3
+          go-version: 1.24.4
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:

Makefile

@@ -30,13 +30,16 @@ install-goimports: FORCE
 install-golangci-lint: FORCE
 	@if ! hash golangci-lint 2>/dev/null; then printf "\e[1;36m>> Installing golangci-lint (this may take a while)...\e[0m\n"; go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest; fi
 
+install-modernize: FORCE
+	@if ! hash modernize 2>/dev/null; then printf "\e[1;36m>> Installing modernize (this may take a while)...\e[0m\n"; go install golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest; fi
+
 install-go-licence-detector: FORCE
 	@if ! hash go-licence-detector 2>/dev/null; then printf "\e[1;36m>> Installing go-licence-detector (this may take a while)...\e[0m\n"; go install go.elastic.co/go-licence-detector@latest; fi
 
 install-addlicense: FORCE
 	@if ! hash addlicense 2>/dev/null; then printf "\e[1;36m>> Installing addlicense (this may take a while)...\e[0m\n"; go install github.com/google/addlicense@latest; fi
 
-prepare-static-check: FORCE install-golangci-lint install-go-licence-detector install-addlicense
+prepare-static-check: FORCE install-golangci-lint install-modernize install-go-licence-detector install-addlicense
 
 install-controller-gen: FORCE
 	@if ! hash controller-gen 2>/dev/null; then printf "\e[1;36m>> Installing controller-gen (this may take a while)...\e[0m\n"; go install sigs.k8s.io/controller-tools/cmd/controller-gen@latest; fi
@@ -90,6 +93,10 @@ run-golangci-lint: FORCE install-golangci-lint
 	@golangci-lint config verify
 	@golangci-lint run
 
+run-modernize: FORCE install-modernize
+	@printf "\e[1;36m>> modernize\e[0m\n"
+	@modernize $(GO_TESTPKGS)
+
 build/cover.out: FORCE generate install-setup-envtest | build
 	@printf "\e[1;36m>> Running tests\e[0m\n"
 	KUBEBUILDER_ASSETS=$$(setup-envtest use 1.31 -p path) go test -shuffle=on -p 1 -coverprofile=$@ $(GO_BUILDFLAGS) -ldflags '-s -w $(GO_LDFLAGS)' -covermode=count -coverpkg=$(subst $(space),$(comma),$(GO_COVERPKGS)) $(GO_TESTPKGS)
@@ -98,7 +105,7 @@ build/cover.html: build/cover.out
 	@printf "\e[1;36m>> go tool cover > build/cover.html\e[0m\n"
 	@go tool cover -html $< -o $@
 
-static-check: FORCE run-golangci-lint check-dependency-licenses check-license-headers
+static-check: FORCE run-golangci-lint run-modernize check-dependency-licenses check-license-headers
 
 build:
 	@mkdir $@
@@ -128,6 +135,10 @@ goimports: FORCE install-goimports
 	@printf "\e[1;36m>> goimports -w -local https://github.com/sapcc/ccloud-nodeCIDR-controller\e[0m\n"
 	@goimports -w -local github.com/sapcc/ccloud-nodeCIDR-controller $(patsubst $(shell awk '$$1 == "module" {print $$2}' go.mod)%,.%/*.go,$(shell go list ./...))
 
+modernize: FORCE install-modernize
+	@printf "\e[1;36m>> modernize -fix ./...\e[0m\n"
+	@modernize -fix ./...
+
 clean: FORCE
 	git clean -dxf build
 
@@ -154,6 +165,7 @@ help: FORCE
 	@printf "\e[1mPrepare\e[0m\n"
 	@printf "  \e[36minstall-goimports\e[0m                 Install goimports required by goimports/static-check\n"
 	@printf "  \e[36minstall-golangci-lint\e[0m             Install golangci-lint required by run-golangci-lint/static-check\n"
+	@printf "  \e[36minstall-modernize\e[0m                 Install modernize required by modernize/static-check\n"
 	@printf "  \e[36minstall-go-licence-detector\e[0m       Install-go-licence-detector required by check-dependency-licenses/static-check\n"
 	@printf "  \e[36minstall-addlicense\e[0m                Install addlicense required by check-license-headers/license-headers/static-check\n"
 	@printf "  \e[36mprepare-static-check\e[0m              Install any tools required by static-check. This is used in CI before dropping privileges, you should probably install all the tools using your package manager\n"
@@ -169,6 +181,7 @@ help: FORCE
 	@printf "  \e[36mcheck\e[0m                             Run the test suite (unit tests and golangci-lint).\n"
 	@printf "  \e[36mgenerate\e[0m                          Generate code for Kubernetes CRDs and deepcopy.\n"
 	@printf "  \e[36mrun-golangci-lint\e[0m                 Install and run golangci-lint. Installing is used in CI, but you should probably install golangci-lint using your package manager.\n"
+	@printf "  \e[36mrun-modernize\e[0m                     Install and run modernize. Installing is used in CI, but you should probably install modernize using your package manager.\n"
 	@printf "  \e[36mbuild/cover.out\e[0m                   Run tests and generate coverage report.\n"
 	@printf "  \e[36mbuild/cover.html\e[0m                  Generate an HTML file with source code annotations from the coverage report.\n"
 	@printf "  \e[36mstatic-check\e[0m                      Run static code checks\n"
@@ -179,6 +192,7 @@ help: FORCE
 	@printf "  \e[36mcheck-license-headers\e[0m             Check license headers in all non-vendored .go files.\n"
 	@printf "  \e[36mcheck-dependency-licenses\e[0m         Check all dependency licenses using go-licence-detector.\n"
 	@printf "  \e[36mgoimports\e[0m                         Run goimports on all non-vendored .go files\n"
+	@printf "  \e[36mmodernize\e[0m                         Run modernize on all non-vendored .go files\n"
 	@printf "  \e[36mclean\e[0m                             Run git clean.\n"
 
 .PHONY: FORCE