Commit Graph

12980 Commits

Author SHA1 Message Date
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
Anshul Sharma
0e93a964b2 Changing snapshot_identifier on aws_db_instance resource should force a rebuild 2016-09-13 07:39:15 +05:30
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
Paul Stack
90589dbf2b Update CHANGELOG.md 2016-09-12 11:05:07 +01:00
Paul Stack
44bc70971d Merge pull request #8673 from hashicorp/f-aws-alb-generated-name
provider/aws: Allow `aws_alb` to have the name auto-generated
2016-09-12 11:04:47 +01:00
Paul Stack
1de1bd6576 Update CHANGELOG.md 2016-09-12 10:59:05 +01:00
stack72
ef9aa6baaf
Merge branch 'optimisticanshul-6973-codecommit-trigger' 2016-09-12 10:55:37 +01:00
stack72
116d70dccb
provider/aws: Removal of test for changes as it forces a new resource 2016-09-12 10:54:15 +01:00
stack72
229f2698ce
Merge branch '6973-codecommit-trigger' of https://github.com/optimisticanshul/terraform into optimisticanshul-6973-codecommit-trigger 2016-09-12 10:44:32 +01:00
stack72
20ad3e0b2f
provider/aws: Allow aws_alb to have the name auto-generated
In order to satisify scenarios where a lifecycle is block is used, we
would need the AWS ALB name field to be autogenerated. WE follow the
same work as AWS ELB, we prefix it with `tl-lb-`

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSALB_'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/09/08 12:43:40 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSALB_ -timeout
120m
=== RUN   TestAccAWSALB_basic
--- PASS: TestAccAWSALB_basic (79.81s)
=== RUN   TestAccAWSALB_generatedName
--- PASS: TestAccAWSALB_generatedName (93.81s)
=== RUN   TestAccAWSALB_namePrefix
--- PASS: TestAccAWSALB_namePrefix (73.48s)
=== RUN   TestAccAWSALB_tags
--- PASS: TestAccAWSALB_tags (181.32s)
=== RUN   TestAccAWSALB_noSecurityGroup
--- PASS: TestAccAWSALB_noSecurityGroup (66.03s)
=== RUN   TestAccAWSALB_accesslogs
--- PASS: TestAccAWSALB_accesslogs (130.82s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    625.285s
```
2016-09-12 10:38:13 +01:00
Radek Simko
46d5d51ad6
provider/aws: Add API Gateway Client Certificate 2016-09-12 10:09:47 +01:00
Paul Stack
43fa322d9b Update CHANGELOG.md 2016-09-12 09:50:42 +01:00
Paul Stack
6cf1fdf980 Merge pull request #8675 from hashicorp/b-aws-kms-key-policy
provider/aws: Support Policy DiffSuppression in `aws_kms_key` policy
2016-09-12 09:50:09 +01:00
Anshul Sharma
2d57e71c01 Remove Unused Log From CodeCommit Trigger Test 2016-09-12 14:15:53 +05:30
stack72
806c000dbb
provider/aws: Support Policy DiffSuppression in aws_kms_key policy
Fixes #7495

```
% make testacc TEST=./builtin/providers/aws TESTARGS='-run=TestAccAWSKmsKey_policy'
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /terraform/vendor/)
2016/09/06 10:44:20 Generated command/internal_plugin_list.go
TF_ACC=1 go test ./builtin/providers/aws -v -run=TestAccAWSKmsKey_policy
-timeout 120m
=== RUN   TestAccAWSKmsKey_importBasic
--- PASS: TestAccAWSKmsKey_importBasic (166.19s)
=== RUN   TestAccAWSKmsKey_basic
--- PASS: TestAccAWSKmsKey_basic (215.33s)
=== RUN   TestAccAWSKmsKey_policy
--- PASS: TestAccAWSKmsKey_policy (116.81s)
=== RUN   TestAccAWSKmsKey_isEnabled
--- PASS: TestAccAWSKmsKey_isEnabled (1008.31s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws
1689.957s
```
2016-09-12 09:44:07 +01:00
Paul Stack
04e675c663 Merge pull request #8779 from TimeIncOSS/docs-fix-misspellings
docs: Fix misspelled words
2016-09-12 09:41:26 +01:00
Paul Stack
578e0eb04d Merge pull request #8780 from TimeIncOSS/f-aws-misspell
provider/aws: Fix misspelled words
2016-09-12 09:41:13 +01:00
Sander van Harmelen
3b727ad7e0 Update CHANGELOG.md 2016-09-12 10:35:33 +02:00
Sander van Harmelen
d2d27923df provider/cloudstack: fix vpc renaming (#8784)
* fixed vpc rename bug

* Tweak the suggested fix

There was an assertion error in the fix, and after discussing we felt it was better to split the two changes to make them independant.
2016-09-12 10:30:45 +02:00
Radek Simko
94b37e4b9c Update CHANGELOG.md 2016-09-12 07:32:02 +01:00
Anshul Sharma
7150bafb84 Remove Region Condition From CodeCommit Repo Resource (#8778) 2016-09-12 07:30:46 +01:00
Radek Simko
2ad84a51df
provider/aws: Fix misspelled words 2016-09-12 07:23:34 +01:00
Radek Simko
43de2afde1
docs: Fix misspelled words 2016-09-12 07:08:00 +01:00
Anshul Sharma
497063af3e Added Codecommit Trigger 2016-09-12 10:17:04 +05:30
Radek Simko
068585bdba Update CHANGELOG.md 2016-09-11 19:29:59 +01:00
Paul Stack
f993b726b0 provider/aws: aws_db_instance unexpected state when configurating (#8707)
enhanced monitoring

Fixes #8699

When configuring enhanced monitoring, a user got the following error:

```
* aws_db_instance.db: unexpected state 'configuring-enhanced-monitoring',
wanted target '[available]'``

We have added this to the list of pending states we have when creating
and updating an RDS instance
2016-09-11 19:29:23 +01:00
Radek Simko
774817255f Update CHANGELOG.md 2016-09-11 19:14:42 +01:00
Steve Hoeksema
1d04cdb9bc Export AWS ELB service account ARN (#8700) 2016-09-11 19:13:58 +01:00
Colin Wood
453ac9bb3d Refactor of username -> owner 2016-09-09 12:13:45 -07:00
Colin Wood
49f0c2e917 Add acceptence test for default reviews and hook 2016-09-09 12:09:07 -07:00
Paul Stack
291f298535 Merge pull request #8737 from hashicorp/aws-bump-sdk-1.4.7
Bump AWS SDK version to 1.4.7
2016-09-09 11:40:07 +01:00