-
Notifications
You must be signed in to change notification settings - Fork 104
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.
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
QoL: wiring up tfplugindocs to the code generation
#170
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,26 @@ | ||
| TEST?=$$(go list ./...) | ||
| GOFMT_FILES?=$$(find . -name '*.go') | ||
| PKG_NAME=tls | ||
| GOLANGCILINT_INSTALLED := $(shell command -v golangci-lint 2> /dev/null) | ||
|
|
||
| default: build | ||
|
|
||
| build: fmtcheck | ||
| go install | ||
| build: | ||
| go build -v ./... | ||
|
|
||
| test: fmtcheck | ||
| go test -i $(TEST) || exit 1 | ||
| echo $(TEST) | \ | ||
| xargs -t -n4 go test $(TESTARGS) -timeout=120s -parallel=4 | ||
| lint: | ||
| ifndef GOLANGCILINT_INSTALLED | ||
| $(error "Please install 'golangci-lint' (https://golangci-lint.run/)") | ||
| endif | ||
| golangci-lint run | ||
|
|
||
| testacc: fmtcheck | ||
| TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m | ||
|
|
||
| vet: | ||
| @echo "go vet ." | ||
| @go vet $$(go list ./...) ; if [ $$? -eq 1 ]; then \ | ||
| echo ""; \ | ||
| echo "Vet found suspicious constructs. Please check the reported constructs"; \ | ||
| echo "and fix them if necessary before submitting the code for review."; \ | ||
| exit 1; \ | ||
| fi | ||
| generate: | ||
| go generate ./... | ||
|
|
||
| fmt: | ||
| gofmt -w $(GOFMT_FILES) | ||
|
|
||
| fmtcheck: | ||
| @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" | ||
|
|
||
| errcheck: | ||
| @sh -c "'$(CURDIR)/scripts/errcheck.sh'" | ||
| gofmt -s -w -e . | ||
|
|
||
| test-compile: | ||
| @if [ "$(TEST)" = "./..." ]; then \ | ||
| echo "ERROR: Set TEST to a specific package. For example,"; \ | ||
| echo " make test-compile TEST=./$(PKG_NAME)"; \ | ||
| exit 1; \ | ||
| fi | ||
| go test -c $(TEST) $(TESTARGS) | ||
| test: | ||
| go test -v -cover -timeout=120s -parallel=4 ./... | ||
|
|
||
| .PHONY: build test testacc vet fmt fmtcheck errcheck test-compile | ||
| testacc: | ||
| TF_ACC=1 go test -v -cover -timeout 120m ./... | ||
|
|
||
| .PHONY: build lint generate fmt test testacc | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Open question: Is this Windows compatible? If not, let's just let the underlying shell interpreter bubble its own "command not found" like error.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point.
Until now our makefile for sure couldn't work on Windows (the use of
find,xargsetc. make it impossible).With this revamp, there is actually a chance that it might work on Windows (bar the
makedependency).I'll get rid of this: a "command not found" would deliver pretty much the same thing.
I'll just leave a link to
golangci-lintto help future contributors.