Commit Graph

1060 Commits

Author SHA1 Message Date
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 shryock fddafd2b96 providers/aws: Document and validate ELB ssl_cert and protocol requirements 2015-11-12 14:25:50 -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 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
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
Brandon Rochon 5bdba00082 add example of redrive_policy #2711
Change-Id: Ia1b26bf32d16628c3ef5cf99745ba7c222d3251e
2015-11-11 13:50:54 -08: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
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
James Nugent ca442bf00b Merge pull request #3818 from ijin/patch-1
provider/aws: Document `license_model` as supported argument for db_instance
2015-11-10 17:40:15 -05:00
Clint bea8e0b14f Merge pull request #3780 from hashicorp/b-aws-elb-source-sg-id
providers/aws: Provide source security group id for ELBs
2015-11-10 16:38:55 -06:00
Clint 51fd5fafef Merge pull request #3744 from stack72/f-aws-db-instance
provider/aws: Changing the db_instance resource to mark the engine_version as Optional
2015-11-10 15:48:06 -06:00
James Nugent 7c50e3ed65 Merge pull request #3833 from stack72/aws-kinesis-firehose
provider/aws: Add Kinesis Firehose resource
2015-11-10 16:04:48 -05:00
Paul Stack 77bad2c946 Changes to Aws Kinesis Firehouse Docs
Changing the AWS Kinesis Firehose docs as per @jen20's feedback
2015-11-10 20:59:01 +00:00
Clint 5708457610 Merge pull request #3802 from pforman/2911-lc-prefix
provider/aws: add name_prefix option to launch config
2015-11-10 14:43:08 -06:00
stack72 1abb0b19bf Changing the db_instance resource to mark the engine_version as Optional 2015-11-10 17:30:09 +00:00
stack72 255486857e Changing the Firehose documentation to note the regions is is available for and also that s3 is the only destination involved right now 2015-11-10 16:45:46 +00:00
stack72 8c68cb1080 Adding the documentation for the Kinesis Firehose Delivery Stream 2015-11-10 16:43:34 +00:00
Michael H. Oshita 22876be830 Document `license_model` as supported argument
Required for Oracle SE1
2015-11-10 14:31:55 +09:00
mcinteer 64d982ac9e Change the docs as the token can be explicitly set
This tripped me up today when I was trying to connect using MFA. I had a look at the source and found the token property, tested it out and low and behold it worked! 

Hopefully this saves someone else going through the same pain
2015-11-10 11:27:45 +13:00
Clint 6906dc1b2b Merge pull request #3822 from ijin/patch-2
Add db_subnet_group_name to aws_rds_cluster docs
2015-11-09 14:11:16 -06:00
Martin Atkins 988baa584b Merge #3814: 'coalesce' interpolation func 2015-11-09 09:31:18 -08:00
Michael H. Oshita 796fdeef53 Update rds_cluster.html.markdown
I needed `db_subnet_group_name` in the rds_cluster resource as well when creating on a non-default VPC.

https://github.com/hashicorp/terraform/pull/2935#issuecomment-133481106
2015-11-10 01:42:59 +09:00
Jef Statham 13e862673f Fix spelling mistake in aws iam saml title 2015-11-09 10:52:09 -05:00
Jef Statham 87e384dc97 Fix spelling mistake in aws saml example
Example resource name is `aws_iam_saml_provider` instead of `aws_saml_provider`.
2015-11-09 09:56:38 -05:00
Kirill Shirinkin 7e676a672f provider/openstack: extend documentation of Neutron::FloatingIP 2015-11-08 20:43:34 +01:00
Matt Morrison 6ecec7fe83 Add coalesce func 2015-11-08 19:34:56 +13:00
Paul Forman 4d640c6528 providers/aws: add name_prefix option to launch config
See #2911.

This adds a `name_prefix` option to `aws_launch_configuration` resources.

When specified, it is used instead of `terraform-` as the prefix for the
launch configuration.  It conflicts with `name`, so existing
functionality is unchanged.  `name` still sets the name explicitly.

