Commit Graph

17176 Commits

Author SHA1 Message Date
James Bardin
bcbcc65f7d add terraform config merge logic to config.Merge 2017-03-22 09:01:54 -04:00
James Bardin
b38e620b2f merge config.Terraform fields in config.Append
Ensure that fields set in an earlier Terraform config block aren't
removed by Append when encountering another Terraform block. When
multiple blocks contain the same field, the later one still wins.
2017-03-21 15:43:55 -04:00
James Bardin
b7152c4405 Merge pull request #12897 from hashicorp/jbardin/ignore-changes
ignore_changes causes keys in other flatmapped objects to be lost from diff
2017-03-21 09:25:47 -04:00
James Bardin
0ae0076e3a Correctly filter flatmapped values in diff
When transforming a diff from DestroyCreate to a simple Update,
ignore_changes can cause keys from flatmapped objects to be filtered
form the diff. We need to filter each flatmapped container as a whole to
ensure that unchanged keys aren't lost in the update.
2017-03-21 09:11:54 -04:00
Sander van Harmelen
a317855e19 Update CHANGELOG.md 2017-03-21 12:04:41 +01:00
Yukihiko SAWANOBORI
5a1f8097a0 Add params zone_id to cloudstack ipaddress resource (#11306)
* add option zone_id

- Ref: http://docs.idcf.jp/cloud/api/address/#listpublicipaddresses

* Exclusion of `network_id`, `vpc_id` and `zone_id`

* Revert "Exclusion of `network_id`, `vpc_id` and `zone_id`"

This reverts commit 9684c8b0b65b3353aea4e0bfbeaf21986282812b.

* remove zone_id from one of required option.
2017-03-21 12:02:38 +01:00
James Bardin
3001f0c1b9 Fix test that relied on empty Old diff 2017-03-20 17:44:38 -04:00
James Bardin
970e7c1923 Add a failing test for missing keys in diff
ignore_changes is causing changes in other flatmapped sets to be
filtered out incorrectly.

This required fixing the testDiffFn to create diffs which include the
old value, breaking one other test.
2017-03-20 17:44:37 -04:00
Paul Stack
c217c6c0c4 Update CHANGELOG.md 2017-03-20 20:43:10 +00:00
James Nugent
9476fc4418 helper/acctest: Add NewSSHKeyPair function (#12894)
Many cloud services prevent duplicate key pairs with different names.
Among them are Digital Ocean, Joyent Triton and Packet. Consequently, if
tests leave dangling resources it is not enough to simply randomise the
name, the entire key material must be regenerated.

This commit adds a helper method that returns a new randomly generated
key pair, where the public key material is formatted in OpenSSH
"authorized keys" format, and the private key material is PEM encoded.
2017-03-20 20:42:34 +00:00
clint shryock
db132b312d update test to remove dupe provider definition 2017-03-20 14:18:14 -05:00
Mitchell Hashimoto
0592bec0ed Update CHANGELOG.md 2017-03-20 11:57:54 -07:00
Mitchell Hashimoto
f105c8533a Merge pull request #12888 from hashicorp/b-legacy-remove
command: remove legacy remote state on migration
2017-03-20 11:57:12 -07:00
clint shryock
f59e37a41f update test to remove dupe provider definition 2017-03-20 13:54:13 -05:00
Paul Stack
ca5291ba0b Update CHANGELOG.md 2017-03-20 18:25:24 +00:00
Dylan Conrad Johnson
934aa22549 nil checks when assigning to param map in resourceAwsSsmDocumentRead (#12891)
* add nil check when assingment from a doc parameter to the param map

* remove println
2017-03-20 18:24:13 +00:00
ryno75
3c94a89a05 fixing issue #12885 (documentation typo) (#12886) 2017-03-20 17:33:31 +00:00
Benjamin Boudreau
073fa873ac Fix receive typo (#12881) 2017-03-20 13:15:27 -04:00
Mitchell Hashimoto
d01886a644
command: remove legacy remote state on migration
Fixes #12871

We were forgetting to remove the legacy remote state from the actual
state value when migrating. This only causes an issue when saving a plan
since the plan contains the state itself and causes an error where both
a backend + legacy state exist.

If saved plans aren't used this causes no noticable issue.

Due to buggy upgrades already existing in the wild, I also added code to
clear the remote section if it exists in a standard unchanged backend
2017-03-20 10:14:59 -07:00
Paul Stack
19474ddb18 Update CHANGELOG.md 2017-03-20 16:11:25 +00:00
Gauthier Wallet
6f6dddba67 provider/aws: Deprecate the usage of stage_key in favor of usage plans (#12883) 2017-03-20 16:09:14 +00:00
Mitchell Hashimoto
373324ed43 Merge pull request #12814 from tpoindessous/patch-2
[DOCUMENTATION] Change version of Debian image
2017-03-20 09:05:58 -07:00
Paul Stack
93de0de683 Update CHANGELOG.md 2017-03-20 14:09:59 +00:00
Gauthier Wallet
23ebd0b972 Allow get/set of aws_api_gateway_api_key value attribute (#9462) 2017-03-20 14:08:37 +00:00
Paul Stack
71faa42920 Update CHANGELOG.md 2017-03-20 13:55:28 +00:00
Gauthier Wallet
ae2c7a5f0b provider/aws: Added Usage Plan Key resource (#12851)
* provider/aws: Added Usage Plan Key resource

* provider/aws: Added usage plan import documentation
2017-03-20 13:54:14 +00:00
Brett Slaski
cdc329ad1c terraform get -u flag doesn't work (#12445)
The -u flag didn't work for me and based on documentation should be -update, which did work.  Makes getting started docs more accurate.
2017-03-20 13:11:44 +00:00
Paul Stack
352f13431a Update CHANGELOG.md 2017-03-20 13:07:08 +00:00
Joshua Spence
f40997988e Add name_prefix to aws_autoscaling_group and aws_elb resources (#12629)
Adds support for `name_prefix` to the `aws_autoscaling_group` and `aws_elb` resources. Unfortunately when using `name_prefix` with `aws_elb`, this means that the specified prefix can only be a maximum of 6 characters in length. This is because the maximum length for an ELB name is 32 characters, and `resource.PrefixedUniqueId` generates a 26-character unique identifier. I was considering truncating the unique identifier to allow for a longer `name_prefix`, but I worried that doing so would increase the risk of collisions.
2017-03-20 13:06:45 +00:00
Paul Stack
ca8152a7f4 Update CHANGELOG.md 2017-03-20 13:05:55 +00:00
Jake Pusateri
c7546c7726 provider/aws: Fix flattened cloudfront lambda function associations to be a set, not a slice (#11984) 2017-03-20 13:05:19 +00:00
Paul Stack
4d70f4539d Update CHANGELOG.md 2017-03-20 13:01:20 +00:00
Laurent Commarieu
d54a8da7d4 feat(consul): add basic auth to consul provider (#12679) 2017-03-20 13:00:44 +00:00
Radek Simko
1c7b8c78ee Update CHANGELOG.md 2017-03-19 18:56:27 +00:00
Radek Simko
17afcf2708 provider/arukas: Increase timeout to 15mins & use standard helper (#12849) 2017-03-19 18:55:11 +00:00
Paul Stack
f772212c7e Update CHANGELOG.md 2017-03-19 17:38:21 +00:00
Alexander
ca517543f2 provider/pagerduty: Validate credentials (#12854)
* Validate credentials

* Add ability to skip validation

* Update provider documentation

* invalidCredentials -> invalidCreds

* Include original error message

* Update description for skip_credentials_validation

* Add config test

* set skip_credentials_validation default to false
2017-03-19 17:37:46 +00:00
Paul Stack
4759b51132 Update CHANGELOG.md 2017-03-19 17:24:05 +00:00
Joe Topjian
bd7ba34627 provider/openstack: Adding Timeouts to Network Resources (#12866) 2017-03-19 17:23:36 +00:00
Paul Stack
9d0b35542c Update CHANGELOG.md 2017-03-19 17:18:33 +00:00
Joe Topjian
fbf1732a7b provider/openstack: Adding Timeouts to LBaaS v1 Resources (#12867) 2017-03-19 17:18:03 +00:00
Paul Stack
1b6fb24590 Update CHANGELOG.md 2017-03-19 17:14:51 +00:00
Joe Topjian
adbc87f1e7 provider/openstack: Adding Timeouts to Image v2 and LBaaS v2 Resources (#12865) 2017-03-19 17:14:20 +00:00
Paul Stack
3457772bab Update CHANGELOG.md 2017-03-19 17:10:05 +00:00
Joe Topjian
42ff9103b7 provider/openstack: Adding Timeouts to FWaaS v1 Resources (#12863) 2017-03-19 17:09:22 +00:00
Paul Stack
fbf11d070b Update CHANGELOG.md 2017-03-19 17:07:54 +00:00
Joe Topjian
e37b26a3fa provider/openstack: Adding Timeouts to Blockstorage Resources (#12862) 2017-03-19 17:07:26 +00:00
Paul Stack
98ee99f405 provider/aws: Add the documentation for autoscaling_role to emr_cluster (#12847) 2017-03-18 16:49:12 +00:00
Paul Stack
c8cf202a27 Update CHANGELOG.md 2017-03-18 14:19:39 +00:00
Gauthier Wallet
323f646b42 provider/aws: Added API Gateway Usage Plan (#12542)
* Added api_gateway_usage_plan

* Updated documentation

* Fixed AWS usage plan review points
2017-03-18 14:18:19 +00:00