Commit Graph

7166 Commits

Author SHA1 Message Date
Paul Hinze 928f534cfc template_file: source contents instead of path
Building on the work of #3846, deprecate `filename` in favor of a
`template` attribute that accepts file contents instead of a path.

Required a bit of work in the interpolation code to prevent Terraform
from assuming that template interpolations were resource variables that
needed to be resolved. Leaving them as "Unknown Variables" prevents
interpolation from happening early and lets the `template_file` resource
do its thing.
2015-11-13 11:24:20 -06:00
Paul Hinze b6aed3fec3 communicator/ssh: fix typos travis didn't catch
I think rebasing and splitting got me into a weird state. This should
fix the build failures on master.
2015-11-12 16:00:28 -06:00
Paul Hinze c897d0a2c7 Update CHANGELOG.md 2015-11-12 15:36:28 -06:00
Paul Hinze d6a61bdccf Merge pull request #3846 from hashicorp/phinze/pathorcontents
ssh: accept private key contents instead of path
2015-11-12 15:35:16 -06:00
Paul Hinze 7ffa66d1a5 ssh: accept private key contents instead of path
We've been moving away from config fields expecting file paths that
Terraform will load, instead prefering fields that expect file contents,
leaning on `file()` to do loading from a path.

This helps with consistency and also flexibility - since this makes it
easier to shift sensitive files into environment variables.

Here we add a little helper package to manage the transitional period
for these fields where we support both behaviors.

Also included is the first of several fields being shifted over - SSH
private keys in provisioner connection config.

We're moving to new field names so the behavior is more intuitive, so
instead of `key_file` it's `private_key` now.

Additional field shifts will be included in follow up PRs so they can be
reviewed and discussed individually.
2015-11-12 14:59:14 -06:00
Clint 4252a3e557 Update CHANGELOG.md 2015-11-12 14:28:39 -06:00
Clint 1488bbf6c7 Merge pull request #3887 from hashicorp/elb-ssl-cert-fix
providers/aws: Document and validate ELB ssl_cert and protocol require
2015-11-12 14:28:12 -06:00
clint shryock 5cafe740ff update wording on ssl cert error 2015-11-12 14:25:50 -06:00
clint shryock 1b2e068b19 add extra test block 2015-11-12 14:25:50 -06:00
clint shryock fddafd2b96 providers/aws: Document and validate ELB ssl_cert and protocol requirements 2015-11-12 14:25:50 -06:00
Clint dcf40661c8 Merge pull request #3863 from hashicorp/b-aws-elb-access-fix
providers/aws: Fix issue with removing access_logs from ELB
2015-11-12 14:24:58 -06:00
James Nugent 9d27504133 Merge pull request #3866 from br0ch0n/sqs_queue_doc_example
Add example of redrive_policy to docs.

Fixes #2711.
2015-11-12 11:04:55 -06:00
James Nugent 86565559b2 Merge pull request #3886 from hashicorp/b-rename-tests
providers/aws/structure
2015-11-12 10:49:48 -06:00
clint shryock 12d2ae1438 patch TestExpandElasticacheParameters test 2015-11-12 10:45:49 -06:00
clint shryock e7e52ed98f Correct test method names so that they are ran 2015-11-12 10:36:22 -06:00
James Nugent d640cae0af Update CHANGELOG.md 2015-11-12 10:05:12 -06:00
James Nugent cbbe06388f Merge pull request #3883 from lwander/f-gcp-https-health-checks
provider/google: HTTPS Health Checks Resource + Tests & Documentation
2015-11-12 10:02:39 -06:00
James Nugent d96582e60f Merge pull request #3882 from ijin/iam-version
Align IAM version number to the current version (2012-10-17)
2015-11-12 10:00:27 -06:00
Lars Wander 28819603ba provider/google: HTTPS health checks resource + tests & documentation 2015-11-12 10:48:26 -05:00
Michael H. Oshita 90d70786ac Align IAM version number to the current version (2012-10-17) 2015-11-13 00:32:45 +09:00
Radek Simko 8935013f69 Merge pull request #3861 from chad-thompson/master
Update remote-config.html.markdown
2015-11-12 07:06:11 +00:00
Radek Simko 387d03e818 Update CHANGELOG.md 2015-11-12 00:02:58 +00:00
Radek Simko 15a568c806 Merge pull request #3828 from TimeIncOSS/b-aws-ecs-service-del
provider/aws: Treat ecs_service w/ Status==INACTIVE as deleted
2015-11-12 00:01:50 +00:00
Radek Simko bcd63f62a3 provider/aws: Log removal of INACTIVE ECS service 2015-11-11 23:53:59 +00:00
Brandon Rochon 5bdba00082 add example of redrive_policy #2711
Change-Id: Ia1b26bf32d16628c3ef5cf99745ba7c222d3251e
2015-11-11 13:50:54 -08:00
clint shryock 7f2244183c providers/aws: Fix issue with removing access_logs from ELB 2015-11-11 15:25:24 -06:00
Chad Thompson d309f8b82b Update remote-config.html.markdown
Replace "shared storaged" with "shared storage".  (Very minor change.)
2015-11-11 13:09:26 -06:00
James Nugent 2f163701e8 Update CHANGELOG.md 2015-11-11 12:18:02 -05:00
James Nugent 0567f894ba Merge pull request #3859 from hashicorp/b-destroy-target
Clear up `destroy --target` message
2015-11-11 12:15:18 -05:00
Clint 4d37859f02 Update CHANGELOG.md 2015-11-11 11:06:37 -06:00
Clint 45773184c4 Merge pull request #3694 from hashicorp/b-aws-retry-hook
provider/aws: Add a retry function to rescue an error in creating Lifecycle Hooks
2015-11-11 11:06:04 -06:00
Jake Champlin 39e7f42490 Clear up `destroy --target` message
When destroying infrastructure with `--target`, print out which
infrastructure will be destroyed instead of saying `Terraform will
delete all your managed infrastructure`.

