Commit Graph

12805 Commits

Author SHA1 Message Date
Paul Stack 4d186b1822 Update CHANGELOG.md 2016-09-22 09:26:35 +01:00
Paul Stack c5afc1ad03 Merge pull request #8900 from kwilczynski/feature/json-validation-aws_kms_key
provider/aws: Add JSON validation to the aws_kms_key resource.
2016-09-22 09:26:12 +01:00
Paul Stack 7a8bfa13b5 Update CHANGELOG.md 2016-09-22 09:12:32 +01:00
stack72 a936170e25
Merge branch 'master' of github.com:hashicorp/terraform 2016-09-22 09:11:45 +01:00
stack72 4cc320a67e
Merge branch 'kwilczynski-feature/json-validation-aws_sns_topic' 2016-09-22 09:11:34 +01:00
James Nugent a64898e0eb provider/aws: Fix other example of vpc_id => id
Also related to #8981.
2016-09-22 09:09:13 +01:00
Krzysztof Wilczynski 8f689812d1
Handle JSON parsing error in the ReadFunc for the policy document.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-09-22 09:02:46 +01:00
Krzysztof Wilczynski 6c27f175b5
Add JSON validation to the aws_sns_topic resource.
This commit adds support for new helper function which is used to
normalise and validate JSON string.

