Merges 0.10.x branch into master prior to code review

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 PayByPhone Technologies, Inc.
+Copyright:: Copyright (c) 2017 Edward Wilde
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

Makefile

@@ -3,13 +3,13 @@ GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 default: build test testacc
 
 test: fmtcheck
-	go test -v . ./plugin/providers/runscope
+	go test -v . ./runscope
 
 testacc: fmtcheck
 	@test "${RUNSCOPE_ACCESS_TOKEN}" || (echo '$$RUNSCOPE_ACCESS_TOKEN required' && exit 1)
 	@test "${RUNSCOPE_TEAM_ID}" || (echo '$$RUNSCOPE_TEAM_ID required' && exit 1)
 
-	go test -count=1 -v ./plugin/providers/runscope -run="TestAcc" -timeout 20m
+	go test -count=1 -v ./runscope -run="TestAcc" -timeout 20m
 
 build: fmtcheck vet testacc
 	@go install

README.md

@@ -1,31 +1,27 @@
 [![Build Status](https://travis-ci.org/ewilde/terraform-provider-runscope.svg?branch=master)](https://travis-ci.org/ewilde/terraform-provider-runscope)
 
-Terraform Runscope Provider
-===========================
+# Terraform Runscope Provider
 
-This repository contains a plugin form of the Runscope provider that was proposed
-and submitted in [Terraform PR #14221][1].
+- Website: https://www.terraform.io
+- [![Gitter chat](https://badges.gitter.im/hashicorp-terraform/Lobby.png)](https://gitter.im/hashicorp-terraform/Lobby)
+- Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 
-The Runscope provider is used to create and manage Runscope tests using
-the official [Runscope API][2]
+<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
 
-## Installing
+The Runscope provider is used to create and manage Runscope tests using
+the official [Runscope API](https://www.runscope.com/docs/api)
 
-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.
+## Requirements
 
-## Releasing
-Releases are automatically setup to go out from the master branch after a build is made on master with a tag.
+-	[Terraform](https://www.terraform.io/downloads.html) 0.10.x
+-	[Go](https://golang.org/doc/install) 1.9 (to build the provider plugin)
 
-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`
 
+## Installing
 
-That's it, the build will now run and create a new release on [github](https://github.com/form3tech/ewilde/terraform-provider-runscope) :
+See the [Plugin Basics][4] page of the Terraform docs to see how to plug this
+into your config. Check the [releases page][5] of this repository to get releases for
+Linux, OS X, and Windows.
 
 ## Usage
 
@@ -194,8 +190,44 @@ The following attributes are exported:
 [4]: https://github.com/ewilde/terraform-provider-runscope/releases
 [5]: website/source/docs/providers/runscope
 
-## Developing
-### Running the integration tests
+# Developing
+
+## Building The Provider
+
+Clone repository to: `$GOPATH/src/github.com/terraform-providers/terraform-provider-runscope`
+
+```sh
+$ mkdir -p $GOPATH/src/github.com/terraform-providers; cd $GOPATH/src/github.com/terraform-providers
+$ git clone [email protected]:terraform-providers/terraform-provider-runscope
+```
+
+Enter the provider directory and build the provider
+
+```sh
+$ cd $GOPATH/src/github.com/terraform-providers/terraform-provider-runscope
+$ make build
+```
+
+## Using the provider
+
+See [examples](examples/)
+
+See [runscope providers documentation](https://www.terraform.io/docs/providers/runscope/index.html)
+
+## Developing the Provider
+
+If you wish to work on the provider, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.9+ is *required*). You'll also need to correctly setup a [GOPATH](http://golang.org/doc/code.html#GOPATH), as well as adding `$GOPATH/bin` to your `$PATH`.
+
+To compile the provider, run `make build`. This will build the provider and put the provider binary in the `$GOPATH/bin` directory.
+
+```sh
+$ make build
+...
+$ $GOPATH/bin/terraform-provider-runscope
+...
+```
+
+## Running the integration tests
 
 `make TF_ACC=1 RUNSCOPE_TEAM_ID=xxx RUNSCOPE_ACCESS_TOKEN=xxx RUNSCOPE_INTEGRATION_DESC="Slack: #test1 channel, send message on all test runs"`
 
@@ -206,3 +238,15 @@ The following attributes are exported:
 | RUNSCOPE_TEAM_ID | Runscope [team uuid](https://www.runscope.com/docs/api/teams)|
 | RUNSCOPE_ACCESS_TOKEN | Runscope [access token](https://www.runscope.com/applications/create) |
 | RUNSCOPE_INTEGRATION_DESC | Description that matches a pre-existing runscope integration associated with your account  |
+
+## 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) :

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/ewilde/terraform-provider-runscope/plugin/providers/runscope"
+	"github.com/ewilde/terraform-provider-runscope/runscope"
 	"github.com/hashicorp/terraform/plugin"
 )
 

scripts/changelog-links.sh

@@ -24,7 +24,7 @@ else
   SED="sed -i.bak -r -e"
 fi
 
-PROVIDER_URL="https:\/\/github.com\/terraform-providers\/terraform-provider-aws\/issues"
+PROVIDER_URL="https:\/\/github.com\/terraform-providers\/terraform-provider-runscope\/issues"
 
 $SED "s/GH-([0-9]+)/\[#\1\]\($PROVIDER_URL\/\1\)/g" -e 's/\[\[#(.+)([0-9])\)]$/(\[#\1\2))/g' CHANGELOG.md