Merge pull request #408 from shutter-network/schmir/speedup-generate

Speedup 'make generate' and the generate pre-commit hook

Author: schmir

rolling-shutter/Makefile

@@ -6,6 +6,7 @@ TINYGO		?= tinygo
 WASMOPT     ?= wasm-opt
 BINDIR		?= ./bin
 EXECUTABLE	?= ${BINDIR}/rolling-shutter
+GOPATH          ?= $(${GO} env GOPATH)
 
 build:
 	${GO} build ${GOFLAGS} -o ${EXECUTABLE}
@@ -37,8 +38,8 @@ test: test-unit
 test-all: test-unit test-integration
 
 generate: install-codegen-tools
-	${GO} generate -skip="gendocs.go" -x ./...
-	${GO} generate -run="gendocs.go" -x ./...
+	${GO} generate -skip="make docs" -x ./...
+	${GO} generate -run="make docs" -x ./...
 
 coverage:
 	${GO} test ${GOFLAGS} -covermode=count -coverprofile=coverage.out ./...
@@ -50,36 +51,41 @@ clean:
 install-tools: install-codegen-tools install-golangci-lint install-cobra install-gofumpt install-gci install-gotestsum
 
 # code generation tools: pin version
-install-codegen-tools: install-npm install-abigen install-sqlc install-protoc-gen-go  install-oapi-codegen install-stringer install-go-enum install-cobra
+install-codegen-tools: install-npm install-abigen install-sqlc install-protoc-gen-go  install-oapi-codegen install-go-enum
 
-install-npm:
+../contracts/node_modules/.mark-npm-install: ../contracts/package.json ../contracts/package-lock.json
 	cd ../contracts && npm install
+	@touch ../contracts/node_modules/.mark-npm-install
 
-install-sqlc:
+install-npm: ../contracts/node_modules/.mark-npm-install
+
+${GOPATH}/bin/sqlc:
 	${GO} install github.com/kyleconroy/sqlc/cmd/[email protected]
+install-sqlc: ${GOPATH}/bin/sqlc
+
 
-install-go-enum:
+${GOPATH}/bin/go-enum:
 	${GO} install github.com/abice/[email protected]
+install-go-enum: ${GOPATH}/bin/go-enum
 
-install-abigen:
+${GOPATH}/bin/abigen:
 	${GO} install github.com/ethereum/go-ethereum/cmd/[email protected]
+install-abigen: ${GOPATH}/bin/abigen
+
 
-install-protoc-gen-go:
+${GOPATH}/bin/protoc-gen-go:
 	${GO} install google.golang.org/protobuf/cmd/[email protected]
+install-protoc-gen-go: ${GOPATH}/bin/protoc-gen-go
 
-install-oapi-codegen:
-	${GO} install github.com/deepmap/oapi-codegen/cmd/[email protected]
 
-install-stringer:
-	${GO} install golang.org/x/tools/cmd/[email protected]
+${GOPATH}/bin/oapi-codegen:
+	${GO} install github.com/deepmap/oapi-codegen/cmd/[email protected]
+install-oapi-codegen: ${GOPATH}/bin/oapi-codegen
 
 # non code generation tools
 install-golangci-lint:
 	${GO} install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
-install-cobra:
-	${GO} install github.com/spf13/cobra-cli@latest
-
 install-gofumpt:
 	${GO} install mvdan.cc/gofumpt@latest
 

rolling-shutter/docs/Makefile

@@ -0,0 +1,4 @@
+docs: rolling-shutter.md
+
+rolling-shutter.md: ../medley/rootcmd/root.go $(shell find ../cmd -iname '*.go' ! -iname '*_test.go')
+	go run gendocs.go

rolling-shutter/docs/docs.go

@@ -0,0 +1,3 @@
+package docs
+
+//go:generate make docs

rolling-shutter/docs/gendocs.go

@@ -8,7 +8,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/cmd"
 )
 
-//go:generate go run gendocs.go
 func main() {
 	err := doc.GenMarkdownTree(cmd.Command(), "./")
 	if err != nil {

rolling-shutter/main.go

@@ -5,8 +5,6 @@ import (
 	"github.com/shutter-network/rolling-shutter/rolling-shutter/medley/rootcmd"
 )
 
-//go:generate go run -C docs gendocs.go
-
 func main() {
 	rootcmd.Main(cmd.Command())
 }

rolling-shutter/medley/rootcmd/root.go

@@ -25,7 +25,7 @@ var (
 	ArgNameLogformat string = "logformat"
 	logLevelArg      string
 	ArgNameLoglevel  string = "loglevel"
-	reLogLevelConfig        = regexp.MustCompile("^(?:(?P<logger>[\\w/._-]+)?:(?P<level>debug|info|warn(?:ing)?|error|fatal|panic),?)+$")
+	reLogLevelConfig        = regexp.MustCompile(`^(?:([\w/.-]+)?:(debug|info|warn(?:ing)?|error|fatal|panic),?)+$`)
 )
 
 func configureCaller(l zerolog.Logger, short bool) zerolog.Logger {
@@ -116,9 +116,9 @@ func setupLogging() (zerolog.Logger, error) {
 					return l, errors.Wrapf(err, "flag '%s' value '%s' not recognized", ArgNameLoglevel, logLevel)
 				}
 				zerolog.SetGlobalLevel(level)
-				golog.SetLogLevel("*", levelName)
+				_ = golog.SetLogLevel("*", levelName)
 			} else {
-				golog.SetLogLevel(loggerName, levelName)
+				_ = golog.SetLogLevel(loggerName, levelName)
 			}
 		}
 	}