Adding CRUD support for Customer Gateway for AWS VPC.

.gitignore

@@ -15,3 +15,5 @@ website/node_modules
 *.tfstate
 *.log
 *.bak
+*~
+.*.swp

.travis.yml

@@ -1,15 +1,30 @@
+sudo: false
+
 language: go
 
 go:
-    - 1.4
-    - tip
+  - 1.4
+  - tip
 
 install: make updatedeps
 
 script:
-    - go test ./...
-    #- go test -race ./...
+  - go test ./...
+  - make vet
+  #- go test -race ./...
+
+branches:
+  only:
+    - master
+
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#terraform-tool"
+    skip_join: true
+    use_notice: true
 
 matrix:
-    allow_failures:
-        - go: tip
+  fast_finish: true
+  allow_failures:
+    - go: tip

CHANGELOG.md

@@ -1,12 +1,96 @@
-## 0.3.7 (unreleased)
+## 0.4.0 (unreleased)
+
+BACKWARDS INCOMPATIBILITIES:
+
+  * Commands `terraform push` and `terraform pull` are now nested under
+    the `remote` command: `terraform remote push` and `terraform remote pull`.
+    The old `remote` functionality is now at `terraform remote config`. This
+    consolidates all remote state management under one command.
+
+FEATURES:
+
+  * **New provider: `dme` (DNSMadeEasy)** [GH-855]
+  * **New command: `taint`** - Manually mark a resource as tainted, causing
+      a destroy and recreate on the next plan/apply.
+  * **Self-variables** can be used to reference the current resource's
+      attributes within a provisioner. Ex. `${self.private_ip_address}` [GH-1033]
+  * **Continous state** saving during `terraform apply`. The state file is
+      continously updated as apply is running, meaning that the state is
+      less likely to become corrupt in a catastrophic case: terraform panic
+      or system killing Terraform.
+  * **Math operations** in interpolations. You can now do things like
+      `${count.index+1}`. [GH-1068]
+
+IMPROVEMENTS:
+
+  * **New config function: `format`** - Format a string using `sprintf`
+      format. [GH-1096]
+  * **New config function: `replace`** - Search and replace string values.
+      Search can be a regular expression. See documentation for more
+      info. [GH-1029]
+  * **New config function: `split`** - Split a value based on a delimiter.
+      This is useful for faking lists as parameters to modules.
+  * **New resource: `digitalocean_ssh_key`** [GH-1074]
+  * core: The serial of the state is only updated if there is an actual
+      change. This will lower the amount of state changing on things
+      like refresh.
+  * core: Autoload `terraform.tfvars.json` as well as `terraform.tfvars` [GH-1030]
+
+BUG FIXES:
+
+  * core: module outputs can be used as inputs to other modules [GH-822]
+  * core: Self-referencing splat variables are no longer allowed in
+      provisioners. [GH-795][GH-868]
+  * core: Validate that `depends_on` doesn't contain interpolations. [GH-1015]
+  * core: Module inputs can be non-strings. [GH-819]
+  * core: Fix invalid plan that resulted in "diffs don't match" error when
+      a computed attribute was used as part of a set parameter. [GH-1073]
+  * core: Fix edge case where state containing both "resource" and
+      "resource.0" would ignore the latter completely. [GH-1086]
+  * providers/aws: manually deleted VPC removes it from the state
+  * providers/aws: `source_dest_check` regression fixed (now works). [GH-1020]
+  * providers/aws: Longer wait times for DB instances.
+  * providers/aws: Longer wait times for route53 records (30 mins). [GH-1164]
+  * providers/digitalocean: Waits until droplet is ready to be destroyed [GH-1057]
+  * providers/digitalocean: More lenient about 404's while waiting [GH-1062]
+  * providers/google: Network data in state was not being stored. [GH-1095]
+
+PLUGIN CHANGES:
+
+  * New `helper/schema` fields for resources: `Deprecated` and `Removed` allow
+      plugins to generate warning or error messages when a given attribute is used.
+
+## 0.3.7 (February 19, 2015)
 
 IMPROVEMENTS:
 
+  * **New resources: `google_compute_forwarding_rule`, `google_compute_http_health_check`,
+      and `google_compute_target_pool`** - Together these provide network-level
+      load balancing. [GH-588]
+  * **New resource: `aws_main_route_table_association`** - Manage the main routing table
+      of a VPC. [GH-918]
+  * **New resource: `aws_vpc_peering_connection`** [GH-963]
   * core: Formalized the syntax of interpolations and documented it
       very heavily.
   * core: Strings in interpolations can now contain further interpolations,
       e.g.: `foo ${bar("${baz}")}`.
   * provider/aws: Internet gateway supports tags [GH-720]
+  * provider/aws: Support the more standard environmental variable names
+      for access key and secret keys. [GH-851]
+  * provider/aws: The `aws_db_instance` resource no longer requires both
+      `final_snapshot_identifier` and `skip_final_snapshot`; the presence or
+      absence of the former now implies the latter. [GH-874]
+  * provider/aws: Avoid unecessary update of `aws_subnet` when
+      `map_public_ip_on_launch` is not specified in config. [GH-898]
+  * provider/aws: Add `apply_method` to `aws_db_parameter_group` [GH-897]
+  * provider/aws: Add `storage_type` to `aws_db_instance` [GH-896]
+  * provider/aws: ELB can update listeners without requiring new. [GH-721]
+  * provider/aws: Security group support egress rules. [GH-856]
+  * provider/aws: Route table supports VPC peering connection on route. [GH-963]
+  * provider/aws: Add `root_block_device` to `aws_db_instance` [GH-998]
+  * provider/google: Remove "client secrets file", as it's no longer necessary
+      for API authentication [GH-884].
+  * provider/google: Expose `self_link` on `google_compute_instance` [GH-906]
 
 BUG FIXES:
 
@@ -17,17 +101,41 @@ BUG FIXES:
   * core: Fix crash that could occur when there are exactly zero providers
       installed on a system. [GH-786]
   * core: JSON TF configurations can configure provisioners. [GH-807]
+  * core: Sort `depends_on` in state to prevent unnecessary file changes. [GH-928]
+  * core: State containing the zero value won't cause a diff with the
+      lack of a value. [GH-952]
+  * core: If a set type becomes empty, the state will be properly updated
+      to remove it. [GH-952]
+  * core: Bare "splat" variables are not allowed in provisioners. [GH-636]
+  * core: Invalid configuration keys to sub-resources are now errors. [GH-740]
   * command/apply: Won't try to initialize modules in some cases when
       no arguments are given. [GH-780]
   * command/apply: Fix regression where user variables weren't asked [GH-736]
-  * provider/aws: ELB subnet change doesn't force new resource. [GH-804]
+  * helper/hashcode: Update `hash.String()` to always return a positive index.
+      Fixes issue where specific strings would convert to a negative index
+      and be ommited when creating Route53 records. [GH-967]
+  * provider/aws: Automatically suffix the Route53 zone name on record names. [GH-312]
+  * provider/aws: Instance should ignore root EBS devices. [GH-877]
+  * provider/aws: Fix `aws_db_instance` to not recreate each time. [GH-874]
+  * provider/aws: ASG termination policies are synced with remote state. [GH-923]
+  * provider/aws: ASG launch configuration setting can now be updated in-place. [GH-904]
+  * provider/aws: No read error when subnet is manually deleted. [GH-889]
+  * provider/aws: Tags with empty values (empty string) are properly
+      managed. [GH-968]
+  * provider/aws: Fix case where route table would delete its routes
+      on an unrelated change. [GH-990]
+  * provider/google: Fix bug preventing instances with metadata from being
+      created [GH-884].
 
 PLUGIN CHANGES:
 
   * New `helper/schema` type: `TypeFloat` [GH-594]
   * New `helper/schema` field for resources: `Exists` must point to a function
       to check for the existence of a resource. This is used to properly
       handle the case where the resource was manually deleted. [GH-766]
+  * There is a semantic change in `GetOk` where it will return `true` if
+      there is any value in the diff that is _non-zero_. Before, it would
+      return true only if there was a value in the diff.
 
 ## 0.3.6 (January 6, 2015)
 

Makefile

@@ -3,35 +3,56 @@ VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods -nilfunc -printf
 
 default: test
 
+# bin generates the releaseable binaries for Terraform
 bin: generate
 	@sh -c "'$(CURDIR)/scripts/build.sh'"
 
+# dev creates binaries for testing Terraform locally. These are put
+# into ./bin/ as well as $GOPATH/bin
 dev: generate
 	@TF_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
 
+quickdev: generate
+	@TF_QUICKDEV=1 TF_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
+
+# test runs the unit tests and vets the code
 test: generate
-	TF_ACC= go test $(TEST) $(TESTARGS) -timeout=10s -parallel=4
+	TF_ACC= go test $(TEST) $(TESTARGS) -timeout=30s -parallel=4
 	@$(MAKE) vet
 
+# testacc runs acceptance tests
 testacc: generate
 	@if [ "$(TEST)" = "./..." ]; then \
 		echo "ERROR: Set TEST to a specific package"; \
 		exit 1; \
 	fi
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 45m
 
+# testrace runs the race checker
 testrace: generate
 	TF_ACC= go test -race $(TEST) $(TESTARGS)
 
+# updatedeps installs all the dependencies that Terraform needs to run
+# and build.
 updatedeps:
-	$(eval REF := $(shell sh -c "\
-		git symbolic-ref --short HEAD 2>/dev/null \
-		|| git rev-parse HEAD"))
+	go get -u github.com/mitchellh/gox
 	go get -u golang.org/x/tools/cmd/stringer
-	go get -u golang.org/x/tools/cmd/vet
-	go get -f -u -v ./...
-	git checkout $(REF)
+	go list ./... \
+		| xargs go list -f '{{join .Deps "\n"}}' \
+		| grep -v github.com/hashicorp/terraform \
+		| sort -u \
+		| xargs go get -f -u -v
+
+cover:
+	@go tool cover 2>/dev/null; if [ $$? -eq 3 ]; then \
+		go get -u golang.org/x/tools/cmd/cover; \
+	fi
+	go test $(TEST) -coverprofile=coverage.out
+	go tool cover -html=coverage.out
+	rm coverage.out
 
+# vet runs the Go source code static analysis tool `vet` to find
+# any common errors.
 vet:
 	@go tool vet 2>/dev/null ; if [ $$? -eq 3 ]; then \
 		go get golang.org/x/tools/cmd/vet; \
@@ -43,6 +64,8 @@ vet:
 		echo "and fix them if necessary before submitting the code for reviewal."; \
 	fi
 
+# generate runs `go generate` to build the dynamically generated
+# source files.
 generate:
 	go generate ./...
 

README.md

