Merge branch 'master' of https://github.com/hashicorp/terraform into …

…cg/validation-error-expressions

CODEOWNERS

@@ -15,6 +15,7 @@
 /backend/remote-state/pg                Unmaintained
 /backend/remote-state/s3                @hashicorp/terraform-aws
 /backend/remote-state/swift             Unmaintained
+/backend/remote-state/kubernetes        @jrhouston @alexsomesan 
 
 # Provisioners
 builtin/provisioners/chef               Unmaintained

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

addrs/provider_config.go

@@ -279,9 +279,14 @@ func ParseLegacyAbsProviderConfig(traversal hcl.Traversal) (AbsProviderConfig, t
 		return ret, diags
 	}
 
-	// We always assume legacy-style providers in legacy state
+	// We always assume legacy-style providers in legacy state ...
 	if tt, ok := remain[1].(hcl.TraverseAttr); ok {
-		ret.Provider = NewLegacyProvider(tt.Name)
+		// ... unless it's the builtin "terraform" provider, a special case.
+		if tt.Name == "terraform" {
+			ret.Provider = NewBuiltInProvider(tt.Name)
+		} else {
+			ret.Provider = NewLegacyProvider(tt.Name)
+		}
 	} else {
 		diags = diags.Append(&hcl.Diagnostic{
 			Severity: hcl.DiagError,

addrs/provider_config_test.go

@@ -1,6 +1,7 @@
 package addrs
 
 import (
+	"reflect"
 	"testing"
 
 	"github.com/go-test/deep"
@@ -241,3 +242,39 @@ func TestAbsProviderConfigLegacyString(t *testing.T) {
 		}
 	}
 }
+
+func TestParseLegacyAbsProviderConfigStr(t *testing.T) {
+	tests := []struct {
+		Config string
+		Want   AbsProviderConfig
+	}{
+		{
+			`provider.foo`,
+			AbsProviderConfig{
+				Module:   RootModule,
+				Provider: NewLegacyProvider("foo"),
+			},
+		},
+		{
+			`module.child_module.provider.foo`,
+			AbsProviderConfig{
+				Module:   RootModule.Child("child_module"),
+				Provider: NewLegacyProvider("foo"),
+			},
+		},
+		{
+			`provider.terraform`,
+			AbsProviderConfig{
+				Module:   RootModule,
+				Provider: NewBuiltInProvider("terraform"),
+			},
+		},
+	}
+
+	for _, test := range tests {
+		got, _ := ParseLegacyAbsProviderConfigStr(test.Config)
+		if !reflect.DeepEqual(got, test.Want) {
+			t.Errorf("wrong result. Got %s, want %s\n", got, test.Want)
+		}
+	}
+}

backend/init/init.go

@@ -22,6 +22,7 @@ import (
 	backendGCS "github.com/hashicorp/terraform/backend/remote-state/gcs"
 	backendHTTP "github.com/hashicorp/terraform/backend/remote-state/http"
 	backendInmem "github.com/hashicorp/terraform/backend/remote-state/inmem"
+	backendKubernetes "github.com/hashicorp/terraform/backend/remote-state/kubernetes"
 	backendManta "github.com/hashicorp/terraform/backend/remote-state/manta"
 	backendOSS "github.com/hashicorp/terraform/backend/remote-state/oss"
 	backendPg "github.com/hashicorp/terraform/backend/remote-state/pg"
@@ -64,6 +65,7 @@ func Init(services *disco.Disco) {
 		"gcs":         func() backend.Backend { return backendGCS.New() },
 		"http":        func() backend.Backend { return backendHTTP.New() },
 		"inmem":       func() backend.Backend { return backendInmem.New() },
+		"kubernetes":  func() backend.Backend { return backendKubernetes.New() },
 		"manta":       func() backend.Backend { return backendManta.New() },
 		"oss":         func() backend.Backend { return backendOSS.New() },
 		"pg":          func() backend.Backend { return backendPg.New() },