```
 terraform destroy --target aws_instance.test2 --target aws_instance.test1
Do you really want to destroy?
  Terraform will delete the following infrastructure:
        aws_instance.test2
        aws_instance.test1
  There is no undo. Only 'yes' will be accepted to confirm
```

Omitting `--target` arguments will use the default input description.

```
$ terraform destroy
Do you really want to destroy?
  Terraform will delete all your managed infrastructure.
  There is no undo. Only 'yes' will be accepted to confirm.
```
2015-11-11 12:04:58 -05:00
clint shryock b51f425dac replace big retry func with resource.Retry 2015-11-11 10:53:23 -06:00
clint shryock 1ddfd7ced3 provider/aws: Add a retry function to rescue an error in creating Lifecycle Hooks 2015-11-11 10:25:23 -06:00
Clint 06c900f4c7 Update CHANGELOG.md 2015-11-11 09:55:00 -06:00
Clint caa0baaf87 Merge pull request #3756 from hashicorp/pr-3708
providers/aws: Add `access_logs` to ELB resource [GH-3756]
2015-11-11 09:54:43 -06:00
Clint 6fc35af412 Update CHANGELOG.md 2015-11-11 09:48:48 -06:00
Clint dda6973c0a Merge pull request #3677 from hashicorp/pr-2637
provider/aws: Add AutoMinorVersionUpgrade to RDS [GH-3677]
2015-11-11 09:48:24 -06:00
James Nugent b43b42be54 Update CHANGELOG.md 2015-11-11 10:42:21 -05:00
James Nugent f79af0a445 Merge pull request #3847 from betawaffle/master
Add queued as a pending state for Packet provider.
2015-11-11 10:41:00 -05:00
clint shryock 03e7c6cf12 default true for auto_minor_update and allow updates for RDS DB Instance 2015-11-11 09:36:37 -06:00
YuusukeMatsuura 7dd6b779ca Add AutoMinorVersionUpgrade to RDS. 2015-11-11 09:35:53 -06:00
Radek Simko 9426f6ff6c Update CHANGELOG.md 2015-11-10 23:22:57 +00:00
Radek Simko ac6efd86ed Merge pull request #3810 from TimeIncOSS/f-aws-ecs-ephemeral-volumes
provider/aws: Support scratch volumes in ecs_task_definition
2015-11-10 23:22:22 +00:00
James Nugent 8cca366d21 Merge pull request #3842 from hashicorp/b-heredoc-loading
Add resource with heredoc to config load tests
2015-11-10 18:19:34 -05:00
James Nugent f4164b5322 Add resource with heredoc to config load tests
This test reproduces the issue which is likely the root cause of #3840.
Test is currently failing with an "illegal character" message
corresponding with the location of the heredoc, which is also seen in
various acceptance tests for providers.
2015-11-10 18:12:21 -05:00
clint shryock 8c32536f3d return err if we fail to set access_logs; other cleanups 2015-11-10 16:58:24 -06:00
clint shryock 0a1890c329 Merge branch 'master' into pr-3708
* master: (95 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  upgrade a warning to error
  add some logging around create/update requests for IAM user
  Update CHANGELOG.md
  Update CHANGELOG.md
  Build using `make test` on Travis CI
  Update CHANGELOG.md
  provider/aws: Fix error format in Kinesis Firehose
  Update CHANGELOG.md
  Changes to Aws Kinesis Firehouse Docs
  Update CHANGELOG.md
  modify aws_iam_user_test to correctly check username and path for initial and changed username/path
  Update CHANGELOG.md
  Update CHANGELOG.md
  Prompt for input variables before context validate
  Removing the AWS DBInstance Acceptance Test for withoutEngine as this is now part of the checkInstanceAttributes func
  Making engine_version be computed in the db_instance provider
  ...
2015-11-10 16:52:45 -06:00
Clint d1d8aca483 Update CHANGELOG.md 2015-11-10 16:46:20 -06:00
Clint 68764e6def Merge pull request #3777 from hashicorp/pr-3751
provider/aws: fix panic with SNS topic policy if omitted
2015-11-10 16:45:42 -06:00