Added an acceptance test, and updated the site documentation.
2015-11-07 01:29:16 -07:00
Clint 91aeba48ff Merge pull request #3795 from willrstern/aws-rds-typo
Typo in docs - AWS RDS config
2015-11-06 17:08:52 -06:00
clint shryock d6f6a3b3f5 Merge branch 'master' of github.com:hashicorp/terraform
* 'master' of github.com:hashicorp/terraform:
  Update CHANGELOG.md
  Adding S3 support for Lambda provider
2015-11-06 16:55:32 -06:00
clint shryock ccd37796ec Merge branch 'pr-3707'
* pr-3707:
  config updates for ElastiCache test
  Removing the instance_type check in the ElastiCache cluster creation. We now allow the error to bubble up to the userr when the wrong instance type is used. The limitation for t2 instance types now allowing snapshotting is also now documented
  Making the changes to the snapshotting for Elasticache Redis as per @catsby's findings
  Added an extra test for the Elasticache Cluster to show that updates work. Also added some debugging to show that the API returns the Elasticache retention period info
  When I was setting the update parameters for the Snapshotting, I didn't update the copy/pasted params
  Adding the ability to specify a snapshot window and retention limit for Redis ElastiCache clusters
2015-11-06 16:55:16 -06:00
Rob Zienert 327bd4f9c0 Adding S3 support for Lambda provider 2015-11-06 15:57:18 -06:00
Will Stern 1ab69ab638 typo in cluster_identifier 2015-11-06 15:55:58 -06:00
Clint c284f31570 Merge pull request #3626 from wojtekmach/patch-1
digitalocean: update index docs for do_token var
2015-11-06 11:32:09 -06:00
Clint ea3fc69f67 Merge pull request #3789 from stack72/f-aws-rds-cluster-instance-docs
provider/aws: RDS Cluster Instance Docs Update
2015-11-06 11:30:22 -06:00
Joe Topjian 1656e2837c Merge pull request #3772 from Fodoj/add-fixed-ips-to-openstack-ports
provider/openstack: Add fixed ips to openstack ports
2015-11-06 10:21:20 -07:00
clint shryock 83ae6fe410 document source_security_group_id for ELB 2015-11-06 11:20:30 -06:00
stack72 e8a411ce5f Fixing the RDS Cluster Instance docs to show that either an instance must be set as public OR have a db_subnet_group_name set 2015-11-06 16:10:21 +00:00
stack72 350f91ec06 Removing the instance_type check in the ElastiCache cluster creation. We now allow the error to bubble up to the userr when the wrong instance type is used. The limitation for t2 instance types now allowing snapshotting is also now documented 2015-11-06 11:16:51 +00:00
Clint cb52e23226 Merge pull request #3757 from stack72/f-aws-rds-cluster-backup
provider/aws: RDS Cluster additions
2015-11-05 14:28:18 -06:00
Paul Hinze d347b9d8e5 Merge pull request #3729 from hashicorp/docs-vmware-vsphere
docs: Change vSphere to VMware vSphere
2015-11-05 13:07:50 -06:00
Paul Hinze e85a618d67 Merge pull request #3717 from rakutentech/improve-acceptance-test
provider/vsphere: Fix acceptance tests for using optional parameters
2015-11-05 13:07:20 -06:00
Kirill Shirinkin 3a63b48f97 provider/openstack: fixed_ips implementation for ports 2015-11-05 19:23:05 +01:00
clint shryock e3be1d5f10 update elb access logs docs 2015-11-04 14:15:40 -06:00
Trevor Pounds 02ee437328 Add website docs. 2015-11-04 14:14:51 -06:00
stack72 1d0dbc5d19 Adding backup_retention_period, preferred_backup_window and preferred_maintenance_window to RDS Cluster 2015-11-04 19:40:22 +00:00
Dave Cunningham bb5eb4ff46 Merge pull request #3702 from lwander/f-gcp-global-forwarding-rule
provider/google: global forwarding rule tests & documentation
2015-11-03 13:41:08 -05:00
Lars Wander d344d3e39a provider/google: global forwarding rule tests & documentation 2015-11-03 13:31:46 -05:00
Lars Wander d11524682a provider/google: Target HTTPS proxy resource + tests & documentation 2015-11-03 12:34:13 -05:00
Dave Cunningham 0097d7105b Merge pull request #3727 from lwander/f-gcp-target-http-proxy
provider/google: Target HTTP proxy resource + tests & documentation
2015-11-03 12:12:01 -05:00