Commit Graph

18402 Commits

Author SHA1 Message Date
Tom Harvey 1775d48381 Merge pull request #13791 from whiskeyjay/subnetRTFix
provider/azurerm: Locking route table on subnet create/delete
2017-04-20 12:39:59 +01:00
tombuildsstuff 8706d2181f Fixing the import test by adding missing formatting values 2017-04-20 12:28:33 +01:00
Daniel Kats 8a70108612 fix a word in aws_iam_role_policy error msg (#13794) 2017-04-20 06:48:58 +01:00
dj80hd 99a73094f7 Fix typo in aws-two-tier example (#13790) 2017-04-20 06:47:44 +01:00
James Bardin f5cda342f7 Merge pull request #13778 from hashicorp/jbardin/GH-13617
improve resource.WaitForState and add refreshGracePeriod
2017-04-19 18:23:00 -04:00
clint shryock 7f3c8e4765 move this test to new region 2017-04-19 17:20:44 -05:00
James Bardin 4c3a053f0c lint errors 2017-04-19 18:19:48 -04:00
James Bardin 14bea66f4e add test for proper cancelation 2017-04-19 18:07:00 -04:00
James Bardin eb4b45941c fix tests affected by refreshGracePeriod
A couple tests require lowering the grace period to keep the test from
taking the full 30s timeout.

The Retry_hang test also needed to be removed from the Parallel group,
becuase it modifies the global refreshGracePeriod variable.
2017-04-19 18:07:00 -04:00
James Bardin af1628eaa4 add refreshGracePeriod
Refresh calls may have side effects that need to be recorded if it
succeeds, especially common when when WaitForState is called from
resource.Retry.

If the WaitForState timeout is reached and there is a Refresh call
in-flight, wait up to refreshGracePeriod (set to 30s) for it to
complete.
2017-04-19 18:07:00 -04:00
Martin Atkins d157eea2e3 website: Correct capitalization of "Bitbucket"
Previously we fixed this specifically for the Enterprise VCS integration,
but we also had some long-running errors of this sort in the docs for
how to specify module sources on Bitbucket.
2017-04-19 14:56:11 -07:00
Seth Vargo 3fa3ce60fa Merge pull request #13788 from hashicorp/docs-update-bitbucket-branding
Change BitBucket to Bitbucket
2017-04-19 17:35:59 -04:00
Jake Champlin fe8029e65e
initial attempt 2017-04-19 17:30:58 -04:00
Mary Elizabeth Cutrali 3d315baee5 update spelling of Bitbucket 2017-04-19 17:30:58 -04:00
Matthew Frahry 07c0f95563 Merge pull request #13772 from hashicorp/p-aws-multi-zone-instance
Fixing TestAccAWSInstance_multipleRegions
2017-04-19 14:32:43 -06:00
= 1608f5544f Added error check 2017-04-19 14:22:35 -06:00
ebilhoo 0cf9dbcfb4 Merge branch 'master' of https://github.com/bhood4/terraform 2017-04-19 20:03:59 +00:00
ebilhoo 8ef010440e cleanup and validation, rdpool.order optional with ROUND_ROBIN default 2017-04-19 20:02:27 +00:00
ebilhoo 65d364d805 cleanup and validation, rdpool.order optional with ROUND_ROBIN default 2017-04-19 19:54:42 +00:00
Paul Stack f5df4422ae provider/aws: Bump AWS SDK to 1.8.13 (#13775) 2017-04-19 20:55:37 +03:00
Joseph Anthony Pasquale Holsten c57e0735d1 Merge pull request #13745 from bhood4/master
provider/ultradns: add ultradns_rdpool resource
2017-04-19 10:45:20 -07:00
Jake Champlin 9893abe95d Update CHANGELOG.md 2017-04-19 13:27:33 -04:00
Jake Champlin 53ff003826 Merge pull request #13767 from hashicorp/f-bump-autorest-dep
core: Bump AutoRest Dep
2017-04-19 13:26:07 -04:00
Gauthier Wallet 3c6287cf3c Vendored AWS CognitoIdentity Service (#13771) 2017-04-19 20:22:36 +03:00
Christoph Blecker 596f05b881 Fix govet errors (#13774) 2017-04-19 20:21:31 +03:00
Yamamoto 03b82191bf `roles` deprecated in examples (#13769) 2017-04-19 20:20:02 +03:00
Martin Atkins cfa31b57a3 Update CHANGELOG.md 2017-04-19 09:42:42 -07:00
tmshn 86d7c47c0a Change cidrhost() to get IP from end of the range when negative number given
Ref: https://github.com/apparentlymart/go-cidr/pull/2
2017-04-19 09:41:41 -07:00
= 6bc3610c09 removing extraneous code 2017-04-19 09:18:30 -06:00
Jake Champlin 3bf354b16b
bump go-oracle-compute vendor 2017-04-19 10:59:52 -04:00
James Bardin 6601b9b8dd adjust the inconsistent_negative test to match
This test unfortunately relies on the timing of the loops in
WaitForState, and the text of the error message. Adjust the timing so
the timeout isn't an even multiple of the poll interval, and make sure
we reach a minimum number of retries.
2017-04-19 10:53:06 -04:00
James Bardin af5e22cf94 don't leave WaitForState goroutine running
Make sure that we can cancel the WaitForState refresh loop when reaching
a timeout, otherwise it may run indefinitely. There's no need to try and
store and read the Result concurrently, just pass the value over a
channel.
2017-04-19 10:41:51 -04:00
Jake Champlin 6c13f367ed
core: Bump AutoRest Dep
Bumps autorest dependency for Azure providers.

Fixes: #11131
2017-04-19 09:45:09 -04:00
Jay Wang c42b2381c6 Added check for empty strings in resource id parsing logic. 2017-04-18 17:17:14 -07:00
Stephen Weatherford 1320347b7b Fix another issue from #11625 that's causing null entries in ssh_keys 2017-04-18 21:38:03 +00:00
Jay Wang 8ea5bb33fb Merge branch 'subnetRTFix' of https://github.com/whiskeyjay/terraform into subnetRTFix 2017-04-18 14:24:07 -07:00
Jay Wang f712880fee Lock Route Table / Subnets 2017-04-18 14:18:30 -07:00
Clint 4a782583b6 Update CHANGELOG.md 2017-04-18 13:31:45 -05:00
Joseph Herlant 507917df43 provider/fastly: upgrade go-fastly to fix #12910 (#13648)
* Adding acceptance tests to reproduce issue #12910

* Upgrade go-fastly and its dependencies and move the Version to int as changed upstream
2017-04-18 13:30:54 -05:00
Seth Vargo bcacf3a036
Update ldlogo 2017-04-18 14:10:27 -04:00
Tom Harvey 3e8dca19a9 Updating the changelog to include #13637 2017-04-18 17:37:10 +01:00
Tom Harvey 502a744a65 Merge pull request #13637 from hashicorp/azurerm-lock-bugfix
provider/azurerm: Locking around Network Security Group / Subnets
2017-04-18 17:34:04 +01:00
tombuildsstuff 079043d5f8 Checking the type of the subnet before using it 2017-04-18 16:38:36 +01:00
tombuildsstuff fd03d0310e Formatting 2017-04-18 16:12:22 +01:00
tombuildsstuff 3ecb0f4fc4 Locking on the NSG ID 2017-04-18 16:12:22 +01:00
tombuildsstuff b93e6e3af7 Locking on the delete too 2017-04-18 16:12:22 +01:00
tombuildsstuff b6866f2187 Locking the NSG to only operate on one resource at a time in the create 2017-04-18 16:12:22 +01:00
ebilhoo 627544e872 Merge branch 'master' of https://github.com/bhood4/terraform 2017-04-18 15:09:06 +00:00
ebilhoo 37810872a0 resourceUltradnsRdpoolRead set rdata 2017-04-18 15:08:18 +00:00
ebilhoo 04553c5d4e add rdpool 2017-04-18 15:08:18 +00:00