This commit also removes unnecessary code from the StateFunc function,
and reduces it so that it only uses the normalizeJsonString helper.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-09-22 09:01:15 +01:00
Paul Stack a9dce86bf2 Merge pull request #8976 from kwilczynski/feature/check-error-aws_glacier_vault
provider/aws: Handle JSON parsing error in the ReadFunc for the access policy document.
2016-09-22 08:53:57 +01:00
Paul Stack c5ce3733ab Merge pull request #8981 from hashicorp/doc-default-security-group-vpc-id
provider/aws: Change vpc_id to id in documentation
2016-09-22 08:53:08 +01:00
Paul Stack ab17d02faa Merge pull request #8978 from kwilczynski/feature/check-error-aws_cloudwatch_event_rule
provider/aws: Handle JSON parsing error in the ReadFunc for the event pattern document.
2016-09-22 08:47:40 +01:00
Krzysztof Wilczynski 0d68f6545d
Add JSON validation to the aws_kms_key resource.
This commit adds support for new helper function which is used to
normalise and validate JSON string.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-09-22 08:46:25 +01:00
James Nugent 38b9467dae provider/aws: Change vpc_id to id in documentation 2016-09-22 08:44:22 +01:00
James Nugent 6c2cf300fc Merge pull request #8980 from atlassian/remove_casts
provider/bitbucket: Remove unnecessary casts.
2016-09-22 08:42:24 +01:00
Otto Jongerius 7d1df7ab16 provider/bitbucket: Remove unnecessary casts. 2016-09-22 17:35:03 +10:00
Krzysztof Wilczynski 604de4007a
Handle JSON parsing error in the ReadFunc for the event pattern document.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-09-22 08:32:59 +01:00
Krzysztof Wilczynski ff4671030e
Handle JSON parsing error in the ReadFunc for the access policy document.
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2016-09-22 00:23:38 +01:00
Jay Wallace 947816958b Merge pull request #8975 from mootpt/protocol-fix
Allow use of protocol numbers for ah and esp
2016-09-21 14:40:14 -07:00
Jay Wallace 527e0c3163 Merge pull request #1 from hashicorp/pr-8975
Tidy up tests
2016-09-21 14:16:15 -07:00
clint shryock 61d795ed44 tidy up tests 2016-09-21 16:12:56 -05:00
Jay Wallace 45da08c67f
Allow use of protocol numbers for ah and esp 2016-09-21 11:52:23 -07:00
Paul Stack e8a7b5d1c6 Update CHANGELOG.md 2016-09-21 19:51:49 +01:00
stack72 83bffb4dea
Merge branch 'cwood-cwood/bitbucket-provider' 2016-09-21 19:47:43 +01:00
stack72 2813790dd9
provider/bitbucket: Making the necessary documentation changes for the bitbucket typos 2016-09-21 19:47:31 +01:00
stack72 a2970e631c
Merge branch 'cwood/bitbucket-provider' of https://github.com/cwood/terraform into cwood-cwood/bitbucket-provider 2016-09-21 19:35:58 +01:00
James Bardin 73183a064c Merge pull request #8974 from hashicorp/jbardin/no-fork
Add a way to avoid panicwrap when debugging
2016-09-21 14:21:51 -04:00
James Bardin 6b7a079bff Add a way to avoid panicwrap when debugging
When trying to use a debugger, you don't want the terraform to run in a
new child process. Setting TF_FORK=0 will skip panicwrap and continue
running the program in the current process. This will also give direct
access to log output, and stdout.
2016-09-21 14:13:05 -04:00
Ivan Vergiliev 7b301d7411 Point resource docs to the correct URL (#8969) 2016-09-21 08:32:08 -05:00
Paul Stack 9b23d433c1 Merge pull request #8960 from MiLk/docs/data-source-configuration
Correct the data source configuration example to be valid
2016-09-21 09:44:02 +01:00
James Nugent c942707476 provider/docker: Add alternative to cert_path
Add a note about using `eval $(docker-machine env)` when using Docker
Machine to avoid having to hard code a certificate path.
2016-09-21 09:32:24 +01:00
baboune 1b6c1cccf3 Update index.html.markdown
Add note to reinforce the need for cert_path on any docker-machine based Docker environment.
2016-09-21 09:32:24 +01:00
Emilien Kenler d6296fbb7d
Correct the data source configuration example to be valid 2016-09-21 17:31:44 +09:00
Paul Stack 046f184b3e Update CHANGELOG.md 2016-09-21 09:31:23 +01:00
Paul Stack 773cfc8e8e Merge pull request #8903 from kwilczynski/feature/json-validation-aws_sns_topic_policy
provider/aws: Add JSON validation to the aws_sns_topic_policy resource.
2016-09-21 09:31:08 +01:00
Paul Stack fc7b90effd Update CHANGELOG.md 2016-09-21 09:27:09 +01:00
Paul Stack 5753cbea64 Merge pull request #8901 from kwilczynski/feature/json-validation-aws_s3_bucket_policy
provider/aws: Add JSON validation to the aws_s3_bucket_policy resource.
2016-09-21 09:26:50 +01:00
Paul Stack a2d964769f Update CHANGELOG.md 2016-09-21 09:21:33 +01:00
Paul Stack 32e5a452c2 Merge pull request #8905 from kwilczynski/feature/json-validation-aws_sqs_queue_policy
provider/aws: Add JSON validation to the aws_sqs_queue_policy resource.
2016-09-21 09:20:58 +01:00
Paul Stack eea215a7c4 Merge pull request #8936 from hashicorp/arm-remote-state-docs
state/remote/azure: Correct documentation
2016-09-21 09:18:29 +01:00
Paul Stack 5f46ce54d2 Update CHANGELOG.md 2016-09-21 09:16:53 +01:00
Paul Stack 3ad4056113 Merge pull request #8904 from kwilczynski/feature/json-validation-aws_sqs_queue
provider/aws: Add JSON validation to the aws_sqs_queue resource.
2016-09-21 09:14:41 +01:00
Paul Stack 69d277eac8 Merge pull request #8958 from hashicorp/aws-go-sdk-1.4.11
provider/aws: Bump AWS SDK to 1.4.11
2016-09-21 09:05:33 +01:00
stack72 190af7322f
provider/aws: Bump AWS SDK to 1.4.11
This is required for the following changes:

* Redshift enhanced VPC support
* RDS SQL Server TimeZone Support
* CodeDeploy and CloudWatch integration
2016-09-21 08:50:22 +01:00
Paul Stack c6583cf0c9 Merge pull request #8940 from cblecker/patch-1
Fix typo in chef provisioner
2016-09-20 18:03:13 +01:00
Christoph Blecker 8bbbfcf261 Fix typo in chef provisioner
Typo in example
2016-09-20 09:58:04 -07:00
Paul Stack 4ec98657e1 Merge pull request #8939 from hashicorp/aws-elasticache-cluster-address
docs/aws: Adding `cluster_address` as an exported parameter for the `aws_elasticache_cluster` resource
2016-09-20 17:54:37 +01:00
stack72 067a2744c7
docs/aws: Adding as an exported parameter for the resource 2016-09-20 17:35:04 +01:00
Paul Stack 410d33c118 Update CHANGELOG.md 2016-09-20 17:33:07 +01:00
stack72 25ae6d2555
Merge branch 'A-Gordon-aws_elasticache_cluster_address' 2016-09-20 17:30:42 +01:00
stack72 87f632cb92
provider/aws: `aws_elasticache_cluster` acceptance test for
`cluster_address`
2016-09-20 17:29:57 +01:00