Rewrite the import paths, update README and Makefile

This single commit contains all changes needed to make this fork work on it’s own without any direct dependencies on the Terraform repo. This way updates can be done better planned and without breaking this build.
hashicorp · Nov 24, 2015 · f50ede4 · f50ede4
1 parent 52f5c86
commit f50ede4
Show file tree

Hide file tree

Showing 602 changed files with 1,037 additions and 1,045 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -64,7 +64,7 @@ use the Vagrantfile in this repo to stand up a dev VM).
     export PATH=$PATH:$GOPATH/bin
     ```
 
-3. [Follow the development guide](https://github.com/hashicorp/terraform#developing-terraform)
+3. [Follow the development guide](https://github.com/xanzy/terraform-api#developing-terraform)
 
 5. Make your changes to the Terraform source, being sure to run the basic
    tests.

diff --git a/Makefile b/Makefile
@@ -56,7 +56,7 @@ updatedeps:
 	go get -u golang.org/x/tools/cmd/stringer
 	go list ./... \
 		| xargs go list -f '{{join .Deps "\n"}}' \
-		| grep -v github.com/hashicorp/terraform \
+		| grep -v github.com/xanzy/terraform-api \
 		| grep -v '/internal/' \
 		| sort -u \
 		| xargs go get -f -u -v

diff --git a/README.md b/README.md
@@ -1,9 +1,13 @@
-Terraform
-=========
+Terraform-API
+=============
 
-- Website: http://www.terraform.io
-- IRC: `#terraform-tool` on Freenode
-- Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
+#####This is an actively maintained (updated) fork from [github.com/xanzy/terraform-api](https://github.com/xanzy/terraform-api) which adds a `terraform api`  command!
+
+The `api` command allows you to run Terraform as a RESTful API. The new command is build in such a way that it can easily be merged into master without any changes to the existing Terraform code. So if it turns out enough people have a need for the `api` command, there is a good chance it will be merged upstream. Until that time this fork will be maintained and updated to follow the Terraform releases.
+
+-	Website: http://terraform.io
+-	IRC: `#terraform-tool` on Freenode
+-	Mailing list: [Google Groups](http://groups.google.com/group/terraform-tool)
 
 ![Terraform](https://raw.githubusercontent.com/hashicorp/terraform/master/website/source/assets/images/readme.png)
 
@@ -36,7 +40,7 @@ For local dev first make sure Go is properly installed, including setting up a [
 - [Git](http://git-scm.com/)
 - [Mercurial](http://mercurial.selenic.com/)
 
-Next, clone this repository into `$GOPATH/src/github.com/hashicorp/terraform`. Install the necessary dependencies by running `make updatedeps` and then just type `make`. This will compile some more dependencies and then run the tests. If this exits with exit status 0, then everything is working!
+Next, clone this repository into `$GOPATH/src/github.com/xanzy/terraform-api`. Install the necessary dependencies by running `make updatedeps` and then just type `make`. This will compile some more dependencies and then run the tests. If this exits with exit status 0, then everything is working!
 
 ```sh
 $ make updatedeps

diff --git a/Vagrantfile b/Vagrantfile
@@ -47,7 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.hostname = "terraform"
 
   config.vm.provision "shell", inline: $script, privileged: false
-  config.vm.synced_folder '.', '/opt/gopath/src/github.com/hashicorp/terraform'
+  config.vm.synced_folder '.', '/opt/gopath/src/github.com/xanzy/terraform-api'
 
   ["vmware_fusion", "vmware_workstation"].each do |p|
     config.vm.provider p do |v|

diff --git a/builtin/bins/provider-atlas/main.go b/builtin/bins/provider-atlas/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/atlas"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/atlas"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-aws/main.go b/builtin/bins/provider-aws/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/aws"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/aws"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-azure/main.go b/builtin/bins/provider-azure/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/azure"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/azure"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-cloudflare/main.go b/builtin/bins/provider-cloudflare/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/cloudflare"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/cloudflare"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-cloudstack/main.go b/builtin/bins/provider-cloudstack/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/cloudstack"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/cloudstack"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-consul/main.go b/builtin/bins/provider-consul/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/consul"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/consul"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-digitalocean/main.go b/builtin/bins/provider-digitalocean/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/digitalocean"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/digitalocean"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-dme/main.go b/builtin/bins/provider-dme/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/dme"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/dme"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-dnsimple/main.go b/builtin/bins/provider-dnsimple/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/dnsimple"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/dnsimple"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-docker/main.go b/builtin/bins/provider-docker/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/docker"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/docker"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-google/main.go b/builtin/bins/provider-google/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/google"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/google"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-heroku/main.go b/builtin/bins/provider-heroku/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/heroku"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/heroku"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-mailgun/main.go b/builtin/bins/provider-mailgun/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/mailgun"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/mailgun"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-null/main.go b/builtin/bins/provider-null/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/null"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/builtin/providers/null"
+	"github.com/xanzy/terraform-api/plugin"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func main() {

diff --git a/builtin/bins/provider-openstack/main.go b/builtin/bins/provider-openstack/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/openstack"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/openstack"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-template/main.go b/builtin/bins/provider-template/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/template"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/template"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provider-terraform/main.go b/builtin/bins/provider-terraform/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/providers/terraform"
-	"github.com/hashicorp/terraform/plugin"
+	"github.com/xanzy/terraform-api/builtin/providers/terraform"
+	"github.com/xanzy/terraform-api/plugin"
 )
 
 func main() {

diff --git a/builtin/bins/provisioner-chef/main.go b/builtin/bins/provisioner-chef/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/provisioners/chef"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/builtin/provisioners/chef"
+	"github.com/xanzy/terraform-api/plugin"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func main() {

diff --git a/builtin/bins/provisioner-file/main.go b/builtin/bins/provisioner-file/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/provisioners/file"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/builtin/provisioners/file"
+	"github.com/xanzy/terraform-api/plugin"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func main() {

diff --git a/builtin/bins/provisioner-local-exec/main.go b/builtin/bins/provisioner-local-exec/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/provisioners/local-exec"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/builtin/provisioners/local-exec"
+	"github.com/xanzy/terraform-api/plugin"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func main() {

diff --git a/builtin/bins/provisioner-remote-exec/main.go b/builtin/bins/provisioner-remote-exec/main.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"github.com/hashicorp/terraform/builtin/provisioners/remote-exec"
-	"github.com/hashicorp/terraform/plugin"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/builtin/provisioners/remote-exec"
+	"github.com/xanzy/terraform-api/plugin"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func main() {

diff --git a/builtin/providers/atlas/provider.go b/builtin/providers/atlas/provider.go
@@ -2,8 +2,8 @@ package atlas
 
 import (
 	"github.com/hashicorp/atlas-go/v1"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/helper/schema"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 const (

diff --git a/builtin/providers/atlas/provider_test.go b/builtin/providers/atlas/provider_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/helper/schema"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 var testAccProviders map[string]terraform.ResourceProvider

diff --git a/builtin/providers/atlas/resource_artifact.go b/builtin/providers/atlas/resource_artifact.go
@@ -5,8 +5,8 @@ import (
 	"regexp"
 
 	"github.com/hashicorp/atlas-go/v1"
-	"github.com/hashicorp/terraform/helper/hashcode"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/xanzy/terraform-api/helper/hashcode"
+	"github.com/xanzy/terraform-api/helper/schema"
 )
 
 var (

diff --git a/builtin/providers/atlas/resource_artifact_test.go b/builtin/providers/atlas/resource_artifact_test.go
@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/helper/resource"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func TestAccArtifact_basic(t *testing.T) {

diff --git a/builtin/providers/aws/autoscaling_tags.go b/builtin/providers/aws/autoscaling_tags.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/autoscaling"
-	"github.com/hashicorp/terraform/helper/hashcode"
-	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/xanzy/terraform-api/helper/hashcode"
+	"github.com/xanzy/terraform-api/helper/schema"
 )
 
 // tagsSchema returns the schema to use for tags.

diff --git a/builtin/providers/aws/autoscaling_tags_test.go b/builtin/providers/aws/autoscaling_tags_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go/service/autoscaling"
-	"github.com/hashicorp/terraform/helper/resource"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/helper/resource"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 func TestDiffAutoscalingTags(t *testing.T) {

diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go
@@ -5,15 +5,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/terraform/helper/hashcode"
-	"github.com/hashicorp/terraform/helper/mutexkv"
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
-
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
+
+	"github.com/xanzy/terraform-api/helper/hashcode"
+	"github.com/xanzy/terraform-api/helper/mutexkv"
+	"github.com/xanzy/terraform-api/helper/schema"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 // Provider returns a terraform.ResourceProvider.

diff --git a/builtin/providers/aws/provider_test.go b/builtin/providers/aws/provider_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/terraform"
+	"github.com/xanzy/terraform-api/helper/schema"
+	"github.com/xanzy/terraform-api/terraform"
 )
 
 var testAccProviders map[string]terraform.ResourceProvider