Commit Graph

2396 Commits

Author SHA1 Message Date
Sander van Harmelen 2a24d52721 Merge pull request #3502 from joelmoss/chef_policy_unused_runlist
[chef provisioning] When use_policyfile is given, the run list is not used, so don't require it
2015-10-15 12:40:45 +02:00
Paul Hinze 3fbeb326cd provider/azure: acc tests fixes
* avoid name collisions
 * update image names
2015-10-14 22:59:33 -05:00
Paul Hinze f6e525e531 provider/google: one more test that should skip predefined_acl
it was depreceted in https://github.com/hashicorp/terraform/pull/3272
2015-10-14 22:36:19 -05:00
Paul Hinze 0efffc67f0 provider/google: storage bucket tests shouldn't not check predefined_acl
it was depreceted in https://github.com/hashicorp/terraform/pull/3272
2015-10-14 22:17:34 -05:00
Paul Hinze b2b41192ac provider/google: container test needed bigger instance to pass 2015-10-14 22:16:58 -05: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 3708e752af Merge pull request #3138 from mastor/master
Support tags for aws_db_subnet_group
2015-10-14 19:36:45 -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
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
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
Joel Moss b1d731bd6f [chef provisioning] When use_policyfile is given, the run list is not used, so don't require it 2015-10-14 19:05:38 +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
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 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 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
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
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 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
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 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
Clint Shryock c44e9d10a4 update migration test 2015-10-12 16:26:49 -05:00
Clint Shryock 31b8f04bda provider/aws: Migrate KeyPair to version 1 2015-10-12 16:04:51 -05:00
Clint Shryock 9f3a17e9b4 update sg rule ids 2015-10-12 15:51:47 -05:00
Clint Shryock 03aac9f42b Expand on an error case with more descriptive error 2015-10-12 15:51:21 -05:00
Clint Shryock e0bb04b822 update expeded hash for migration test 2015-10-12 15:51:21 -05:00
Clint Shryock d3c5c0d85f provider/aws: Update Security Group Rules to Version 2 2015-10-12 15:51:21 -05:00
Clint Shryock 810d088279 Fix whitespace formatting with go fmt 2015-10-12 15:50:04 -05:00
Paul Hinze 61721387b3 Merge pull request #3457 from TimeIncOSS/f-aws-ec2-placement-groups
provider/aws: Add support for EC2 Placement Group
2015-10-12 14:24:12 -05:00
Clint 8152f5822e Merge pull request #3265 from stack72/aws-s3-bucket-update
provider/aws: Adding some other simple S3 Bucket Object (Optional) Inputs
2015-10-12 14:23:29 -05:00
Martin Atkins 51630aea26 Merge #3397: Tags for AWS Kinesis Streams 2015-10-12 09:38:09 -07:00
Garrett Heel 36f78cc1dc provider/aws: Allow tags for kinesis streams 2015-10-12 09:00:56 -07:00
stack72 3809cb5b88 Fixing the merge conflicts on the s3 bucket object resource after another PR had been merged 2015-10-12 16:51:27 +01:00
Paul Hinze f77373207c Merge pull request #3419 from rakutentech/add-vsphere-provider
Add VMware vSphere provider
2015-10-12 10:13:38 -05:00
Paul Hinze 22681c3db2 Merge pull request #3284 from stack72/do_size_slug
provider/digitalocean - Droplet Size Lowercase
2015-10-12 07:06:53 -05:00
Martin Atkins 091d3fe206 Merge #3351: aws_autoscaling_lifecycle_hook resource 2015-10-11 22:52:00 -07:00
Takaaki Furukawa f34628de54 Refactor ResourceData, pluralize some arguments and add error check in d.Set for complex types 2015-10-12 13:06:29 +09:00
Jonathan Leibiusky 57c80a0d46 Add support for aws autoscaling lifecycle hooks. 2015-10-11 20:42:40 -03:00
Martin Atkins 3db76ce287 Revert "Grafana provider"
This reverts commit 719e8c956e,
which was accidentally included in a merge.
2015-10-11 16:01:20 -07:00
Martin Atkins 719e8c956e Grafana provider 2015-10-11 13:50:25 -07:00
Martin Atkins b7247026e9 Merge #3228: aws_directory_service_directory resource 2015-10-10 18:09:17 -07:00