-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop-oapi' into 'master'
0.1.0RC7 Closes TPD-1864, TPD-1845, and TPD-1752 See merge request customer-tooling/terraform-provider-outscale!386
- Loading branch information
Showing
981 changed files
with
5,954 additions
and
90,706 deletions.
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
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,47 +1,64 @@ | ||
TEST?=$$(go list ./... |grep -v 'vendor') | ||
TEST?=./... | ||
GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor) | ||
PKG_NAME=outscale | ||
WEBSITE_REPO=github.com/hashicorp/terraform-website | ||
|
||
default: build | ||
|
||
build: fmtcheck | ||
go install | ||
|
||
|
||
test: fmtcheck | ||
go test -i $(TEST) || exit 1 | ||
echo $(TEST) | \ | ||
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4 | ||
go test $(TEST) -timeout=30s -parallel=4 | ||
|
||
testacc: fmtcheck | ||
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m | ||
|
||
vet: | ||
@echo "go vet ." | ||
@go vet $$(go list ./... | grep -v vendor/) ; 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 | ||
TF_ACC=1 go test $(TEST) -v -parallel 20 $(TESTARGS) -timeout 120m -cover | ||
|
||
fmt: | ||
gofmt -w $(GOFMT_FILES) | ||
@echo "==> Fixing source code with gofmt..." | ||
gofmt -s -w ./main.go | ||
gofmt -s -w ./$(PKG_NAME) | ||
|
||
# Currently required by tf-deploy compile | ||
fmtcheck: | ||
@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" | ||
|
||
errcheck: | ||
@sh -c "'$(CURDIR)/scripts/errcheck.sh'" | ||
websitefmtcheck: | ||
@sh -c "'$(CURDIR)/scripts/websitefmtcheck.sh'" | ||
|
||
vendor-status: | ||
@govendor status | ||
lint: | ||
@echo "==> Checking source code against linters..." | ||
@GOGC=30 golangci-lint run ./$(PKG_NAME) --deadline=30m | ||
|
||
tools: | ||
GO111MODULE=off go get -u github.com/client9/misspell/cmd/misspell | ||
GO111MODULE=off go get -u github.com/golangci/golangci-lint/cmd/golangci-lint | ||
|
||
test-compile: | ||
@if [ "$(TEST)" = "./..." ]; then \ | ||
echo "ERROR: Set TEST to a specific package. For example,"; \ | ||
echo " make test-compile TEST=./aws"; \ | ||
echo " make test-compile TEST=./$(PKG_NAME)"; \ | ||
exit 1; \ | ||
fi | ||
go test -c $(TEST) $(TESTARGS) | ||
|
||
.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile | ||
website: | ||
ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) | ||
echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." | ||
git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) | ||
endif | ||
@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) | ||
|
||
website-lint: | ||
@echo "==> Checking website against linters..." | ||
@misspell -error -source=text website/ | ||
|
||
website-test: | ||
ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) | ||
echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." | ||
git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO) | ||
endif | ||
@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) | ||
|
||
.PHONY: build test testacc fmt fmtcheck lint tools test-compile website website-lint website-test |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.