Commit Graph

12695 Commits

Author SHA1 Message Date
James Bardin 90aab0105d Add locks to InstanceState
Rename receivers for consistency
2016-09-16 09:59:04 -04:00
James Bardin 8d5080fe72 Lock all ResourceState methods
Also rename receivers so they are consistent.
2016-09-16 09:59:04 -04:00
James Bardin 469e71a488 add locks to all exported ModuleState methods 2016-09-16 09:59:04 -04:00
James Bardin f1b44e36b4 add lock to OutputState.Equal 2016-09-16 09:59:04 -04:00
James Bardin 1235623fad Add locks to exported RemoteState methods 2016-09-16 09:59:04 -04:00
James Bardin 0be90c8994 Add locks to all exported State methods
move implementation into private methods when needed
2016-09-16 09:59:04 -04:00
Radek Simko 16e3a11da3 vendor: Bump github.com/aws/aws-sdk-go to v1.4.10 (#8877) 2016-09-16 08:06:45 -05:00
Adrian Hesketh 19e8932a92 Clarify how to notify multiple lambdas (#8854)
Clarified that to send notifications to more than one Lambda function requires a single `s3_bucket_notification` element with multiple `lambda_function` configuration elements.

If multiple `s3_bucket_notification` elements, each with a single `lambda_function` element are used, one of the configurations is applied, seemingly at random.
2016-09-15 15:28:07 -05:00
Clint 6def0e561e Update CHANGELOG.md 2016-09-15 14:00:05 -05:00
Clint 79bb2e8a87 provider/aws: Add Default Security Group Resource (#8861)
* Docs for default security group
* overrides of default behavior
* add special disclaimer
* update to support classic environments
2016-09-15 13:59:20 -05:00
Clint 1bbf1eed7d Update CHANGELOG.md 2016-09-15 13:30:36 -05:00
Clint adea7563e5 provider/aws: Fix issue updating Elastic Beanstalk Environment variables (#8848)
* provider/aws: failing test case for updating env vars

* provider/aws: Fix issue with updating Elastic Beanstalk env vars
2016-09-15 13:30:12 -05:00
Sander van Harmelen e6310aa461 Update CHANGELOG.md 2016-09-15 15:02:53 +02:00
Sander van Harmelen 968472a63e Support recreating clients and configuring Chef Vaults (#8577)
Fixes #3605 and adds the functionality suggested in PR #7440.

This PR is using a different appraoch that (IMHO) feels cleaner and (even more important) adds support for Windows at the same time.
2016-09-15 14:20:18 +02:00
Radek Simko 0f6098c4ed Update CHANGELOG.md 2016-09-15 10:54:27 +01:00
Radek Simko 86acdccaf2 helper/resource: Add timeout to TimeoutError msg (#8773) 2016-09-15 10:53:25 +01:00
James Nugent f9db94621b Merge pull request #8845 from lcrisci/master
Fixed typo in aws_elb_attachment website docs
2016-09-15 08:40:01 +01:00
Laurent Crisci 64acf0afe5 Fixed typo in aws_elb_attachment website docs
The instance argument is a string and not a list.
It will give you an error if you try to define it as a list.
2016-09-14 23:17:19 +01:00
James Nugent ca5c19ad98 Update CHANGELOG.md 2016-09-14 20:46:29 +01:00
Cameron Watters b4eb63d710 state/remote: New provider - manta
- add remote state provider backed by Joyent's Manta
- add documentation of Manta remote state provider
- explicitly check for passphrase-protected SSH keys, which are currently
  unsupported, and generate a more helpful error (borrowed from Packer's
  solution to the same problem):
  https://github.com/mitchellh/packer/blob/master/common/ssh/key.go#L27
2016-09-14 20:44:52 +01:00
Cameron Watters 72a341ba56 deps: vendor github.com/joyent/gomanta 2016-09-14 20:41:48 +01:00
James Nugent a65b0cce7c provider/aws: Fix pointer fmt as string
Fixes #8839.
2016-09-14 20:14:41 +01:00
James Nugent a07270b605 Update CHANGELOG.md 2016-09-14 15:54:41 +01:00
James Nugent 7eea9f2e0e Merge pull request #8834 from hashicorp/b-diff-suppress-empty
core: Check for attrV being nil before dereference
2016-09-14 15:53:22 +01:00
Radek Simko 6a847040c5 Update CHANGELOG.md 2016-09-14 15:51:21 +01:00
Radek Simko 958a312fe7 Update CHANGELOG.md 2016-09-14 15:51:10 +01:00
James Nugent 9d51ebd0aa provider/aws: Expose ARN suffix on ALB (#8833)
When creating a CloudWatch Metric for an Application Load Balancer it is
neccessary to use the suffix of the ARN as the reference to the load
balancer. This commit exposes that as an attribute on the `aws_alb`
resource to prevent the need to use regular expression substitution to
make the reference.

Fixes #8808.
2016-09-14 15:50:10 +01:00
James Nugent e705d5462b Merge pull request #8835 from ksatirli/patch-2
Replaces remaining AWS_SECURITY_TOKEN with AWS_SESSION_TOKEN
2016-09-14 11:18:18 +01:00
Kerim Satirli 27f8845863 Replaces AWS_SECURITY_TOKEN with AWS_SESSION_TOKEN 2016-09-14 11:22:19 +02:00
Kerim Satirli 5aa1d3a4e5 changing AWS_SECURITY_TOKEN to AWS_SESSION_TOKEN 2016-09-14 11:18:47 +02:00
James Nugent e0226c9039 core: Check for attrV being nil before dereference
This can be an issue with unset computed fields.

Fixes #8815.
2016-09-14 09:51:15 +01:00
James Nugent a0a59d3fb7 core: Log local overrides as INFO rather than WARN
A user has at some point explicitly specified in .terraformrc that
overriding should take place (unlike PATH based overrides), so this
should log as INFO rather than WARN.

It is still of value for debugging purposes, however!
2016-09-14 09:19:03 +01:00
James Nugent 255fe7e74a Merge branch 'warn_on_local_plugin_overrides' of https://github.com/Jonty/terraform into Jonty-warn_on_local_plugin_overrides 2016-09-14 09:18:21 +01:00
James Nugent 10226030dd Merge pull request #8823 from RodrigoAlmodovar/patch-1
Update ses_receipt_rule_set.html.markdown
2016-09-14 01:15:41 -07:00
Sven Walter 459e618c44 provider/aws: Retry resourceAwsLaunchConfigurationCreate if instance profile hasn't propagated (#8813) 2016-09-13 13:07:43 -05:00
Kerim Satirli dfb85fb0d7 changing AWS_SECURITY_TOKEN to AWS_SESSION_TOKEN (#8816)
I noticed that Terraform is not (anymore) parsing the value of environment variable `AWS_SECURITY_TOKEN` (which was re-added in May 2015: https://github.com/hashicorp/terraform/pull/1785)

Example ENV:

```
AWS_SECURITY_TOKEN="FQo...vgU="
AWS_ACCESS_KEY_ID="A...A"
AWS_SECRET_ACCESS_KEY="I...t"
AWS_DEFAULT_REGION="eu-west-1"
```
This errors with messages akin to "AWS was not able to validate the provided access credentials".

Setting `AWS_SESSION_TOKEN` instead of `AWS_SECURITY_TOKEN` on the other hand works just fine and seems to be in line with what is suggested in the code: d1ac7d3b2e/vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go (L69), making this whole thing a documentation change.

Happy to provide test cases or additional insights though!
2016-09-13 13:04:46 -05:00
RodrigoAlmodovar d29fb0b691 Update ses_receipt_rule_set.html.markdown
Title was wrong. It said aws_ses_active_receipt_rule_set while the page is referred to aws_ses_receipt_rule_set
2016-09-13 17:19:04 +02:00
Seth Vargo 7169e170cb Merge pull request #8814 from hashicorp/sethvargo/typo
Fix a typo in the output command examples
2016-09-13 14:39:07 +01:00
Jonty Wareing e0c068f09d Warn when plugins are locally overridden
It is currently very easy to miss that a provider/provisioner has a
local override in your .terraformrc, leading to unexpected behaviour
that can be difficult to debug as no information is output about the
overrides.
2016-09-13 13:05:37 +01:00
Seth Vargo 4ef2fe41ba
Fix a typo in the output command examples 2016-09-13 11:31:51 +01:00
Paul Stack cdf6c76f36 Merge pull request #8809 from moio/patch-1
aws_instance doc: fix attachment resource name
2016-09-13 08:31:25 +01:00
Silvio Moioli 78bb87082b aws_instance doc: fix attachment resource name
Correct name is `aws_volume_attachment`.
2016-09-13 08:41:39 +02:00
Anshul Sharma 75e358ab85 Vendored WAF (#8785)
* Vendored WAF

* WAF with tag 1.4.7
2016-09-13 07:32:42 +01:00
James Bardin 896b89a343 Merge pull request #8803 from hashicorp/jbardin/go-getter-update
update github.com/hashicorp/go-getter
2016-09-12 14:53:22 -07:00
James Bardin 790b60a352 update github.com/hashicorp/go-getter 2016-09-12 17:47:08 -04:00
Paul Stack 9da78aee60 Update CHANGELOG.md 2016-09-12 17:55:32 +01:00
stack72 da6c754345
Merge branch 'master' of github.com:hashicorp/terraform 2016-09-12 17:53:46 +01:00
stack72 00bf57eb64
Merge branch 'jgoldschrafe-feature/azurerm-diagnostics-profile' 2016-09-12 17:53:25 +01:00
stack72 0fe822e822
provider/azurerm: Removing the diagnostics part of the test from the azurerm virtual machine unattended acceptance test 2016-09-12 17:52:54 +01:00
stack72 971b08f320
Merge conflict resolution of virtual_machine.html.markdown in AzureRM 2016-09-12 11:13:24 +01:00