Commit Graph

8696 Commits

Author SHA1 Message Date
Hasan Türken e41266e971 Move endpoint options into endpoints block 2016-02-12 09:38:21 -06:00
Hasan Türken 231604e8b7 support custom endpoints for AWS EC2 ELB and IAM 2016-02-12 09:35:50 -06:00
Clint a6d3c4e181 Merge pull request #5087 from vmindru/master
aws_instance docs
2016-02-12 09:09:21 -06:00
Paul Hinze 66ec38b2d9 Merge pull request #5046 from tpounds/use-built-in-schema-string-hash
Use built-in schema.HashString instead of custom hash functions.
2016-02-12 07:58:34 -06:00
Paul Stack 72dbb79e6f Merge pull request #5111 from shaneog/patch-1
Fix a typo: "encryption" to "encrypted"
2016-02-12 12:55:19 +00:00
Shane O'Grady 86f791aa2b Fix a typo: "encryption" to "encrypted"
Ref PR: #4481
2016-02-12 10:46:05 -02:00
stack72 35cac85579 Merge branch 'alexgear-fix-azure-docs' 2016-02-12 11:40:15 +00:00
Oleksandr Kushchenko a07005eacd Update azure provider documentation. 2016-02-12 11:39:14 +00:00
clint shryock 8b4a366b43 Merge branch 'pr-4969'
* pr-4969:
  provider/aws: All security group mods on first run when restoring from snapshot
2016-02-11 16:40:29 -06:00
clint shryock 21a59fc708 provider/aws: All security group mods on first run when restoring from snapshot 2016-02-11 16:39:53 -06:00
Paul Stack 06fdadf491 Merge pull request #5099 from tpounds/cleanup-aws-type-conversions
provider/aws: Consolidate duplicate list/set type conversions
2016-02-11 22:29:50 +00:00
Clint 5ba221014e Update CHANGELOG.md 2016-02-11 16:12:47 -06:00
Clint 934c31f76b Merge pull request #4969 from Chili-Man/bugfix/aws_provider_rds_security_groups
provider/aws: apply security group changes in EC2 Classic RDS for aws_db_instance
2016-02-11 16:12:12 -06:00
Sander van Harmelen 7c32752332 Merge pull request #4906 from svanharmelen/f-chef-attribute-file
provisioner/chef: make the Chef `attributes` param also accept a raw JSON string
2016-02-11 20:57:56 +01:00
Clint e04450d95f Merge pull request #4958 from hashicorp/b-aws-r53-record-tests
provider/aws: Add a regression test for Route53 records
2016-02-11 13:32:29 -06:00
clint shryock ac17be7bf0 Update changelog link with link to latest release 2016-02-11 13:28:02 -06:00
Michael Mell c000b96f87 add link to CHANGELOG 2016-02-11 10:54:40 -08:00
Trevor Pounds 57a9048510 Consolidate duplicate list/set type conversions. 2016-02-11 00:48:58 -08:00
Radek Simko a6f5b96a80 Merge pull request #5094 from alexclifford/master
Small documentation update
2016-02-11 08:10:56 +00:00
Paul Stack 455ea87061 Update CHANGELOG.md 2016-02-11 05:42:42 +00:00
Paul Stack 47ee916539 Merge pull request #5088 from superseb/docker_host_default
Change default DOCKER_HOST value, fixes #4923
2016-02-11 05:41:48 +00:00
Alex Clifford 706162fb3a Grammar inconsistencies 2016-02-11 10:06:43 +11:00
Sebastiaan van Steenis 4a10530b07 Change default DOCKER_HOST value, fixes #4923 2016-02-10 20:21:17 +01:00
Veaceslav Mindru 9112f9f50e Merge pull request #1 from vmindru/aws_instance_docs
aws instance docs
2016-02-10 19:31:36 +01:00
Veaceslav Mindru 1901533bea aws instance docs
associate_public_ip_address - missing explicit mentioning  that this is a bool.
2016-02-10 19:31:07 +01:00
Paul Hinze 3e69e2eca6 Merge pull request #5085 from hashicorp/phinze/recapture-deps-with-latest-godep
vendor: Recapture deps w/ latest godep
2016-02-10 11:06:44 -06:00
Paul Hinze 8209b40526 vendor: Recapture deps w/ latest godep
The original contents of `vendor` were inadvertently captured with an
older version of `godep`. Here, we recapture dependencies by running the
following:

```
godep restore -v
cat Godeps/Godeps.json | jq -r '.Deps[].ImportPath' | xargs godep update -v
```

The newer godep makes the following changes as it captures dependencies:

 * Skips test files
 * Copies `LICENSE` / `PATENTS` files

There is also an additional diff in `golang.org/x/sys/unix` that looks
very similar to the diff between `master..c65f27f` in that repo, so I'm
guessing that dependency was accidentally captured from master instead
of the commit saved to `Godeps.json`.

