Commit Graph

6710 Commits

Author SHA1 Message Date
Max Englander fce89ec1ae Merge branch 'master' into 2087-consul-service-resource 2015-10-14 22:51:25 -04:00
Paul Hinze c1aab4cfaf Merge pull request #3507 from hashicorp/b-gce-metadata
provider/google: one more fix to GCE metadata
2015-10-14 21:40:50 -05:00
Martin Atkins 2e3b3cfad2 Update CHANGELOG.md 2015-10-14 19:37:33 -07:00
Martin Atkins 3708e752af Merge pull request #3138 from mastor/master
Support tags for aws_db_subnet_group
2015-10-14 19:36:45 -07:00
Martin Atkins beff2ff460 Update CHANGELOG.md 2015-10-14 19:35:20 -07:00
Paul Hinze 4f400a1944 provider/google: one more fix to GCE metadata
In #3501 @lwander got us almost all the way there, but we still had
tests failing. This seemed to be because GCE sets
`metadata.startup-script` to a blank string on instance creation, and if
a user specifies any `metadata` in their config this is seen as the
desired full contents of metadata, so we get a diff trying to remove
`startup-script`.

Here, to address this, we just proactively remove the "startup-script"
key from `Read`, and then we enforce that "metadata_startup_script"
is the only way to configure startup scripts on instances.
2015-10-14 21:34:33 -05:00
Martin Atkins 1300f165b1 Merge pull request #3311 from caarlos0/allow-non-persistent-spot-requests
Allow non-persistent spot requests
2015-10-14 19:34:31 -07:00
Paul Hinze 4f4c572aa4 Update CHANGELOG.md 2015-10-14 18:23:14 -05:00
Paul Hinze b430b984e5 Merge pull request #2525 from robzienert/ignore-updates-lifecycle
Adding ignore_changes lifecycle flag
2015-10-14 18:22:24 -05:00
Rob Zienert a1939e70f7 Adding ignore_changes lifecycle meta property 2015-10-14 16:34:27 -05:00
Clint ab0534a356 Update CHANGELOG.md 2015-10-14 16:27:05 -05:00
Clint 6eadfcae21 Merge pull request #3500 from stack72/aws-dynamodb-table-arn
provider/aws: DynamoDB Table ARN
2015-10-14 16:25:49 -05:00
Paul Hinze 6020d0ab81 Merge pull request #3505 from hashicorp/f-validatefunc-maps
helper/schema: ValidateFunc support for maps
2015-10-14 15:19:37 -05:00
Paul Hinze 2a179d1065 helper/schema: ValidateFunc support for maps 2015-10-14 15:10:22 -05:00
Clint 51100234cb Merge pull request #3504 from hashicorp/b-aws-test-fixes
Small fixes for acceptance tests
2015-10-14 14:59:15 -05:00
Clint Shryock 6ab339b62d unset website_endpoint, website_domain if website part is removed 2015-10-14 14:49:33 -05:00
Clint Shryock f9c577aa2a update requirement for peer test 2015-10-14 13:55:37 -05:00
Clint Shryock 4fb7ae6600 rename test so it can be ran in isolation 2015-10-14 13:55:19 -05:00
stack72 7af484c8f6 Changing the DynamoDb Create to do a Read at the end 2015-10-14 19:16:58 +01:00
Paul Hinze bfc107f90e Merge pull request #3496 from hashicorp/b-azure-settings-tilde
provider/azure: fix issues loading config from homedir
2015-10-14 13:03:53 -05:00
Paul Hinze 2b89801c35 Merge pull request #3501 from lwander/f-gce-metadata-fix
Fixed GCE metadata acceptance test bug
2015-10-14 12:48:53 -05:00
Lars Wander b7f7c7a731 Provider GCE, fixed metadata state update bug 2015-10-14 12:47:54 -05:00
Lars Wander 12625997c1 Added global address & tests 2015-10-14 12:47:53 -05:00
stack72 6d2fee9c28 After the DynamoDB table is created, the ARN wasn't being set 2015-10-14 18:06:09 +01:00
Paul Hinze 8d017be637 Update CHANGELOG.md 2015-10-14 10:35:40 -05:00
Paul Hinze 5f6c03f515 Merge pull request #3191 from hashicorp/f-asg-wait-config
provider/aws: configurable capacity waiting duration
2015-10-14 10:34:55 -05:00
Paul Hinze c51080d16b Merge pull request #3210 from hashicorp/d-module-source-private-github-repos
doc: module sources from private github repos
2015-10-14 10:21:15 -05:00
Paul Hinze 46952b9c13 Merge pull request #3469 from squaresurf/doc-update
A script must have executable permissions.
2015-10-14 10:20:45 -05:00
Paul Hinze 1b29840632 Merge pull request #3484 from hashicorp/edit-this-page
Website: use `github_url` in "edit this page" href
2015-10-14 10:20:16 -05:00
Paul Hinze e62d2c7aec Merge pull request #3489 from gtheys/fix_doc_aws_elb_stickyness
fix illegal char in the policy name
2015-10-14 10:19:47 -05:00
Paul Hinze ef5b6e93a9 provider/azure: fix issues loading config from homedir
Issues were:

 * `settings_file` `ValidateFunc` needs to expand homedir just like the
   `configure` does, otherwise ~-based paths fail validation
 * `isFile` was being called before ~-expand so configure was failing as well
 * `Config` was swallowing error so provider was ending up with `nil`,
   resulting in crash

