remove "core" distinction

Since there is little left that isn't core, remove the distinction for
now to reduce confusion, since a "core" binary will mostly work except
for provisioners.
This commit is contained in:
James Bardin 2017-06-12 11:54:12 -04:00
parent e8b02c495e
commit 77a32f3df0
5 changed files with 2 additions and 32 deletions

View File

@ -20,17 +20,6 @@ dev: fmtcheck generate
quickdev: generate
@TF_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
# Shorthand for quickly building the core of Terraform. Note that some
# changes will require a rebuild of everything, in which case the dev
# target should be used.
core-dev: generate
go install -tags 'core' github.com/hashicorp/terraform
# Shorthand for quickly testing the core of Terraform (i.e. "not providers")
core-test: generate
@echo "Testing core packages..." && \
go test -tags 'core' $(TESTARGS) $(shell go list ./... | grep -v -E 'terraform/(builtin|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
@ -106,4 +95,4 @@ vendor-status:
# under parallel conditions.
.NOTPARALLEL:
.PHONY: bin core-dev core-test cover default dev fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet
.PHONY: bin cover default dev fmt fmtcheck generate plugin-dev quickdev test-compile test testacc testrace tools vendor-status vet

View File

@ -1,13 +0,0 @@
// +build core
// This file is included whenever the 'core' build tag is specified. This is
// used by make core-dev and make core-test to compile a build significantly
// more quickly, but it will not include any provider or provisioner plugins.
package command
import "github.com/hashicorp/terraform/plugin"
var InternalProviders = map[string]plugin.ProviderFunc{}
var InternalProvisioners = map[string]plugin.ProvisionerFunc{}

View File

@ -1,5 +1,3 @@
// +build !core
//
// This file is automatically generated by scripts/generate-plugins.go -- Do not edit!
//

View File

@ -1,5 +1,3 @@
// +build !core
package command
import "testing"

View File

@ -258,9 +258,7 @@ func discoverProvisioners() ([]plugin, error) {
return discoverTypesInPath(path, typeID, typeName)
}
const source = `// +build !core
//
const source = `//
// This file is automatically generated by scripts/generate-plugins.go -- Do not edit!
//
package command