chore: Simplifies makefile #2003
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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,14 +1,10 @@ | ||
| ACCTEST_TIMEOUT?=300m | ||
| PARALLEL_GO_TEST?=20 | ||
|
|
||
| BINARY_NAME=terraform-provider-mongodbatlas | ||
| DESTINATION=./bin/$(BINARY_NAME) | ||
|
|
||
| GOFLAGS=-mod=vendor | ||
| GITTAG=$(shell git describe --always --tags) | ||
| VERSION=$(GITTAG:v%=%) | ||
| LINKER_FLAGS=-s -w -X 'github.com/mongodb/terraform-provider-mongodbatlas/version.ProviderVersion=${VERSION}' | ||
|
|
@@ -35,17 +31,17 @@ install: fmtcheck | |
|
|
||
| .PHONY: test | ||
| test: fmtcheck | ||
| go test ./... -timeout=30s -parallel=4 -race | ||
|
Comment on lines
-38
to
+34
There was a problem hiding this comment. just for reference I see this was included originally for in #1496, but we no longer include these converage reports as PR comments. There was a problem hiding this comment. yes, at the moment we don't include any coverage report |
||
|
|
||
| .PHONY: testacc | ||
| testacc: fmtcheck | ||
| @$(eval VERSION=acc) | ||
| TF_ACC=1 go test ./... -run '$(TEST_REGEX)' -v -parallel '$(PARALLEL_GO_TEST)' $(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -ldflags="$(LINKER_FLAGS)" | ||
|
|
||
| .PHONY: testaccgov | ||
| testaccgov: fmtcheck | ||
| @$(eval VERSION=acc) | ||
| TF_ACC=1 go test ./... -run 'TestAccProjectRSGovProject_CreateWithProjectOwner' -v -parallel 1 "$(TESTARGS) -timeout $(ACCTEST_TIMEOUT) -ldflags=$(LINKER_FLAGS) " | ||
|
|
||
| .PHONY: fmt | ||
| fmt: | ||
|
|
@@ -81,13 +77,6 @@ tools: ## Install dev tools | |
| go install github.com/hashicorp/terraform-plugin-codegen-framework/cmd/tfplugingen-framework@latest | ||
| curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_VERSION) | ||
|
|
||
|
Comment on lines
-84
to
-85
There was a problem hiding this comment. why do we remove this? I would include additional check to this command such as fmtcheck There was a problem hiding this comment. it's not being used in GH actions or commit prechecks and i don't think anybody is using this There was a problem hiding this comment. ah okay, I was probably the only one using it xD happy to remove it then |
||
| .PHONY: website-lint | ||
| website-lint: | ||
| @echo "==> Checking website against linters..." | ||
|
|
@@ -137,4 +126,3 @@ scaffold-schemas: | |
| .PHONY: generate-doc | ||
| generate-doc: ## Generate the resource documentation via tfplugindocs | ||
| ./scripts/generate-doc.sh ${resource_name} | ||
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.
while redundant I do see the value in leaving the TF_ACC env var just for clarity
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.
don't know, if we assume "make testacc" does it i would remove it from here.
i would choose only one place to have it
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.
[q] Does this mean that TF_ACC is not needed to run acceptance tests? Including locally? If so, we should update Terraform Development Guide
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.
+1 I see the value in keeping it
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.
@oarbusi testacc makefile goal is: TF_ACC=1 go test ...
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.
change reverted, i'll keep it, thx for the feedback