Merge pull request #4685 from afbjorklund/lint-bindata

Make the generated files pass gofmt and golint
kubernetes · Jul 5, 2019 · 24bb4f3 · 24bb4f3
2 parents 11f8c61 + 801cd01
commit 24bb4f3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -200,10 +200,14 @@ test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
 pkg/minikube/assets/assets.go: $(shell find deploy/addons -type f)
 	which go-bindata || GO111MODULE=off GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
 	PATH="$(PATH):$(GOPATH)/bin" go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
+	-gofmt -s -w $@
 
 pkg/minikube/translate/translations.go: $(shell find translations/ -type f)
 	which go-bindata || GO111MODULE=off GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...
 	PATH="$(PATH):$(GOPATH)/bin" go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/...
+	-gofmt -s -w $@
+	@#golint: Json should be JSON (compat sed)
+	@sed -i -e 's/Json/JSON/' $@ && rm -f ./-e
 
 .PHONY: cross
 cross: out/minikube-linux-$(GOARCH) out/minikube-darwin-amd64 out/minikube-windows-amd64.exe