To fix:

 * Consolidate settings_file path/contents handling into a single helper
   called from both `validate` and `configure` funcs
 * Return err from `Config`

To cover:

 * Added test case to validate w/ tilde-path
 * Added configure test w/ tilde-path
2015-10-13 16:57:11 -05:00
Radek Simko 6762a97b88 Merge pull request #3494 from TimeIncOSS/docs-aws-glacier
Fix a few nitpicks in docs for aws_glacier_vault
2015-10-13 23:52:52 +02:00
Radek Simko 88e56479a5 docs: Make IAM policy doc canonical 2015-10-13 22:52:11 +02:00
Radek Simko 43c7711ac8 docs/aws: Fix whitespacing in glacier_vault 2015-10-13 22:46:55 +02:00
Clint 95832c2fb2 Update CHANGELOG.md 2015-10-13 12:56:53 -05:00
Clint c0c81dc78f Merge pull request #3490 from hashicorp/b-aws-vpc-peering-checks
provider/aws: Additional error checking to VPC Peering conn
2015-10-13 12:55:45 -05:00
Radek Simko 2f42f58256 Update CHANGELOG.md 2015-10-13 17:15:34 +02:00
Radek Simko 29c23e9ec1 Merge pull request #3491 from stack72/aws-glacier-resource-merge
Aws glacier resource merge
2015-10-13 17:14:45 +02:00
stack72 9f01efae6f Adding a test to make sure that the diffGlacierVaultTags func works as expected 2015-10-13 15:01:58 +01:00
stack72 2a7b8be9f3 Gofmt of the aws glacier vault resource 2015-10-13 14:58:29 +01:00
stack72 95d35ad77f Adding the the docs for the Glacier Vault resource
Updating the glacier docs to include a link to the AWS developer guide
2015-10-13 14:58:29 +01:00
stack72 5266db31e2 Adding the ability to manage a glacier vault 2015-10-13 14:58:29 +01:00
Clint Shryock 60b7037cdd provider/aws: Additional error checking to VPC Peering conn 2015-10-13 06:20:46 -05:00
Geert Theys aaac9435ec fix illegal char in the policy name
aws_lb_cookie_stickiness_policy.elbland: Error creating LBCookieStickinessPolicy: ValidationError: Policy name cannot contain characters that are not letters, or digits or the dash.
2015-10-13 12:57:22 +02:00
Paul Hinze 7549872780 Update CHANGELOG.md 2015-10-12 17:20:05 -05:00
Paul Hinze 2978a9fb52 Merge pull request #3485 from hashicorp/b-aws-asg-force-delete
provider/aws: fix force_delete on ASGs
2015-10-12 17:18:38 -05:00
Paul Hinze a811a72f11 provider/aws: fix force_delete on ASGs
The `ForceDelete` parameter was getting sent to the upstream API call,
but only after we had already finished draining instances from
Terraform, so it was a moot point by then.

This fixes that by skipping the drain when force_delete is true, and it
also simplifies the field config a bit:

 * set a default of false to simplify the logic
 * remove `ForceNew` since there's no need to replace the resource to
   flip this value
 * pull a detail comment from code into the docs
2015-10-12 17:10:01 -05:00
Clint 8df9d706fb Merge pull request #3488 from hashicorp/b-aws-sgrule-migrate-test
update migration test
2015-10-12 16:34:44 -05:00
Clint 307902ec2d Update CHANGELOG.md 2015-10-12 16:34:16 -05:00
Clint a1f2b824cc Merge pull request #3470 from hashicorp/b-aws-key-pair-key-sig
provider/aws: Migrate KeyPair to version 1
2015-10-12 16:33:24 -05:00