From ba374baef0105e8711363851436a3c8d25cba6fb Mon Sep 17 00:00:00 2001 From: Alisdair McDiarmid Date: Fri, 5 Jun 2020 08:47:15 -0400 Subject: [PATCH] Makefile: remove unused targets Most of the targets in the Makefile have not been used in either CI or the normal development workflow for some time. Removing them clarifies that the expected way to build Terraform locally is simple: go install. Remaining targets: - fmtcheck, generate: these are used in CI to verify that the code is correctly formatted and that generate has been run appropriately - protobuf: referenced in CONTRIBUTING.md as the simplest way to build the proto files - website, website-test: used to compile and test the local website in isolation from the terraform-website repo --- Makefile | 68 +------------------------------------------------------- 1 file changed, 1 insertion(+), 67 deletions(-) diff --git a/Makefile b/Makefile index 143bc1ff7..39f2ba1a5 100644 --- a/Makefile +++ b/Makefile @@ -1,68 +1,5 @@ -VERSION?="0.3.32" -TEST?=./... -GOFMT_FILES?=$$(find . -not -path "./vendor/*" -type f -name '*.go') WEBSITE_REPO=github.com/hashicorp/terraform-website -default: test - -# bin generates the releaseable binaries for Terraform -bin: fmtcheck generate - @TF_RELEASE=1 sh -c "'$(CURDIR)/scripts/build.sh'" - -# dev creates binaries for testing Terraform locally. These are put -# into ./bin/ as well as $GOPATH/bin -dev: fmtcheck generate - go install -mod=vendor . - -quickdev: generate - go install -mod=vendor . - -# Shorthand for building and installing just one plugin for local testing. -# Run as (for example): make plugin-dev PLUGIN=provider-aws -plugin-dev: generate - go install github.com/hashicorp/terraform/builtin/bins/$(PLUGIN) - mv $(GOPATH)/bin/$(PLUGIN) $(GOPATH)/bin/terraform-$(PLUGIN) - -# test runs the unit tests -# we run this one package at a time here because running the entire suite in -# one command creates memory usage issues when running in Travis-CI. -test: fmtcheck generate - go list -mod=vendor $(TEST) | xargs -t -n4 go test $(TESTARGS) -mod=vendor -timeout=2m -parallel=4 - -# testacc runs acceptance tests -testacc: fmtcheck generate - @if [ "$(TEST)" = "./..." ]; then \ - echo "ERROR: Set TEST to a specific package. For example,"; \ - echo " make testacc TEST=./builtin/providers/test"; \ - exit 1; \ - fi - TF_ACC=1 go test $(TEST) -v $(TESTARGS) -mod=vendor -timeout 120m - -# e2etest runs the end-to-end tests against a generated Terraform binary -# and a generated terraform-bundle binary. -# The TF_ACC here allows network access, but does not require any special -# credentials. -e2etest: generate - TF_ACC=1 go test -mod=vendor -v ./command/e2etest - TF_ACC=1 go test -mod=vendor -v ./tools/terraform-bundle/e2etest - -test-compile: fmtcheck generate - @if [ "$(TEST)" = "./..." ]; then \ - echo "ERROR: Set TEST to a specific package. For example,"; \ - echo " make test-compile TEST=./builtin/providers/test"; \ - exit 1; \ - fi - go test -mod=vendor -c $(TEST) $(TESTARGS) - -# testrace runs the race checker -testrace: fmtcheck generate - TF_ACC= go test -mod=vendor -race $(TEST) $(TESTARGS) - -cover: - go test $(TEST) -coverprofile=coverage.out - go tool cover -html=coverage.out - rm coverage.out - # generate runs `go generate` to build the dynamically generated # source files, except the protobuf stubs which are built instead with # "make protobuf". @@ -86,9 +23,6 @@ protobuf: bash internal/tfplugin5/generate.sh bash plans/internal/planproto/generate.sh -fmt: - gofmt -w $(GOFMT_FILES) - fmtcheck: @sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'" @@ -141,4 +75,4 @@ endif # under parallel conditions. .NOTPARALLEL: -.PHONY: bin cover default dev e2etest fmt fmtcheck generate protobuf plugin-dev quickdev test-compile test testacc testrace vendor-status website website-test +.PHONY: fmtcheck generate protobuf website website-test