Merge branch 'master' into pw/integrations-data-source

.travis.yml

@@ -3,12 +3,14 @@ go:
 - 1.9.x
 script:
 - make
+after_success:
+- make release
 env:
   global:
   - |
     RUNSCOPE_INTEGRATION_DESC="Slack: #general channel, send message on all test runs"
   - DEBUG=1
-  - TF_LOG=DEBUG
   - TF_ACC=1
   - secure: WuBIDsitJiSSj43a+sz4R9cDY2AF2ODerVkx2eKxXIXtKRLqjBxiQD8gekfTIprbiMfsOCMPr5cjp1AmjuZCWu10DrshAbPvTP6h5Fvm10CRkpdojyOoJZuRrhhZwpaahxo2tE53iLHXtQ+5CMKOecG1Z2ts7b3jWny93AVwuD+Jmft27KqBcFPceOL9mQgdMEBOTjTV5wdhKrRtiyzrVUx50odkuKXGKGFT8GdKyvF6KxuOA2TK+2o7tFiswEUXTWZUNM6weC84Mx/74VSy0tzy6+fTaDkYR5X4BcXQNthctLeElpw/bSqGWJZcEmLOBnPwbB5Si56f/jS5COdQ0bXmuQD+eE16vI+F5ufXHibP4Uh8ltLMEkj5YD6PWNL4A5xAnOps4zLBM43wxtRl00d9BmSn30VlY8TfTQALSR5CC/zB6ciNQm+Or9Awgolucj7MDA/dgreEElDRS2j/Gl9JlJ3DuKUWwEHn9KU3g4bYnnRqUSVWVjoPg+jOkkUWC+hb8N7KF89VUV+J7LvsfMJM5b3030WPIGug2GLc1avVrWGHPTgTXit6/HueLSuHdeD/nQOqBTarzAHdNP72ACcbcuaknAUUdo9nTZQUVCbjca8PkBveIosQP07RHBtoxixkgkNSLialZx2Uhlgu2MWbp8r1GEBauJMxLu4voBY=
   - secure: Om90Aveg0wYEu4SAdsjOWHrumvV7tIVCENelnGEPBQY9Fx3kFfPJEqLC1AnzRNITjwB0aRzFPAqoaAiEj1zIxxPdYC+H9XKbD48We+jBeHv8v/hgrKbeaZZqUzTqS5YYYZGV9gHosB9cGkdBhlHvfMPzw8M/l+j6OEbicPNGfuO8Q1OkNmFPI5oM4vO8seXbf6NXko3wXY/pMMtUssUKAzUfFZLUNv5T6VpHIpdT5YzkAPoGpto22joW1cTADni3xToaA90meN4DqBKYarrzxvqiLYsjl1SWV3D0Uk+zxjeu7smfROo8zkyratPPvUQu6x/MvjuwDrupaLJi9ffnW7utIJQuSJ1W5Au6aQYuZr16VJ9k9myns6lfkrvP2y1CIUgbUKV+JiScL0OOiCBI2sa7ipuzjtE6HbmPMqYb7wx4XsqSn7qLlvkg1Nn99UCU75WAxK95K62ZLqFmcqG5AMIqwU8LKpvCAv+wwiUW7Cw9p1X2hwTC+UxpUBJN8k6SonRmULh9h84LSpoCxA1g2bD1fuJvX3Oe74MmK1rHYZM0FXJM7W48wrD1fwR7IHtUh/5//3yeIRIFIg8YAYCKxr7MpGEBcG2HrILEmbzDydOUR9zG20BVFVXMqKRWyFITcJvScP8cHnrEOXFObZxCwrxIXxEltrc+x2XKxAmkzEg=
