Commit Graph

9560 Commits

Author SHA1 Message Date
Paul Stack
81ac419f13 Merge pull request #5788 from multilinear/mbrewer/datadog_allow_heredoc_for_message
Make datadog message, escalation_message, and query work with heredoc
2016-03-30 19:07:33 -05:00
Paul Stack
35b21e3ba0 Update CHANGELOG.md 2016-03-30 19:06:06 -05:00
Paul Stack
8ed809456d Merge pull request #5830 from hashicorp/phinze/asg-health-check-grace-period-default
provider/aws: set ASG health_check_grace_period default to 300
2016-03-30 19:05:06 -05:00
James Nugent
22d0b63194 Merge pull request #5937 from stack72/f-aws-db-subnet-test
provider/aws: Test to validate that db subnet group description can be updated
2016-03-30 17:04:04 -07:00
stack72
197c6fa143 provider/aws: Test to validate that db subnet group description
can be updated
2016-03-30 18:53:52 -05:00
Paul Stack
584505d60e Update CHANGELOG.md 2016-03-30 18:53:12 -05:00
Paul Stack
1801904e36 Merge pull request #5921 from ColinHebert/rds_subnet_group_description
provider/aws: DB subnet group description modification
2016-03-30 18:50:33 -05:00
Colin Hebert
1389bb2f5e Do not check only whether the subnet_ids have changed 2016-03-31 10:37:26 +11:00
Colin Hebert
3ae21f0891 Add the description as a part of the update request 2016-03-31 09:36:42 +11:00
Paul Stack
c6b768eaa5 Update CHANGELOG.md 2016-03-30 11:19:38 -05:00
Paul Stack
53434ae09c Merge pull request #5904 from keymon/bugfix/5661_fix_codecommit_default_branch
AWS: codecommit set default_branch only if defined
2016-03-30 11:18:22 -05:00
Hector Rivas Gandara
29c9b8497d provider/aws: Add tests for default_branch in new codecommit repos
The provider should, when working on a new repository without branches:
 * Able to create a new repository even with default_branch defined.
 * Able to create a new repository without default_branch, and do not fail
   if default_branch is defined.
2016-03-30 16:41:20 +01:00
Hector Rivas Gandara
0c49b17f72 provider/aws: codecommit check default_branch before update
In AWS codecommit the default branch must have a value unless there are
no branches created, in which case it is not possible to set it to any value.

We query the existing branches and do not update the default branch
if there are none defined remotely.

This solves the issue of the initial creation of the repository with a
resource with `default_branch` defined.
2016-03-30 16:40:41 +01:00
Hector Rivas Gandara
1afd3a53b2 provider/aws: codecommit set default_branch only if defined
Do not try to update or reaad the AWS codecommit repository default branch if
the resource definition is not set it or is an empty string.

Fixes #5641
2016-03-30 16:40:37 +01:00
Paul Stack
31c9dd11eb Merge pull request #5914 from davedash/patch-2
ssl_certificate_id applies to lb_protocol only.
2016-03-30 08:42:18 -05:00
James Nugent
c44daa7735 Update CHANGELOG.md 2016-03-29 16:19:46 -07:00
James Nugent
155e7840ba provider/triton: Fix error for VLAN ID validation
Source: https://apidocs.joyent.com/cloudapi/#CreateFabricVLAN

