Merge pull request #233 from sapcc/install-goimports

Author: SuperSandro2000

Makefile

@@ -20,6 +20,9 @@ default: build-all
 run: build/go-makefile-maker
 	./build/go-makefile-maker
 
+install-goimports: FORCE
+	@if ! hash goimports 2>/dev/null; then printf "\e[1;36m>> Installing goimports (this may take a while)...\e[0m\n"; go install golang.org/x/tools/cmd/goimports@latest; fi
+
 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/cmd/golangci-lint@latest; fi
 
@@ -110,7 +113,7 @@ check-dependency-licenses: FORCE install-go-licence-detector
 	@printf "\e[1;36m>> go-licence-detector\e[0m\n"
 	@go list -m -mod=readonly -json all | go-licence-detector -includeIndirect -rules .license-scan-rules.json -overrides .license-scan-overrides.jsonl
 
-goimports: FORCE
+goimports: FORCE install-goimports
 	@printf "\e[1;36m>> goimports -w -local https://github.com/sapcc/go-makefile-maker\e[0m\n"
 	@goimports -w -local github.com/sapcc/go-makefile-maker $(patsubst $(shell awk '$$1 == "module" {print $$2}' go.mod)%,.%/*.go,$(shell go list ./...))
 
@@ -136,6 +139,7 @@ help: FORCE
 	@printf "  \e[36mhelp\e[0m                         Display this help.\n"
 	@printf "\n"
 	@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-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"

internal/makefile/makefile.go

@@ -77,6 +77,16 @@ endif
 
 	var prepareStaticRecipe []string
 	if isGolang {
+		prepare.addRule(rule{
+			description: "Install goimports required by goimports/static-check",
+			phony:       true,
+			target:      "install-goimports",
+			recipe: []string{
+				`@if ! hash goimports 2>/dev/null; then` +
+					` printf "\e[1;36m>> Installing goimports (this may take a while)...\e[0m\n";` +
+					` go install golang.org/x/tools/cmd/goimports@latest; fi`,
+			},
+		})
 		prepare.addRule(rule{
 			description: "Install golangci-lint required by run-golangci-lint/static-check",
 			phony:       true,
@@ -438,21 +448,20 @@ endif
 
 		if isGolang {
 			reuseConfigFile := "REUSE.toml"
-			must.Succeed(os.WriteFile(reuseConfigFile, reuseConfig, 0666))
+			must.Succeed(os.WriteFile(reuseConfigFile, reuseConfig, 0o666))
 
 			licenseRulesFile := ".license-scan-rules.json"
-			must.Succeed(os.WriteFile(licenseRulesFile, licenseRules, 0666))
+			must.Succeed(os.WriteFile(licenseRulesFile, licenseRules, 0o666))
 
 			scanOverridesFile := ".license-scan-overrides.jsonl"
-			must.Succeed(os.WriteFile(scanOverridesFile, scanOverrides, 0666))
+			must.Succeed(os.WriteFile(scanOverridesFile, scanOverrides, 0o666))
 
 			dev.addRule(rule{
 				description:   "Check all dependency licenses using go-licence-detector.",
 				target:        "check-dependency-licenses",
 				phony:         true,
 				prerequisites: []string{"install-go-licence-detector"},
 				recipe: []string{
-
 					`@printf "\e[1;36m>> go-licence-detector\e[0m\n"`,
 					fmt.Sprintf(`@go list -m -mod=readonly -json all | go-licence-detector -includeIndirect -rules %s -overrides %s`,
 						licenseRulesFile, scanOverridesFile),
@@ -475,9 +484,10 @@ endif
 		})
 
 		dev.addRule(rule{
-			description: "Run goimports on all non-vendored .go files",
-			target:      "goimports",
-			phony:       true,
+			description:   "Run goimports on all non-vendored .go files",
+			phony:         true,
+			target:        "goimports",
+			prerequisites: []string{"install-goimports"},
 			recipe: []string{
 				fmt.Sprintf(`@printf "\e[1;36m>> goimports -w -local %s\e[0m\n"`, cfg.Metadata.URL),
 				fmt.Sprintf(`@goimports -w -local %s %s`, sr.ModulePath, allSourceFilesExpr),