Merge pull request #72 from hashicorp/binary-acctesting

Breaking change: SDK v2

Author: kmoe

.go-version

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

.travis.yml

@@ -1,6 +1,7 @@
 language: go
 go:
-  - "1.11.x"
+  - stable
+  - tip
 jobs:
   include:
     - os: linux
@@ -12,17 +13,19 @@ jobs:
         - make test
         - make testacc
         - make vet
-        - make website-test
     - os: osx
       script:
         - make test
         - make testacc
     - os: windows
       script:
-        # TODO: ensure windows setup can support binary testing
         - TF_ACC=1 go test -v ./...
+      before_script:
+        - curl -fSL "https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_windows_amd64.zip" -o terraform.zip
+        - unzip terraform.zip -d /c/Users/travis/bin
+
 env:
-  - GO111MODULE=on GOFLAGS=-mod=vendor
+  - GO111MODULE=on GOFLAGS=-mod=vendor TF_VERSION=0.13.3
 
 install:
 # This script is used by the Travis build to install a cookie for

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=archive
 
 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

archive/data_source_archive_file_test.go

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