Skip to content

Commit

Permalink
Prune the unnecessary scripts
Browse files Browse the repository at this point in the history
Since it's not the duty of provider to format tf configuration files,
remove tf-fmt related scripts.

Signed-off-by: imjoey <[email protected]>
  • Loading branch information
imjoey committed Jul 3, 2019
1 parent 0dd3983 commit 96f5dfe
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 51 deletions.
1 change: 0 additions & 1 deletion .terraform-version

This file was deleted.

3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ install:
- bash scripts/gogetcookie.sh
- go get github.com/kardianos/govendor

before_script:
- scripts/terraform_install.sh

script:
- make test
- make vet
Expand Down
9 changes: 1 addition & 8 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ test: fmtcheck
go test -i $(TEST) || exit 1
echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
$(MAKE) tf-fmtcheck

testacc: fmtcheck
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m
Expand All @@ -36,12 +35,6 @@ vet:
fmt:
gofmt -w $(GOFMT_FILES)

tf-fmt:
$(CURDIR)/bin/terraform fmt

tf-fmtcheck:
@sh -c "'$(CURDIR)/scripts/tf-fmtcheck.sh'"

fmtcheck:
@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"

Expand Down Expand Up @@ -74,5 +67,5 @@ endif
@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)


.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile tf-fmt tf-fmtcheck website website-test
.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile website website-test

14 changes: 0 additions & 14 deletions scripts/terraform_install.sh

This file was deleted.

25 changes: 0 additions & 25 deletions scripts/tf-fmtcheck.sh

This file was deleted.

0 comments on commit 96f5dfe

Please sign in to comment.