From 77a32f3df0949572fcdce069838c782e83c35b23 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Mon, 12 Jun 2017 11:54:12 -0400
Subject: [PATCH] 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.
---
 Makefile                        | 13 +------------
 command/internal_plugin_core.go | 13 -------------
 command/internal_plugin_list.go |  2 --
 command/internal_plugin_test.go |  2 --
 scripts/generate-plugins.go     |  4 +---
 5 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 command/internal_plugin_core.go

diff --git a/Makefile b/Makefile
index 984c5d85f..c51b77e1d 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/command/internal_plugin_core.go b/command/internal_plugin_core.go
deleted file mode 100644
index e0d2c9477..000000000
--- a/command/internal_plugin_core.go
+++ /dev/null
@@ -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{}
diff --git a/command/internal_plugin_list.go b/command/internal_plugin_list.go
index 7951d92d8..321fbd09e 100644
--- a/command/internal_plugin_list.go
+++ b/command/internal_plugin_list.go
@@ -1,5 +1,3 @@
-// +build !core
-
 //
 // This file is automatically generated by scripts/generate-plugins.go -- Do not edit!
 //
diff --git a/command/internal_plugin_test.go b/command/internal_plugin_test.go
index d625488e3..3c5eb01ad 100644
--- a/command/internal_plugin_test.go
+++ b/command/internal_plugin_test.go
@@ -1,5 +1,3 @@
-// +build !core
-
 package command
 
 import "testing"
diff --git a/scripts/generate-plugins.go b/scripts/generate-plugins.go
index 2b0c7686b..15377141a 100644
--- a/scripts/generate-plugins.go
+++ b/scripts/generate-plugins.go
@@ -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