Merge pull request #25781 from kolyshkin/rm-goimports

Use golangci-lint fmt for pkg/bindings

Author: openshift-merge-bot[bot]

.golangci.yml

@@ -7,7 +7,7 @@ formatters:
     - gofmt
     - goimports
   exclusions:
-    generated: strict
+    generated: disable
 
 linters:
   enable:

Makefile

@@ -478,7 +478,7 @@ podman-testing: bin/podman-testing
 ###
 
 .PHONY: generate-bindings
-generate-bindings:
+generate-bindings: .install.golangci-lint
 ifneq ($(GOOS),darwin)
 	$(GOCMD) generate ./pkg/bindings/... ;
 endif
@@ -1023,10 +1023,6 @@ endif
 install.tools: .install.golangci-lint ## Install needed tools
 	$(MAKE) -C test/tools
 
-.PHONY: .install.goimports
-.install.goimports:
-	$(MAKE) -C test/tools build/goimports
-
 .PHONY: .install.ginkgo
 .install.ginkgo:
 	$(GO) build -o $(GINKGO) ./vendor/github.com/onsi/ginkgo/v2/ginkgo

contrib/cirrus/postbuild.sh

@@ -38,7 +38,6 @@ cd $CIRRUS_WORKING_DIR
 showrun make -C test/tools vendor
 SUGGESTION="run 'make vendor', 'make -C test/tools vendor' and 'make completions' and commit all changes" ./hack/tree_status.sh
 
-showrun make .install.goimports
 showrun make generate-bindings
 SUGGESTION="run 'make generate-bindings' and commit all changes" ./hack/tree_status.sh
 

pkg/bindings/generator/generator.go

@@ -160,16 +160,8 @@ func main() {
 		}
 		closed = true
 
-		// go fmt file
-		gofmt := exec.Command("go", "fmt", out.Name())
-		gofmt.Stderr = os.Stdout
-		if err := gofmt.Run(); err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		// go import file
-		goimport := exec.Command("../../../test/tools/build/goimports", "-w", out.Name())
+		// Format file.
+		goimport := exec.Command("../../../bin/golangci-lint", "fmt", out.Name())
 		goimport.Stderr = os.Stdout
 		if err := goimport.Run(); err != nil {
 			fmt.Println(err)

test/tools/Makefile

@@ -20,14 +20,10 @@ clean:
 
 .PHONY: $(BUILDDIR)
 $(BUILDDIR): \
-	$(BUILDDIR)/goimports \
 	$(BUILDDIR)/go-md2man \
 	$(BUILDDIR)/git-validation \
 	$(BUILDDIR)/swagger
 
-$(BUILDDIR)/goimports: $(SOURCES)
-	$(GO_BUILD) -o $@ ./vendor/golang.org/x/tools/cmd/goimports
-
 $(BUILDDIR)/go-md2man: $(SOURCES)
 	$(GO_BUILD) -o $@ ./vendor/github.com/cpuguy83/go-md2man/v2
 

test/tools/go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.6
 	github.com/go-swagger/go-swagger v0.30.5
 	github.com/vbatts/git-validation v1.2.2
-	golang.org/x/tools v0.30.0
 )
 
 require (
@@ -69,6 +68,7 @@ require (
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.30.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

test/tools/tools.go

@@ -9,5 +9,4 @@ import (
 	_ "github.com/cpuguy83/go-md2man/v2"
 	_ "github.com/go-swagger/go-swagger/cmd/swagger"
 	_ "github.com/vbatts/git-validation"
-	_ "golang.org/x/tools/cmd/goimports"
 )