All in all, these changes should all be "more correct" and result in
smaller diffs for any future updates made to dependencies.
2016-02-10 10:45:16 -06:00
Joe Topjian fa6e673a97 Merge pull request #5077 from kars7e/master
Fix a typo in openstack network example
2016-02-09 22:24:10 -07:00
Karol Stepniewski 45d76e4634 Fix a typo in openstack network example
OpenStack port uses "fixed_ip" property to specify Fixed IP addresses,
but network example incorrectly uses "fixed_ipS" key.
2016-02-09 17:41:03 -08:00
Paul Hinze c628dd9247 Update CHANGELOG.md 2016-02-09 11:12:45 -06:00
Paul Hinze 9a00675262 Merge pull request #5026 from hashicorp/phinze/destroy-node-copies
core: Make copies when creating destroy nodes
2016-02-09 11:12:01 -06:00
Paul Hinze 2ebea91c98 Update CHANGELOG.md 2016-02-09 11:03:18 -06:00
Paul Hinze 4c123dbf96 Merge pull request #5022 from hashicorp/phinze/fix-provider-double-init-for-nested-module-orphans
core: fix bug detecting deeply nested module orphans
2016-02-09 11:02:37 -06:00
Paul Hinze 571027bae6 Merge pull request #5058 from tpounds/cleanup-aws-asg-acc-tests
provider/aws: Cleanup ASG acceptance tests
2016-02-09 11:01:16 -06:00
Paul Hinze e76fdb92e7 core: fix bug detecting deeply nested module orphans
Context:

As part of building up a Plan, Terraform needs to detect "orphaned"
resources--resources which are present in the state but not in the
config. This happens when config for those resources is removed by the
user, making it Terraform's responsibility to destroy them.

Both state and config are organized by Module into a logical tree, so
the process of finding orphans involves checking for orphaned Resources
in the current module and for orphaned Modules, which themselves will
have all their Resources marked as orphans.

Bug:

In #3114 a problem was exposed where, given a module tree that looked
like this:

```
root
 |
 +-- parent (empty, except for sub-modules)
       |
       +-- child1 (1 resource)
       |
       +-- child2 (1 resource)
```

If `parent` was removed, a bunch of error messages would occur during
the plan. The root cause of this was duplicate orphans appearing for the
resources in child1 and child2.

Fix:

This turned out to be a bug in orphaned module detection. When looking
for deeply nested orphaned modules, root.parent was getting added twice
as an orphaned module to the graph.

Here, we add an additional check to prevent a double add, which
addresses this scenario properly.

Fixes #3114 (the Provisioner side of it was fixed in #4877)
2016-02-09 10:35:46 -06:00
Paul Hinze 3f72837f4b core: Make copies when creating destroy nodes
Fixes an interpolation race that was occurring when a tainted destroy
node and a primary destroy node both tried to interpolate a computed
count in their config. Since they were sharing a pointer to the _same_
config, depending on how the race played out one of them could catch the
config uninterpolated and would then throw a syntax error.

The `Copy()` tree implemented for this fix can probably be used
elsewhere - basically we should copy the config whenever we drop nodes
into the graph - but for now I'm just applying it to the place that
fixes this bug.

Fixes #4982 - Includes a test covering that race condition.
2016-02-09 09:25:16 -06:00
Sander van Harmelen ac0cbd400e Add `attributes_json` param for consistency
Add `attributes_json` param for both consistency and easier management
of deprecating the old `attributes` param.
2016-02-09 11:11:46 +01:00
Trevor Pounds 164596880a Update acceptance test to use t2.micro instances.
The AWS free tier allows up to 750 hours on t2.micro
instance types. It's better to use cheaper instances
in case the resources are not cleaned up if a tests
is canceled or crashes.
2016-02-09 00:24:38 -08:00
Trevor Pounds 5801b991c9 Cleanup unrelated config to speed up autogenerate name acc test.
Removes overspecified config that is unrelated to testing the auto scaling
group's autogenerated name. The test is only concerned with checking that
the auto scaling group was created successfully with an autogenerated name
matching a specific pattern.
2016-02-08 21:28:35 -08:00
Trevor Pounds eba605fa6a Cleanup unrelated config to speed up AZ/VPC acc tests.
Removes overspecified config that is unrelated to the auto scaling
group's availability zone and VPC identifier acceptance tests. The
created auto scaling groups do not need to spin up any hosts since
the acceptance tests are only concerned with checking the existence
of the associated availability zones and VPC identifiers.
2016-02-08 19:55:11 -08:00
James Nugent 73102aba42 Update CHANGELOG.md 2016-02-08 18:01:22 -05:00
James Nugent b787fe2798 Merge pull request #5012 from jrnt30/TF-5011-Backend-flag-normalization
Fixes #5011 - Backend downcased for init
2016-02-08 17:59:20 -05:00
James Nugent 1ff5f6fb0c Merge pull request #5060 from stack72/f-lint-changes
Fixing some golint issues on the new validate command
2016-02-08 17:58:17 -05:00
stack72 1628f19bc1 Fixing some golint issues on the new validate command 2016-02-08 22:04:24 +00:00
James Nugent d3daf3e917 Update CHANGELOG.md 2016-02-08 16:44:46 -05:00
James Nugent dad70e4659 Merge pull request #5057 from stack72/azurerm-sql-firewall-rule
provider/azurerm: Add `azurerm_sql_firewall_rule` resource
2016-02-08 16:43:30 -05:00
Paul Stack 62fe83cf54 Update CHANGELOG.md 2016-02-08 21:38:18 +00:00
Paul Stack 4baa8fa691 Merge pull request #5044 from tpounds/fix-read-aws-asg-az
provider/aws: Fix reading auto scaling group availability zones
2016-02-08 21:37:23 +00:00
stack72 584b52c34c provider/azurerm: Add `azurerm_sql_firewall_rule` resource 2016-02-08 21:13:59 +00:00
Radek Simko f57068bbd5 Update CHANGELOG.md 2016-02-08 21:06:50 +00:00