Skip to content

Commit

Permalink
Merge pull request #110 from hashicorp/sdkv2
Browse files Browse the repository at this point in the history
Breaking change: SDK v2
  • Loading branch information
kmoe authored Oct 8, 2020
2 parents f8156b4 + 9865441 commit d9d8bd8
Show file tree
Hide file tree
Showing 2,331 changed files with 234,544 additions and 226,345 deletions.
8 changes: 8 additions & 0 deletions .tfproto5
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
______ ____ ____ ____ _____ ______ _____ ______
/\__ _\/\ _`\ /\ _`\ /\ _`\ /\ __`\/\__ _\/\ __`\/\ ___\
\/_/\ \/\ \ \L\_\ \ \L\ \ \ \L\ \ \ \/\ \/_/\ \/\ \ \/\ \ \ \__/
\ \ \ \ \ _\/\ \ ,__/\ \ , /\ \ \ \ \ \ \ \ \ \ \ \ \ \___``\
\ \ \ \ \ \/ \ \ \/ \ \ \\ \\ \ \_\ \ \ \ \ \ \ \_\ \/\ \L\ \
\ \_\ \ \_\ \ \_\ \ \_\ \_\ \_____\ \ \_\ \ \_____\ \____/
\/_/ \/_/ \/_/ \/_/\/ /\/_____/ \/_/ \/_____/\/___/

6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ services:
- docker
language: go
go:
- "1.11.x"
- stable
- tip
env:
- GO111MODULE=on GOFLAGS=-mod=vendor

Expand All @@ -17,9 +18,8 @@ install:

script:
- make test
- bash dns/acceptance.sh
- bash internal/provider/acceptance.sh
- make vet
- make website-test

branches:
only:
Expand Down
10 changes: 4 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
## 2.3.0 (Unreleased)
## 3.0.0 (Unreleased)

FEATURES:
Binary releases of this provider will now include the linux-arm64 platform.

* Switch to standalone TF SDK v1.1 [GH-98]
BREAKING CHANGES:

BUG FIXES:

* Fix `d/dns_txt_record_set_test` failing test, terraform.io now has 3 txt record [GH-99]
* Upgrade to version 2 of the Terraform Plugin SDK, which drops support for Terraform 0.11. This provider will continue to work as expected for users of Terraform 0.11, which will not download the new version. [GH-110]

## 2.2.0 (July 24, 2019)

Expand Down
20 changes: 2 additions & 18 deletions GNUmakefile
Original file line number Diff line number Diff line change
@@ -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=dns

default: build
Expand All @@ -11,7 +10,7 @@ build: fmtcheck
test: fmtcheck
go test -i $(TEST) || exit 1
echo $(TEST) | \
xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
xargs -t -n4 go test $(TESTARGS) -timeout=120s -parallel=4

testacc: fmtcheck
TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
Expand Down Expand Up @@ -45,19 +44,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 vendor-status test-compile website website-test

.PHONY: build test testacc vet fmt fmtcheck errcheck vendor-status test-compile
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $ make test

In order to run acceptance tests, excluding ones requiring a `DNS_UPDATE_SERVER` run `make testacc`.

To run the full suite of acceptance tests run `./dns/acceptance.sh`. You will need docker installed.
To run the full suite of acceptance tests run `./internal/provider/acceptance.sh`. You will need docker installed.

*Note:* Acceptance tests create real resources, and often cost money to run.

Expand Down
84 changes: 0 additions & 84 deletions dns/config.go

This file was deleted.

16 changes: 0 additions & 16 deletions dns/hash_ip_string.go

This file was deleted.

Loading

0 comments on commit d9d8bd8

Please sign in to comment.