Breaking change: SDK v2

.go-version

@@ -1 +1 @@
-1.11.5
+1.15.2

.travis.yml

@@ -4,7 +4,8 @@ services:
 - docker
 language: go
 go:
-  - "1.11.x"
+  - stable
+  - tip
 
 env:
   - GO111MODULE=on GOFLAGS=-mod=vendor
@@ -19,7 +20,7 @@ install:
 script:
 - make test
 - make vet
-- make website-test
+- make testacc
 
 branches:
   only:

GNUmakefile

@@ -1,6 +1,5 @@
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
-WEBSITE_REPO=github.com/hashicorp/terraform-website
 PKG_NAME=local
 
 default: build
@@ -43,19 +42,4 @@ test-compile:
 	fi
 	go test -c $(TEST) $(TESTARGS)
 
-website:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-endif
-	@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
-
-website-test:
-ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
-	echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
-	git clone https://$(WEBSITE_REPO) $(GOPATH)/src/$(WEBSITE_REPO)
-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  test-compile website website-test
-
+.PHONY: build test testacc vet fmt fmtcheck errcheck  test-compile

go.mod

@@ -1,6 +1,5 @@
 module github.com/terraform-providers/terraform-provider-local
 
-require (
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/hashicorp/terraform-plugin-sdk v1.0.0
-)
+go 1.15
+
+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.0.3

local/data_source_local_file.go → internal/provider/data_source_local_file.go

@@ -1,12 +1,12 @@
-package local
+package provider
 
 import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/hex"
 	"io/ioutil"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func dataSourceLocalFile() *schema.Resource {

local/data_source_local_file_test.go → internal/provider/data_source_local_file_test.go

@@ -1,12 +1,12 @@
-package local
+package provider
 
 import (
 	"encoding/base64"
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestLocalFileDataSource(t *testing.T) {

internal/provider/provider.go

@@ -0,0 +1,17 @@
+package provider
+
+import (
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func New() *schema.Provider {
+	return &schema.Provider{
+		Schema: map[string]*schema.Schema{},
+		ResourcesMap: map[string]*schema.Resource{
+			"local_file": resourceLocalFile(),
+		},
+		DataSourcesMap: map[string]*schema.Resource{
+			"local_file": dataSourceLocalFile(),
+		},
+	}
+}

internal/provider/provider_test.go

@@ -0,0 +1,17 @@
+package provider
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+var testProviders = map[string]*schema.Provider{
+	"local": New(),
+}
+
+func TestProvider(t *testing.T) {
+	if err := New().InternalValidate(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}

local/resource_local_file.go → internal/provider/resource_local_file.go

@@ -1,4 +1,4 @@
-package local
+package provider
 
 import (
 	"crypto/sha1"
@@ -9,7 +9,7 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceLocalFile() *schema.Resource {

local/resource_local_file_test.go → internal/provider/resource_local_file_test.go

@@ -1,56 +1,61 @@
-package local
+package provider
 
 import (
 	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
-	"testing"
-
-	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
-	r "github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"path"
+	"path/filepath"
 	"runtime"
+	"testing"
+
+	r "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 )
 
 func TestLocalFile_Basic(t *testing.T) {
+	td := testTempDir(t)
+	defer os.RemoveAll(td)
+
+	f := filepath.Join(td, "local_file")
+
 	var cases = []struct {
 		path    string
 		content string
 		config  string
 	}{
 		{
-			"local_file",
-			"This is some content", `
+			f,
+			"This is some content", fmt.Sprintf(`
 resource "local_file" "file" {
   content  = "This is some content"
-  filename = "local_file"
-}`,
+  filename = "%s"
+}`, f),
 		},
 		{
-			"local_file",
-			"This is some sensitive content", `
+			f,
+			"This is some sensitive content", fmt.Sprintf(`
 resource "local_file" "file" {
   sensitive_content = "This is some sensitive content"
-  filename          = "local_file"
-}`,
+  filename = "%s"
+}`, f),
 		},
 		{
-			"local_file",
-			"This is some sensitive content", `
+			f,
+			"This is some sensitive content", fmt.Sprintf(`
 resource "local_file" "file" {
   content_base64 = "VGhpcyBpcyBzb21lIHNlbnNpdGl2ZSBjb250ZW50"
-  filename       = "local_file"
-}`,
+  filename = "%s"
+}`, f),
 		},
 		{
-			"local_file",
-			"This is some sensitive content", `
+			f,
+			"This is some sensitive content", fmt.Sprintf(`
 resource "local_file" "file" {
   content_base64 = base64encode("This is some sensitive content")
-  filename       = "local_file"
-}`,
+  filename = "%s"
+}`, f),
 		},
 	}
 
@@ -131,10 +136,10 @@ resource "local_file" "file" {
 }
 
 func TestLocalFile_Permissions(t *testing.T) {
+	td := testTempDir(t)
+	defer os.RemoveAll(td)
 
-	randomPath := acctest.RandomWithPrefix("test-file-perms")
-
-	destinationDirPath := "../test/" + randomPath
+	destinationDirPath := td
 	destinationFilePath := destinationDirPath + "/local_file"
 	filePermission := os.FileMode(0600)
 	directoryPermission := os.FileMode(0700)
@@ -200,3 +205,11 @@ resource "local_file" "file" {
 	defer os.Remove(destinationDirPath)
 
 }
+
+func testTempDir(t *testing.T) string {
+	tmp, err := ioutil.TempDir("", "tf")
+	if err != nil {
+		t.Fatal(err)
+	}
+	return tmp
+}

internal/provider/validator.go

@@ -0,0 +1,27 @@
+package provider
+
+import (
+	"fmt"
+	"strconv"
+)
+
+func validateMode(i interface{}, k string) (s []string, es []error) {
+	v, ok := i.(string)
+
+	if !ok {
+		es = append(es, fmt.Errorf("expected type of %s to be string", k))
+		return
+	}
+
+	if len(v) > 4 || len(v) < 3 {
+		es = append(es, fmt.Errorf("bad mode for file - string length should be 3 or 4 digits: %s", v))
+	}
+
+	fileMode, err := strconv.ParseInt(v, 8, 64)
+
+	if err != nil || fileMode > 0777 || fileMode < 0 {
+		es = append(es, fmt.Errorf("bad mode for file - must be three octal digits: %s", v))
+	}
+
+	return
+}

local/validators_test.go → internal/provider/validators_test.go

@@ -1,4 +1,4 @@
-package local
+package provider
 
 import (
 	"regexp"

main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform-plugin-sdk/plugin"
-	"github.com/terraform-providers/terraform-provider-local/local"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/plugin"
+	"github.com/terraform-providers/terraform-provider-local/internal/provider"
 )
 
 func main() {
 	plugin.Serve(&plugin.ServeOpts{
-		ProviderFunc: local.Provider})
+		ProviderFunc: provider.New})
 }