Skip to content

Adopt Google api-linter #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jul 10, 2020
Merged

Adopt Google api-linter #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0dbef67
Add api-linter config.
alexshtin Jul 8, 2020
6cc71b6
Merge branch 'master' into feature/api-linter
alexshtin Jul 9, 2020
201a19c
Move linter configs.
alexshtin Jul 9, 2020
d5bdcc2
Save progress.
alexshtin Jul 9, 2020
6b71f9a
Complete api-linter.yaml.
alexshtin Jul 9, 2020
daabdfd
Regenerate go code.
alexshtin Jul 9, 2020
8196a91
Update code for proto changes.
alexshtin Jul 10, 2020
1a880e5
Merge branch 'master' into feature/api-linter
alexshtin Jul 10, 2020
ca6c4cc
Update api and sdk.
alexshtin Jul 10, 2020
91c19fb
Update code for proto changes.
alexshtin Jul 10, 2020
36592ea
Fix comments.
alexshtin Jul 10, 2020
8bb7bf7
Merge branch 'master' into feature/api-linter
alexshtin Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ all: update-tools clean proto bins check test
clean: clean-bins clean-test-results

# Recompile proto files.
proto: clean-proto install-proto-submodule protoc fix-proto-path proto-mock goimports-proto
proto: clean-proto install-proto-submodule buf api-linter protoc fix-proto-path proto-mock goimports-proto
Copy link
Contributor Author

@alexshtin alexshtin Jul 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a huge PR but actually only Makefile and content of proto dir worth reviewing. All the rest is just mechanical replaces.


# Update proto submodule from remote and recompile proto files.
update-proto: clean-proto update-proto-submodule protoc fix-proto-path update-go-api proto-mock goimports-proto gomodtidy
update-proto: clean-proto update-proto-submodule buf api-linter protoc fix-proto-path update-go-api proto-mock goimports-proto gomodtidy

# Build all docker images.
docker-images:
Expand Down Expand Up @@ -80,8 +80,9 @@ override TEST_TAG := -tags $(TEST_TAG)
endif

PROTO_ROOT := proto
PROTO_DIRS = $(sort $(dir $(shell find $(PROTO_ROOT)/internal -name "*.proto")))
PROTO_IMPORT := $(PROTO_ROOT)/internal:$(PROTO_ROOT)/api:$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
PROTO_FILES = $(shell find ./$(PROTO_ROOT)/internal -name "*.proto")
PROTO_DIRS = $(sort $(dir $(PROTO_FILES)))
PROTO_IMPORTS := -I=$(PROTO_ROOT)/internal -I=$(PROTO_ROOT)/api -I=$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf
PROTO_OUT := api

ALL_SRC := $(shell find . -name "*.go" | grep -v -e "^$(PROTO_OUT)")
Expand Down Expand Up @@ -116,6 +117,8 @@ update-checkers:
GO111MODULE=off go get -u golang.org/x/lint/golint
GO111MODULE=off go get -u honnef.co/go/tools/cmd/staticcheck
GO111MODULE=off go get -u github.com/kisielk/errcheck
GO111MODULE=off go get -u github.com/googleapis/api-linter/cmd/api-linter
GO111MODULE=off go get -u github.com/bufbuild/buf/cmd/buf

update-mockgen:
@printf $(COLOR) "Install/update mockgen tool..."
Expand Down Expand Up @@ -146,7 +149,7 @@ install-proto-submodule:
protoc: $(PROTO_OUT)
@printf $(COLOR) "Build proto files..."
# Run protoc separately for each directory because of different package names.
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc --proto_path=$(PROTO_IMPORT) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto$(NEWLINE))
$(foreach PROTO_DIR,$(PROTO_DIRS),protoc $(PROTO_IMPORTS) --gogoslick_out=Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,plugins=grpc,paths=source_relative:$(PROTO_OUT) $(PROTO_DIR)*.proto$(NEWLINE))

fix-proto-path:
mv -f $(PROTO_OUT)/temporal/server/api/* $(PROTO_OUT) && rm -rf $(PROTO_OUT)/temporal
Expand Down Expand Up @@ -222,6 +225,14 @@ errcheck:
@printf $(COLOR) "Run errcheck..."
@errcheck ./... || true

api-linter:
@printf $(COLOR) "Running api-linter..."
@api-linter --set-exit-status --output-format=summary $(PROTO_IMPORTS) --config=$(PROTO_ROOT)/api-linter.yaml $(PROTO_FILES)

buf:
@printf $(COLOR) "Running buf linter..."
@(cd $(PROTO_ROOT) && buf check lint)

check: copyright goimports-check lint vet staticcheck errcheck

##### Tests #####
Expand Down
370 changes: 185 additions & 185 deletions api/adminservice/v1/request_response.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions api/adminservice/v1/service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions api/adminservicemock/v1/service.pb.mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading