Merge branch 'master' of github.com:reverbdotcom/terraform into addin…

…g-rds-snapshots

* 'master' of github.com:reverbdotcom/terraform: (524 commits)
  docs: tweaks to RELEASING
  Minor change to docs
  Update CHANGELOG.md
  Update DynamoDB example docs to remove non-key attributes; update test to remove non-key attribute from attribute set to prevent infinite planning loops
  Update CHANGELOG.md
  use /usr/bin/env bash
  provider/aws: fix go vet
  provider/aws: ignore providers with Meta nil
  update CHANGELOG
  provider/aws: Code cleanups for Spot Requests
  provider/aws: fix db_subnet acc test
  Fixing the tests
  Fixes issue hashicorp#2568
  Update CHANGELOG.md
  Update CHANGELOG.md
  fixes typo
  Fixed void Azure network config bug.
  provider/aws: ecs task definition is deregistered correctly
  provider/azure: fixup storage service test
  provider/docker: [tests] change images
  ...

CHANGELOG.md

@@ -1,17 +1,184 @@
-## 0.5.3 (Unreleased)
+## 0.6.0 (Unreleased)
+
+BACKWARDS INCOMPATIBILITIES:
+
+ * command/push: If a variable is already set within Atlas, it won't be
+ updated unless the `-overwrite` flag is present [GH-2373]
+ * connection/ssh: The `agent` field now defaults to `true` if
+ the `SSH_AGENT_SOCK` environment variable is present. In other words,
+ `ssh-agent` support is now opt-out instead of opt-in functionality. [GH-2408]
+ * provider/aws: If you were setting access and secret key to blank ("")
+ to force Terraform to load credentials from another source such as the
+ EC2 role, this will now error. Remove the blank lines and Terraform
+ will load from other sources.
+ * `concat()` has been repurposed to combine lists instead of strings (old behavior
+ of joining strings is maintained in this version but is deprecated, strings
+ should be combined using interpolation syntax, like "${var.foo}{var.bar}")
+ [GH-1790]
+
+FEATURES:
+
+ * **New provider: `azure`** [GH-2052, GH-2053, GH-2372, GH-2380, GH-2394, GH-2515, GH-2530, GH-2562]
+ * **New resource: `aws_autoscaling_notification`** [GH-2197]
+ * **New resource: `aws_autoscaling_policy`** [GH-2201]
+ * **New resource: `aws_cloudwatch_metric_alarm`** [GH-2201]
+ * **New resource: `aws_dynamodb_table`** [GH-2121]
+ * **New resource: `aws_ecs_cluster`** [GH-1803]
+ * **New resource: `aws_ecs_service`** [GH-1803]
+ * **New resource: `aws_ecs_task_definition`** [GH-1803, GH-2402]
+ * **New resource: `aws_elasticache_parameter_group`** [GH-2276]
+ * **New resource: `aws_flow_log`** [GH-2384]
+ * **New resource: `aws_iam_group_association`** [GH-2273]
+ * **New resource: `aws_iam_policy_attachment`** [GH-2395]
+ * **New resource: `aws_lambda_function`** [GH-2170]
+ * **New resource: `aws_route53_delegation_set`** [GH-1999]
+ * **New resource: `aws_route53_health_check`** [GH-2226]
+ * **New resource: `aws_spot_instance_request`** [GH-2263]
+ * **New resource: `cloudstack_ssh_keypair`** [GH-2004]
+ * **New remote state backend: `swift`**: You can now store remote state in
+ a OpenStack Swift. [GH-2254]
+ * command/output: support display of module outputs [GH-2102]
+ * core: `keys()` and `values()` funcs for map variables [GH-2198]
+ * connection/ssh: SSH bastion host support and ssh-agent forwarding [GH-2425]
+
+IMPROVEMENTS:
+
+ * core: HTTP remote state now accepts `skip_cert_verification`
+ option to ignore TLS cert verification. [GH-2214]
+ * core: S3 remote state now accepts the 'encrypt' option for SSE [GH-2405]
+ * core: `plan` now reports sum of resources to be changed/created/destroyed [GH-2458]
+ * core: Change string list representation so we can distinguish empty, single
+ element lists [GH-2504]
+ * core: Properly close provider and provisioner plugin connections [GH-2406, GH-2527]
+ * provider/aws: AutoScaling groups now support updating Load Balancers without
+ recreation [GH-2472]
+ * provider/aws: Allow more in-place updates for ElastiCache cluster without recreating
+ [GH-2469]
+ * provider/aws: ElastiCache Subnet Groups can be updated
+ without destroying first [GH-2191]
+ * provider/aws: Normalize `certificate_chain` in `aws_iam_server_certificate` to
+ prevent unnecessary replacement. [GH-2411]
+ * provider/aws: `aws_instance` supports `monitoring' [GH-2489]
+ * provider/aws: `aws_launch_configuration` now supports `enable_monitoring` [GH-2410]
+ * provider/aws: Show outputs after `terraform refresh` [GH-2347]
+ * provider/aws: Add backoff/throttling during DynamoDB creation [GH-2462]
+ * provider/aws: Add validation for aws_vpc.cidr_block [GH-2514]
+ * provider/aws: Add validation for aws_db_subnet_group.name [GH-2513]
+ * provider/aws: Add validation for aws_db_instance.identifier [GH-2516]
+ * provider/aws: Add validation for aws_elb.name [GH-2517]
+ * provider/aws: Add validation for aws_security_group (name+description) [GH-2518]
+ * provider/aws: Add validation for aws_launch_configuration [GH-2519]
+ * provider/aws: Add validation for aws_autoscaling_group.name [GH-2520]
+ * provider/aws: Add validation for aws_iam_role.name [GH-2521]
+ * provider/aws: Add validation for aws_iam_role_policy.name [GH-2552]
+ * provider/aws: Add validation for aws_iam_instance_profile.name [GH-2553]
+ * provider/aws: aws_auto_scaling_group.default_cooldown no longer requires
+ resource replacement [GH-2510]
+ * provider/aws: add AH and ESP protocol integers [GH-2321]
+ * provider/docker: `docker_container` has the `privileged`
+ option. [GH-2227]
+ * provider/openstack: allow `OS_AUTH_TOKEN` environment variable
+ to set the openstack `api_key` field [GH-2234]
+ * provider/openstack: Can now configure endpoint type (public, admin,
+ internal) [GH-2262]
+ * provider/cloudstack: `cloudstack_instance` now supports projects [GH-2115]
+ * provisioner/chef: Added a `os_type` to specifically specify the target OS [GH-2483]
+ * provisioner/chef: Added a `ohai_hints` option to upload hint files [GH-2487]
+
+BUG FIXES:
+
+ * core: lifecycle `prevent_destroy` can be any value that can be
+ coerced into a bool [GH-2268]
+ * core: matching provider types in sibling modules won't override
+ each other's config. [GH-2464]
+ * core: computed provider configurations now properly validate [GH-2457]
+ * core: orphan (commented out) resource dependencies are destroyed in
+ the correct order [GH-2453]
+ * core: validate object types in plugins are actually objects [GH-2450]
+ * core: fix `-no-color` flag in subcommands [GH-2414]
+ * core: Fix error of 'attribute not found for variable' when a computed
+ resource attribute is used as a parameter to a module [GH-2477]
+ * core: moduled orphans will properly inherit provider configs [GH-2476]
+ * core: modules with provider aliases work properly if the parent
+ doesn't implement those aliases [GH-2475]
+ * core: unknown resource attributes passed in as parameters to modules
+ now error [GH-2478]
+ * core: better error messages for missing variables [GH-2479]
+ * core: removed set items now properly appear in diffs and applies [GH-2507]
+ * core: '*' will not be added as part of the variable name when you
+ attempt multiplication without a space [GH-2505]
+ * core: fix target dependency calculation across module boundaries [GH-2555]
+ * command/*: fixed bug where variable input was not asked for unset
+ vars if terraform.tfvars existed [GH-2502]
+ * command/apply: prevent output duplication when reporting errors [GH-2267]
+ * command/apply: destroyed orphan resources are properly counted [GH-2506]
+ * provider/aws: loading credentials from the environment (vars, EC2 role,
+ etc.) is more robust and will not ask for credentials from stdin [GH-1841]
+ * provider/aws: fix panic when route has no `cidr_block` [GH-2215]
+ * provider/aws: fix issue preventing destruction of IAM Roles [GH-2177]
+ * provider/aws: fix issue where Security Group Rules could collide and fail
+ to save to the state file correctly [GH-2376]
+ * provider/aws: fix issue preventing destruction self referencing Securtity
+ Group Rules [GH-2305]
+ * provider/aws: fix issue causing perpetual diff on ELB listeners
+ when non-lowercase protocol strings were used [GH-2246]
+ * provider/aws: corrected frankfurt S3 website region [GH-2259]
+ * provider/aws: `aws_elasticache_cluster` port is required [GH-2160]
+ * provider/aws: Handle AMIs where RootBlockDevice does not appear in the
+ BlockDeviceMapping, preventing root_block_device from working [GH-2271]
+ * provider/aws: fix `terraform show` with remote state [GH-2371]
+ * provider/aws: detect `instance_type` drift on `aws_instance` [GH-2374]
+ * provider/aws: fix crash when `security_group_rule` referenced non-existent
+ security group [GH-2434]
+ * provider/aws: `aws_launch_configuration` retries if IAM instance
+ profile is not ready yet. [GH-2452]
+ * provider/aws: `fqdn` is populated during creation for `aws_route53_record` [GH-2528]
+ * provider/aws: retry VPC delete on DependencyViolation due to eventual
+ consistency [GH-2532]
+ * provider/aws: VPC peering connections in "failed" state are deleted [GH-2544]
+ * provider/aws: EIP deletion works if it was manually disassociated [GH-2543]
+ * provider/aws: `elasticache_subnet_group.subnet_ids` is now a required argument [GH-2534]
+ * provider/aws: handle nil response from VPN connection describes [GH-2533]
+ * provider/cloudflare: manual record deletion doesn't cause error [GH-2545]
+ * provider/digitalocean: handle case where droplet is deleted outside of
+ terraform [GH-2497]
+ * provider/dme: No longer an error if record deleted manually [GH-2546]
+ * provider/docker: Fix issues when using containers with links [GH-2327]
+ * provider/openstack: fix panic case if API returns nil network [GH-2448]
+ * provider/template: fix issue causing "unknown variable" rendering errors
+ when an existing set of template variables is changed [GH-2386]
+ * provisioner/chef: improve the decoding logic to prevent parameter not found errors [GH-2206]
+
+## 0.5.3 (June 1, 2015)
 
 IMPROVEMENTS:
 
+ * **New resource: `aws_kinesis_stream`** [GH-2110]
+ * **New resource: `aws_iam_server_certificate`** [GH-2086]
  * **New resource: `aws_sqs_queue`** [GH-1939]
+ * **New resource: `aws_sns_topic`** [GH-1974]
+ * **New resource: `aws_sns_topic_subscription`** [GH-1974]
+ * **New resource: `aws_volume_attachment`** [GH-2050]
+ * **New resource: `google_storage_bucket`** [GH-2060]
  * provider/aws: support ec2 termination protection [GH-1988]
  * provider/aws: support for RDS Read Replicas [GH-1946]
  * provider/aws: `aws_s3_bucket` add support for `policy` [GH-1992]
- * provider/aws: New `force_destroy` parameter for S3 buckets, to destroy 
+ * provider/aws: `aws_ebs_volume` add support for `tags` [GH-2135]
+ * provider/aws: `aws_elasticache_cluster` Confirm node status before reporting
+ available
+ * provider/aws: `aws_network_acl` Add support for ICMP Protocol [GH-2148]
+ * provider/aws: New `force_destroy` parameter for S3 buckets, to destroy
  Buckets that contain objects [GH-2007]
+ * provider/aws: switching `health_check_type` on ASGs no longer requires
+ resource refresh [GH-2147]
+ * provider/aws: ignore empty `vpc_security_group_ids` on `aws_instance` [GH-2311]
 
 BUG FIXES:
 
  * provider/aws: Correctly handle AWS keypairs which no longer exist [GH-2032]
+ * provider/aws: Fix issue with restoring an Instance from snapshot ID [GH-2120]
+ * provider/template: store relative path in the state [GH-2038]
+ * provisioner/chef: fix interpolation in the Chef provisioner [GH-2168]
  * provisioner/remote-exec: Don't prepend shebang on scripts that already
  have one [GH-2041]
 
@@ -122,7 +289,7 @@ IMPROVEMENTS:
  * **New resource: `google_dns_record_set`**
  * **Migrate to upstream AWS SDK:** Migrate the AWS provider to
  [awslabs/aws-sdk-go](https://github.com/awslabs/aws-sdk-go),
- the offical `awslabs` library. Previously we had forked the library for
+ the official `awslabs` library. Previously we had forked the library for
  stability while `awslabs` refactored. Now that work has completed, and we've
  migrated back to the upstream version.
  * core: Improve error message on diff mismatch [GH-1501]
@@ -150,7 +317,7 @@ IMPROVEMENTS:
  * provider/aws: `aws_network_acl` improved validation for network ACL ports
  and protocols [GH-1798] [GH-1808]
  * provider/aws: `aws_route_table` can target network interfaces [GH-968]
- * provider/aws: `aws_route_table` can specify propogating VGWs [GH-1516]
+ * provider/aws: `aws_route_table` can specify propagating VGWs [GH-1516]
  * provider/aws: `aws_route53_record` supports weighted sets [GH-1578]
  * provider/aws: `aws_route53_zone` exports nameservers [GH-1525]
  * provider/aws: `aws_s3_bucket` website support [GH-1738]
@@ -307,7 +474,7 @@ FEATURES:
  * **Math operations** in interpolations. You can now do things like
  `${count.index+1}`. [GH-1068]
  * **New AWS SDK:** Move to `aws-sdk-go` (hashicorp/aws-sdk-go),
- a fork of the offical `awslabs` repo. We forked for stability while
+ a fork of the official `awslabs` repo. We forked for stability while
  `awslabs` refactored the library, and will move back to the officially
  supported version in the next release.
 
@@ -336,7 +503,7 @@ IMPROVEMENTS:
  * providers/aws: Improve dependency violation error handling, when deleting
  Internet Gateways or Auto Scaling groups [GH-1325].
  * provider/aws: Add non-destructive updates to AWS RDS. You can now upgrade
- `egine_version`, `parameter_group_name`, and `multi_az` without forcing
+ `engine_version`, `parameter_group_name`, and `multi_az` without forcing
  a new database to be created.[GH-1341]
  * providers/aws: Full support for block device mappings on instances and
  launch configurations [GH-1045, GH-1364]

Makefile

@@ -15,6 +15,10 @@ dev: generate
 quickdev: generate
  @TF_QUICKDEV=1 TF_DEV=1 sh -c "'$(CURDIR)/scripts/build.sh'"
 
+release: updatedeps
+ gox -build-toolchain
+ @$(MAKE) bin
+
 # test runs the unit tests and vets the code
 test: generate
  TF_ACC= go test $(TEST) $(TESTARGS) -timeout=30s -parallel=4
@@ -23,10 +27,11 @@ test: generate
 # testacc runs acceptance tests
 testacc: generate
  @if [ "$(TEST)" = "./..." ]; then \
- echo "ERROR: Set TEST to a specific package"; \
+ echo "ERROR: Set TEST to a specific package. For example,"; \
+ echo " make testacc TEST=./builtin/providers/aws"; \
  exit 1; \
  fi
- TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 45m
+ TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 90m
 
 # testrace runs the race checker
 testrace: generate
@@ -61,7 +66,8 @@ vet:
  @go tool vet $(VETARGS) . ; if [ $$? -eq 1 ]; then \
  echo ""; \
  echo "Vet found suspicious constructs. Please check the reported constructs"; \
- echo "and fix them if necessary before submitting the code for reviewal."; \
+ echo "and fix them if necessary before submitting the code for review."; \
+ exit 1; \
  fi
 
 # generate runs `go generate` to build the dynamically generated

README.md

@@ -31,7 +31,7 @@ Developing Terraform
 
 If you wish to work on Terraform itself or any of its built-in providers, you'll first need [Go](http://www.golang.org) installed on your machine (version 1.4+ is *required*). Alternatively, you can use the Vagrantfile in the root of this repo to stand up a virtual machine with the appropriate dev tooling already set up for you.
 
-For local dev first make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH). Next, install the following software packages, which are needed for some dependencies:
+For local dev first make sure Go is properly installed, including setting up a [GOPATH](http://golang.org/doc/code.html#GOPATH). You will also need to add `$GOPATH/bin` to your `$PATH`. Next, install the following software packages, which are needed for some dependencies:
 
 - [Git](http://git-scm.com/)
 - [Mercurial](http://mercurial.selenic.com/)
@@ -74,7 +74,7 @@ To run the acceptance tests, invoke `make testacc`:
 ```sh
 $ make testacc TEST=./builtin/providers/aws TESTARGS='-run=Vpc'
 go generate ./...
-TF_ACC=1 go test ./builtin/providers/aws -v -run=Vpc -timeout 45m
+TF_ACC=1 go test ./builtin/providers/aws -v -run=Vpc -timeout 90m
 === RUN TestAccVpc_basic
 2015/02/10 14:11:17 [INFO] Test: Using us-west-2 as test region
 [...]

RELEASING.md

@@ -0,0 +1,83 @@
+# Releasing Terraform
+
+This document contains details about the Terraform release process.
+
+## Schedule
+
+Terraform currently has no fixed release schedule, the HashiCorp maintainers
+can usually give a feel for roughly when the next release is planned.
+
+## Versioning
+
+As a pre-1.0 project, we use the MINOR and PATCH versions as follows:
+
+ * a `MINOR` version increment indicates a release that may contain backwards
+ incompatible changes
+ * a `PATCH` version increment indicates a release that may contain bugfixes as
+ well as additive (backwards compatible) features and enhancements
+
+## Process
+
+For maintainer documentation purposes, here is the current release process:
+
+```sh
+# Spin up a fresh build VM
+vagrant destroy -f
+vagrant up
+vagrant ssh
+cd /opt/gopath/src/github.com/hashicorp/terraform/
+
+# Fetch dependencies
+make updatedeps
+
+# Verify unit tests pass
+make test
+
+# Prep release commit
+export VERSION="vX.Y.Z"
+# Edit CHANGELOG.md, adding current date to unreleased version header
+# Edit version.go, setting VersionPrelease to empty string
+
+# Snapshot dependency information
+godep save ./...
+cp Godeps/Godeps.json deps/$(echo $VERSION | sed 's/\./-/g').json
+
+# Make and tag release commit (skipping Godeps dir)
+git add CHANGELOG.md terraform/version.go deps/
+git commit -a -m "${VERSION}"
+git tag -m "${VERSION}" "${VERSION}"
+
+# Build the release
+make release
+
+# Make an archive with vendored dependencies
+stashName=$(git stash)
+git archive -o terraform-$VERSION-src.tar.gz $stashName
+
+# Zip and push release to bintray
+export BINTRAY_API_KEY="..."
+./scripts/dist "X.Y.Z" # no `v` prefix here
+
+# -- "Point of no return" --
+# -- Process can be aborted safely at any point before this --
+
+# Push the release commit and tag
+git push origin master
+git push origin vX.Y.Z
+
+# Click "publish" on the release from the Bintray Web UI
+# Upload terraform-$VERSION-src.tar.gz as a file to the GitHub release.
+
+# -- Release is complete! --
+
+# Start release branch (to be used for reproducible builds and docs updates)
+git checkout -b release/$VERSION
+git push origin release/$VERSION
+
+# Clean up master
+git checkout master
+# Set VersionPrerelease to "dev"
+# Add new CHANGELOG section for next release
+git add -A
+git commit -m "release: clean up after ${VERSION}"
+```