+  - secure: F0uWRxBhl+W9AH4VvhQ8LGoE9xj4mx/sqr2I3CQ6ao6edG94JcjTeBtU5pz83X14NusRDBA4u92nGlCK/zJOryAgSbkH+KEACtaEWR2jn1CmPh33K7RGN/EMbqcQkvE+K0E3atTaphj2yt4sQn5oAsrFoxf0Z6Rls9YR9BC8WI9D5kjS/gPwRykA+THdpx976LOTW6JJEqn4dSdigp6ulvzN4fh8lPTPEvLMkDaLOwmfhgdFOGqtkxIg1CdBsI9HPOWwdT2p9LuZzG8Pad3axCQUABwo54IsQBw6vT1kIyMol/JNdxf4HhvzifomvFFY/OogzCdOFlvpRcTkX91meT0BXC9+PBicKuQspj6fI5HjxY9XWjYtkzMqWtA67kN11Dexv07HfVR8U/On3fHhtLkdzb1uhHQ3Tx3OfjrkiOQzg6YhPAO1SIiYswmft70sruSsXDo7hlOzBc5MH8TeWuWNPA7W9FoZMONCZyADTsNrDT3BCM/NgOjATdbveJMhuyvxRxqeeFdwaGZtJEsHISsZThX5e/gA+s3f4NiQ9a8rIuTIjfoCChFAkwJckYtF9jhppOVj9UvQ1+0HUXr0snJA0W8mjZLQZ0j8EHMKPu0OwYl+BCrLacgGNAgK+P0xPmYO00eyTxB/eLqq2+S4C3y33uaMkg2cd5v6lIMgaso=

Makefile

@@ -21,14 +21,10 @@ build-gox: deps fmtcheck vet
 	gox -osarch="linux/amd64 windows/amd64 darwin/amd64" \
 	-output="pkg/{{.OS}}_{{.Arch}}/terraform-provider-runscope" .
 
-release: build-gox
-	@test "${VERSION}" || (echo 'VERSION name required' && exit 1)
-	rm -f pkg/darwin_amd64/terraform-provider-runscope_${VERSION}_darwin_amd64.zip
-	zip pkg/darwin_amd64/terraform-provider-runscope_${VERSION}_darwin_amd64.zip pkg/darwin_amd64/terraform-provider-runscope
-	rm -f pkg/linux_amd64/terraform-provider-runscope_${VERSION}_linux_amd64.zip
-	zip pkg/linux_amd64/terraform-provider-runscope_${VERSION}_linux_amd64.zip pkg/linux_amd64/terraform-provider-runscope
-	rm -f pkg/windows_amd64/terraform-provider-runscope_${VERSION}_windows_amd64.zip
-	zip pkg/windows_amd64/terraform-provider-runscope_${VERSION}_windows_amd64.zip pkg/windows_amd64/terraform-provider-runscope.exe
+release:
+	go get github.com/goreleaser/goreleaser; \
+    goreleaser; \
+
 deps:
 	go get -u github.com/mitchellh/gox
 

README.md

@@ -15,6 +15,18 @@ See the [Plugin Basics][4] page of the Terraform docs to see how to plunk this
 into your config. Check the [releases page][5] of this repo to get releases for
 Linux, OS X, and Windows.
 
+## Releasing
+Releases are automatically setup to go out from the master branch after a build is made on master with a tag.
+
+To perform a release simply create a tag:
+` git tag -a v0.0.2 -m "Release message"`
+
+Then push your tag:
+`git push origin v0.0.2`
+
+
+That's it, the build will now run and create a new release on [github](https://github.com/form3tech/ewilde/terraform-provider-runscope) :
+
 ## Usage
 
 The following section details the use of the provider and its resources.

goreleaser.yml

@@ -0,0 +1,10 @@
+builds:
+  - binary: terraform-provider-runscope
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - amd64
+archive:
+  format: zip

plugin/providers/runscope/resource_runscope_environment.go

@@ -170,7 +170,7 @@ func resourceEnvironmentUpdate(d *schema.ResourceData, meta interface{}) error {
 				environment, &runscope.Bucket{Key: bucketId})
 		}
 		if err != nil {
-			return fmt.Errorf("Error updating test: %s", err)
+			return fmt.Errorf("Error updating environment: %s", err)
 		}
 	}
 

vendor/vendor.json

@@ -613,10 +613,10 @@
 			"revisionTime": "2017-02-15T19:28:32Z"
 		},
 		{
-			"checksumSHA1": "i7sdDlIWZjuSSQ3c/zZqYYJh7Sk=",
+			"checksumSHA1": "98lFaa+Jyw141yGsjCwtPGtSrdo=",
 			"path": "github.com/ewilde/go-runscope",
-			"revision": "c770ca02697170500d1384d920160e70c6e51e70",
-			"revisionTime": "2017-11-06T10:14:59Z"
+			"revision": "12fd7238e7a5c70ea43fac1b905cadb13101baca",
+			"revisionTime": "2017-11-16T16:33:49Z"
 		},
 		{
 			"checksumSHA1": "1K+xrZ1PBez190iGt5OnMtGdih4=",