@@ -36,12 +36,6 @@ For local dev first make sure Go is properly installed, including setting up a [
 -	[Git](http://git-scm.com/)
 -	[Mercurial](http://mercurial.selenic.com/)
 
-Then, install [Gox](https://github.com/mitchellh/gox), which is used as a compilation tool on top of Go:
-
-```sh
-$ go get -u github.com/mitchellh/gox
-```
-
 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!
 
 ```sh
@@ -78,7 +72,13 @@ If you're working on a feature of a provider and want to verify it is functionin
 To run the acceptance tests, invoke `make testacc`:
 
 ```sh
-$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=VPC'
+$ make testacc TEST=./builtin/providers/aws TESTARGS='-run=Vpc'
+go generate ./...
+TF_ACC=1 go test ./builtin/providers/aws -v -run=Vpc -timeout 45m
+=== RUN TestAccVpc_basic
+2015/02/10 14:11:17 [INFO] Test: Using us-west-2 as test region
+[...]
+[...]
 ...
 ```
 

Vagrantfile

@@ -15,7 +15,7 @@ cd /opt/go/src && ./all.bash
 mkdir -p /opt/gopath
 cat <<EOF >/etc/profile.d/gopath.sh
 export GOPATH="/opt/gopath"
-export PATH="/opt/go/bin:\$GOPATH/bin:\$PATH"
+export PATH="/opt/go/bin:$GOPATH/bin:\$PATH"
 EOF
 
 # Make sure the GOPATH is usable by vagrant

builtin/bins/provider-dme/main.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"github.com/hashicorp/terraform/builtin/providers/dme"
+	"github.com/hashicorp/terraform/plugin"
+)
+
+func main() {
+	plugin.Serve(&plugin.ServeOpts{
+		ProviderFunc: dme.Provider,
+	})
+}

builtin/bins/provider-dme/main_test.go

@@ -0,0 +1 @@
+package main

builtin/providers/aws/config.go

@@ -12,23 +12,31 @@ import (
 	"github.com/mitchellh/goamz/ec2"
 	"github.com/mitchellh/goamz/elb"
 	"github.com/mitchellh/goamz/rds"
-	"github.com/mitchellh/goamz/route53"
-	"github.com/mitchellh/goamz/s3"
+
+	awsGo "github.com/awslabs/aws-sdk-go/aws"
+	awsAutoScaling "github.com/awslabs/aws-sdk-go/gen/autoscaling"
+	awsRDS "github.com/awslabs/aws-sdk-go/gen/rds"
+	"github.com/awslabs/aws-sdk-go/gen/route53"
+	"github.com/awslabs/aws-sdk-go/gen/s3"
 )
 
 type Config struct {
 	AccessKey string
 	SecretKey string
+	Token     string
 	Region    string
 }
 
 type AWSClient struct {
-	ec2conn         *ec2.EC2
-	elbconn         *elb.ELB
-	autoscalingconn *autoscaling.AutoScaling
-	s3conn          *s3.S3
-	rdsconn         *rds.Rds
-	route53         *route53.Route53
+	ec2conn            *ec2.EC2
+	elbconn            *elb.ELB
+	autoscalingconn    *autoscaling.AutoScaling
+	s3conn             *s3.S3
+	rdsconn            *rds.Rds
+	r53conn            *route53.Route53
+	region             string
+	awsAutoScalingconn *awsAutoScaling.AutoScaling
+	awsRDSconn         *awsRDS.RDS
 }
 
 // Client configures and returns a fully initailized AWSClient
@@ -51,18 +59,32 @@ func (c *Config) Client() (interface{}, error) {
 	}
 
 	if len(errs) == 0 {
+		// store AWS region in client struct, for region specific operations such as
+		// bucket storage in S3
+		client.region = c.Region
+
+		creds := awsGo.Creds(c.AccessKey, c.SecretKey, c.Token)
+
 		log.Println("[INFO] Initializing EC2 connection")
 		client.ec2conn = ec2.New(auth, region)
 		log.Println("[INFO] Initializing ELB connection")
 		client.elbconn = elb.New(auth, region)
 		log.Println("[INFO] Initializing AutoScaling connection")
 		client.autoscalingconn = autoscaling.New(auth, region)
 		log.Println("[INFO] Initializing S3 connection")
-		client.s3conn = s3.New(auth, region)
+		client.s3conn = s3.New(creds, c.Region, nil)
 		log.Println("[INFO] Initializing RDS connection")
 		client.rdsconn = rds.New(auth, region)
+
+		// aws-sdk-go uses v4 for signing requests, which requires all global
+		// endpoints to use 'us-east-1'.
+		// See http://docs.aws.amazon.com/general/latest/gr/sigv4_changes.html
 		log.Println("[INFO] Initializing Route53 connection")
-		client.route53 = route53.New(auth, region)
+		client.r53conn = route53.New(creds, "us-east-1", nil)
+		log.Println("[INFO] Initializing AWS Go AutoScaling connection")
+		client.awsAutoScalingconn = awsAutoScaling.New(creds, c.Region, nil)
+		log.Println("[INFO] Initializing AWS Go RDS connection")
+		client.awsRDSconn = awsRDS.New(creds, c.Region, nil)
 	}
 
 	if len(errs) > 0 {
@@ -82,6 +104,7 @@ func (c *Config) AWSAuth() (aws.Auth, error) {
 		// Store the accesskey and secret that we got...
 		c.AccessKey = auth.AccessKey
 		c.SecretKey = auth.SecretKey
+		c.Token = auth.Token
 	}
 
 	return auth, err