Merge pull request #94 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

.golangci.yaml

@@ -89,7 +89,7 @@ formatters:
       sections:
         - standard # Standard section: captures all standard packages.
         - default # Default section: contains all imports that could not be matched to another section type.
-        - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
+        - prefix(github.com/cert-manager/csi-lib) # Custom section: groups all imports with the specified Prefix.
         - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
         - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
   exclusions:

klone.yaml

@@ -9,55 +9,55 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/oci-build
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: e8fadfa09b889ff15b0bd05e00fa62c971a61a7a
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/tools

make/_shared/go/.golangci.override.yaml

@@ -72,7 +72,7 @@ formatters:
       sections:
         - standard # Standard section: captures all standard packages.
         - default # Default section: contains all imports that could not be matched to another section type.
-        - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
+        - prefix({{REPO-NAME}}) # Custom section: groups all imports with the specified Prefix.
         - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
         - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
   exclusions:

make/_shared/go/01_mod.mk

@@ -16,6 +16,14 @@ ifndef bin_dir
 $(error bin_dir is not set)
 endif
 
+ifndef repo_name
+$(error repo_name is not set)
+endif
+
+ifndef golangci_lint_config
+$(error golangci_lint_config is not set)
+endif
+
 golangci_lint_override := $(dir $(lastword $(MAKEFILE_LIST)))/.golangci.override.yaml
 
 .PHONY: go-workspace
@@ -101,7 +109,6 @@ verify-govulncheck: | $(NEEDS_GOVULNCHECK)
 
 endif # govulncheck_skip
 
-ifdef golangci_lint_config
 
 .PHONY: generate-golangci-lint-config
 ## Generate a golangci-lint configuration file
@@ -115,6 +122,7 @@ generate-golangci-lint-config: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(bin_dir)/s
 	cp $(golangci_lint_config) $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	$(YQ) -i 'del(.linters.enable)' $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	$(YQ) eval-all -i '. as $$item ireduce ({}; . * $$item)' $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_override)
+	$(YQ) -i '(.. | select(tag == "!!str")) |= sub("{{REPO-NAME}}", "$(repo_name)")' $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	mv $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_config)
 
 shared_generate_targets += generate-golangci-lint-config
@@ -150,5 +158,3 @@ fix-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(NEEDS_GCI) $(bin_dir)/
 				popd >/dev/null; \
 				echo ""; \
 			done
-
-endif