This suggests that the check is correct and the error message and
description are not, so this commit makes them match the docs.
2016-03-29 16:17:47 -07:00
James Nugent
2b34eb5a39 Merge branch 'f-triton-fabric' of https://github.com/asteris-llc/terraform into asteris-llc-f-triton-fabric 2016-03-29 16:17:12 -07:00
Colin Hebert
d7a7db9c5a provider/aws: Subnet group description modification
Do not force a new resource when changing the description of a subnet group
2016-03-30 09:33:44 +11:00
Brian Hicks
df2a192e4a triton: add fabric resource 2016-03-29 17:13:03 -05:00
Brian Hicks
7332b0ef9e triton: add VLAN resource 2016-03-29 16:38:34 -05:00
Dave Dash
de61132564 ssl_certificate_id applies to lb_protocol only. 2016-03-29 14:13:54 -07:00
Clint
7d1cfde490 Merge pull request #5887 from hashicorp/b-aws-iam-server-cert-docs
provider/aws: Document lifecycle block needs for IAM Server Certificate
2016-03-29 14:35:52 -05:00
Paul Hinze
1f1503a5f1 Update CHANGELOG.md 2016-03-29 13:21:21 -05:00
Paul Hinze
faba2b7d31 Merge pull request #5867 from hashicorp/phinze/fix-route-crash
provider/aws: fix potential aws_route crashes
2016-03-29 13:20:36 -05:00
Radek Simko
2e415df23c Update CHANGELOG.md 2016-03-29 16:35:15 +01:00
Radek Simko
c7a8f05e03 Merge pull request #5890 from meteor/jsonencode
config: new interpolation function jsonencode
2016-03-29 16:33:20 +01:00
Paul Hinze
70096c5ac0 provider/aws: fix potential aws_route crashes
Fixes #5865
2016-03-29 09:57:29 -05:00
David Glasser
6cf06bb3ab config: new interpolation function jsonencode 2016-03-29 07:38:58 -07:00
James Nugent
1c399d119a Merge pull request #5897 from PurrBiscuit/datadog
fix typo in datadog provider documentation
2016-03-29 09:26:19 -05:00
Purrbiscuit
55269ae8d8 fix typo in datadog provisioner documentation 2016-03-29 10:19:28 -04:00
clint shryock
ac063bf573 provider/aws: Document lifecycle block needs for IAM Server Certificate 2016-03-28 15:39:54 -05:00
Clint
1b1e4620c7 Update CHANGELOG.md 2016-03-28 13:24:14 -05:00
Clint
163173df7a Merge pull request #5881 from hashicorp/b-aws-sg-r-protocols
provider/aws: Convert protocols to standard format for Security Groups
2016-03-28 13:23:52 -05:00
clint shryock
1a2846072c update tests to cover icmp 2016-03-28 13:08:53 -05:00
James Nugent
e9d12d5021 Merge pull request #5883 from uber/b-gcp-deprecated-image
provider/google: use non-deprecated image in acctests, docs
2016-03-28 12:53:44 -05:00
clint shryock
e98d7d706f provider/aws: Convert protocols to standard format for Security Groups
Convert network protocols to their names for keys/state, fixing issue(s) when
using them interchangeably.
2016-03-28 10:32:39 -05:00
James Nugent
e1117e8631 Update CHANGELOG.md 2016-03-27 19:45:29 -05:00
James Nugent
8af5315b12 Merge pull request #5878 from stack72/f-azurerm-storage-acc-404
provider/azurerm: Fix not removing azurerm_storage_account 404 from state
2016-03-27 19:43:17 -05:00
stack72
de4b0a9f00 provider/azurerm: Fix not removing azurerm_storage_account 404 from
state
2016-03-27 16:31:55 +01:00
Bill Fumerola
1ccfacd2dd provider/google: use non-deprecated image in acceptance tests, documentation 2016-03-26 09:55:28 -07:00
Paul Stack
07fee770e4 Merge pull request #5869 from jeshuaborges/patch-1
Fix typo in kinesis_firehose_delivery_stream.html.markdown
2016-03-25 21:06:42 +00:00
Jeshua Borges
99a1474545 Fix typo in kinesis_firehose_delivery_stream.html.markdown
Silly fix, but should be updated.
2016-03-25 16:59:26 -04:00
Radek Simko
1324838a15 Merge pull request #5857 from hashicorp/doc-ebs-block-device-mixmatch
provider/aws: doc EBS block device mix-match caveats
2016-03-25 20:41:57 +00:00
Radek Simko
4023fc1ff3 Update CHANGELOG.md 2016-03-25 20:37:37 +00:00
Radek Simko
a2c59f071f Merge pull request #5838 from hashicorp/b-aws-lambda-guard
provider/aws: Guard against empty responses from Lambda Permissions
2016-03-25 20:35:57 +00:00
Paul Hinze
3abf815508 Merge pull request #5866 from TimeIncOSS/docs-api-gateway-fix
docs: Fix API Gateway documentation
2016-03-25 15:23:18 -05:00
Radek Simko
3afbadae75 docs: Fix API Gateway documentation 2016-03-25 20:11:00 +00:00
Paul Hinze
5f94449197 Merge pull request #5863 from hashicorp/phinze/aws-fix-lc-wait-for-iam-error
provider/aws: Fix launch_config waiting for IAM instance profile
2016-03-25 13:31:39 -05:00
Paul Hinze
6c2b511152 provider/aws: Fix launch_config waiting for IAM instance profile
AWS changed their error message, which was being used for detection of
the specific error that indicates we need to wait for IAM propagation.

Behavior is covered by a test now.

Fixes #5862
2016-03-25 13:10:10 -05:00