Commit Graph

891 Commits

Author SHA1 Message Date
Paul Stack cf37c3adaa provider/aws: Add support for `kms_key_id` to `aws_db_instance` (#6651)
As requested in #4822, add support for a KMS Key ID (ARN) for Db
Instance

```
make testacc TEST=./builtin/providers/aws
TESTARGS='-run=TestAccAWSDBInstance_kmsKey' 2>~/tf.log
==> Checking that code complies with gofmt requirements...
go generate $(go list ./... | grep -v /vendor/)
TF_ACC=1 go test ./builtin/providers/aws -v
-run=TestAccAWSDBInstance_kmsKey -timeout 120m
=== RUN   TestAccAWSDBInstance_basic
--- PASS: TestAccAWSDBInstance_basic (587.37s)
=== RUN   TestAccAWSDBInstance_kmsKey
--- PASS: TestAccAWSDBInstance_kmsKey (625.31s)
PASS
ok      github.com/hashicorp/terraform/builtin/providers/aws    1212.684s
```
2016-05-13 11:20:29 -05:00
stack72 fdf1962905 Merge branch 'aws-rds-cluster-param-group' of https://github.com/wowgroup/terraform into wowgroup-aws-rds-cluster-param-group 2016-05-12 23:27:20 +01:00
stack72 87d4fd7e0c Merge branch 'db_option_group_settings' of https://github.com/Ticketmaster/terraform into Ticketmaster-db_option_group_settings 2016-05-10 22:37:14 +01:00
qivers 9cc21d62f2 Correcting arn output to id (#6586)
Using `arn` as an output doesn't work, `id` does.
2016-05-10 22:32:07 +01:00
Kraig Amador dc4dd764e6 Adding option_settings to aws_db_option_group 2016-05-09 12:40:38 -07:00
Paul Stack af29a61748 provider/aws: Change `aws_elastic_ip_association` to have computed parameters (#6552)
* New top level AWS resource aws_eip_association

* Add documentation for aws_eip_association

* Add tests for aws_eip_association

* provider/aws: Change `aws_elastic_ip_association` to have computed
parameters

The AWS API was send ing more parameters than we had set. Therefore,
Terraform was showing constant changes when plans were being formed
2016-05-09 18:40:45 +01:00
clint shryock f8d59b9e97 provider/aws: Update paramter for DB Option Group 2016-05-09 12:16:26 -05:00
James Nugent affd2b3f3b Merge pull request #6505 from hashicorp/b-cloudfront-cookies
provider/aws: Require cookies for Cloudfront Distributions
2016-05-08 19:45:37 -04:00
Chris Marchesi 84cd31cece provider/aws: Add CloudFront hosted_zone_id attribute (#6530)
Added the hosted_zone_id attribute, which aliases to the Route 53
zone ID that can be used to route Alias Resource Record Sets to.

This fixes hashicorp/terraform#6489.
2016-05-09 00:40:30 +01:00
James Nugent 5366fabad1 Merge pull request #4401 from stack72/aws-rds-option-groups
provider/aws: aws_db_option_group
2016-05-08 19:34:15 -04:00
stack72 8dc123fd94 Scaffold the AWS DB Option Group resource
Change the AWS DB Instance to now include the DB Option Group param. Adds a test to prove that it works

Add acceptance tests for the AWS DB Option Group work. This ensures that Options can be added and updated

Documentation for the AWS DB Option resource
2016-05-08 20:18:53 +01:00
Paul Stack dc30bd29fc provider/aws: Redshift Cluster not allowing 0 for (#6537)
automated_snapshot_retention_period

The default value for `automated_snapshot_retention_period` is 1.
Therefore, it can be included in the `CreateClusterInput` without
needing to check that it is set.

This was actually stopping people from setting the value to 0 (disabling
the snapshots) as there is an issue in `d.GetOk()` evaluating 0 for int
2016-05-08 19:29:36 +01:00
Jason Wieringa 57a1001ac0 Fix documentation on autoscaling group (#6532)
As of sha d3697fa50b, enabled_metrics
is an optional setting.
2016-05-08 18:03:24 +01:00
Clint 99e0aec769 provider/aws: Fix issue changing EIP Association (#6521)
provider/aws: Update EIP to use new associate_with_private_ip instead of private_ip
2016-05-06 15:38:39 -05:00
Justin Clark 380ada1019 provider/aws: Add agent_version argument to AWS_OPSWORKS_STACK 2016-05-05 22:56:44 +01:00
clint shryock 8129c0589c provider/aws: Require cookies for Cloudfront Distributions 2016-05-05 15:44:35 -05:00
Greg Thole ebfc701265 provider/aws: AWS API Gateway request parameters json (#6501)
* Update docs with new parameters

* Add request parameters as JSON

* Update function name and error statements
2016-05-05 21:14:51 +01:00
Radek Simko d23fac3a28 aws: Update docs after #6385 (account ID via sts) 2016-05-05 17:51:44 +01:00
Kraig Amador 1f80ec48d0 Added RDS event subscriptions (#6367) 2016-05-05 11:14:25 +01:00
Josh Taylor 983da213af provider/aws: add response parameters support to api gateway (#6344)
* provider/aws: Add support for response parameters aws_api_gateway_integration_response and aws_api_gateway_method response.

* fix spacing

* fix spacing

* gofmt

* add update test; add docs; add reimplement TODO; add field read

* resolve conflict

* fix expandAPIGatewayMethodResponse error handling
2016-05-04 11:56:18 +01:00
Alex Brown 9ecb6a3d2a Clean up cloudfront docs and remove extraneous a tags (#6405)
* Fix headers and header anchor tags

The markdown parser already generates unique ids for header elements by
downcasing all of the words and replacing spaces with hyphens. Knowing
this, we can take the code blocks out of the headers and use the
generated ids as the link targets.

Aside: I tried to see if there was a standard way of documenting
subresources, but couldn't really find one. Both the aws_elb and
aws_instance resources seem to just say "documented below" without a
link. Then the relevant section is just a new paragraph with a list of
arguments.

* Reformat long lines

I find 80 character lines and whitespaces make the lists much easier to
read :)

* Remove extraneous <a> tags for header anchor tags

Now that middleman generates anchor tags for headers automagically, we
don't need to have blank <a> tags for anchor links to use.
2016-04-29 00:28:45 +01:00
Thomas Bruun 77c3ff9127 Reference correct CloudFront origin type in documentation (#6393) 2016-04-28 09:51:09 -05:00
Radek Simko 0a8ea049ef Merge pull request #5030 from TimeIncOSS/account_check
provider/aws: Allow account ID checks on EC2 instances & w/ federated accounts
2016-04-27 21:07:15 +02:00
Radek Simko 7642fa05a8 Merge pull request #5893 from TimeIncOSS/b-aws-api-gateway-fields
provider/aws: Respect 'selection_pattern' in api_gateway_integration_response
2016-04-27 20:46:29 +02:00
Thomas Bruun ccedadc9ac AWS ELB Listener: Clarify that ssl_certificate_id must be ARN (#6370)
Just saying `id` is ambiguous, it could be interpreted as the resource ID which will fail with the follow error: `CertificateNotFound: Server Certificate not found for the key: <id>`. The AWS documentation states that the ssl certificate id parameter must be the ARN.
2016-04-27 09:02:43 -05:00
Radek Simko e3ade6a784 provider/aws: Add support for api_gateway_account (#6321) 2016-04-27 13:08:59 +01:00
Colin Hebert f1f602cdf6 aws: Enable account ID check for assumed roles + EC2 instances 2016-04-27 12:56:03 +02:00
Radek Simko a9dc48158d docs: Improve docs for API Gateway int. response selection_pattern 2016-04-27 11:45:52 +02:00
Dave York a700574c34 fix some more docs issues (#6352)
spacing and newlines were messing with the docs rendering.
2016-04-26 17:13:52 +01:00
Dave York c13c0d16ab adding the price classes from the AWS cloud formation docs (#6350)
adding the price classes from the AWS cloud formation docs
2016-04-26 16:15:52 +01:00
Radek Simko d31a6ac47f provider/aws: Add support for api_gateway_authorizer (#6320) 2016-04-25 12:22:37 +01:00
clint shryock 6cf37b9fdc provider/aws: Update S3 Bucket Object docs for KMS Key 2016-04-22 14:25:18 -05:00
Martin Atkins 66af2b21c3 website(aws): link directly to lambda "Runtime" defininition
Previously we linked to the whole request body definition for valid values of `runtime`.

Now we link directly to the docs for `Runtime`, which will hopefully make it easier to find the valid values.

This fixes #4570.
2016-04-22 08:34:33 -07:00
Joel Handwell 5cd60aa26c Fix typo (#6281) 2016-04-21 16:32:04 +01:00
Josh Myers 3be66aa9ed Add cloudwatch_logs_subscription_filter provider (#5996) 2016-04-20 20:05:21 +01:00
KOJIMA Kazunori 5e33517394 provider/aws: Add support S3 Object Lifecycle Rule (#6220)
* providers/aws: Add support S3 Object Lifecycle Rule

* Fix failed vet command

* Fix failed acceptance tests

* Check nil pointer before dereference.

* Move S3 lifecycle rule id validator func to validators.go

* Don't fail when get lifecycle rule's response code is 404
2016-04-20 11:16:14 +01:00
Chris Marchesi 6ebac8403d provider/aws: CloudFront post-merge review updates (#6196)
* provider/aws: Fix hashing on CloudFront certificate parameters

Adding necessary type assertion to values on the viewer_certificate hash
function to ensure that certain fields are indeed not zero string
values, versus simply zero interface{} values (aka nil, as is such for a
map[string]interface{}).

* provider/aws: CloudFront complex structure error handling

Handle errors better on calls to d.Set() in the
aws_cloudfront_distribution, namely in flattenDistributionConfig(). Also
caught a bug in the setting of the origin attribute, was incorrectly
attempting to set origins.

* provider/aws: Pass pointers to set CloudFront primitives

Change a few d.Set() for primitives in aws_cloudfront_distribution and
aws_cloudfront_origin_access_identity to use the pointer versus a
dereference.

* docs: Fix CloudFront examples formatting

Ran each example thru terraform fmt to fix indentation.

* provider/aws: Remove delete retention on CloudFront tests

To play better with Travis and not bloat the test account with disabled
distributions.

Disable-only functionality has been retained - one can enable it with
the TF_TEST_CLOUDFRONT_RETAIN environment variable.

* provider/aws: CloudFront delete waiter error handling

The call to resourceAwsCloudFrontDistributionWaitUntilDeployed() on
deletion of CloudFront distributions was not trapping error messages,
causing issues with waiter failure.
2016-04-19 16:40:30 -05:00
Paul Stack a842efa6a3 documentation: Add a note to ebs_volume for snapshot_id & size (#6249) 2016-04-19 22:07:01 +01:00
Radek Simko 3213b3c6de docs: Fix typo in Beanstalk env + link to AWS docs (#6219) 2016-04-19 13:14:07 +01:00
Clint fcdcb4b916 provider/aws: Default Network ACL resource (#6165)
* provider/aws: Default Network ACL resource

Provides a resource to manage the default AWS Network ACL. VPC Only.

* Remove subnet_id update, mark as computed value. Remove extra tag update

* refactor default rule number to be a constant

* refactor revokeRulesForType to be revokeAllNetworkACLEntries

Refactor method to delete all network ACL entries, regardless of type. The
previous implementation was under the assumption that we may only eliminate some
rule types and possibly not others, so the split was necessary.

We're now removing them all, so the logic isn't necessary

Several doc and test cleanups are here as well

* smite subnet_id, improve docs
2016-04-18 11:02:00 -05:00
Martin Atkins da839e765c Fix broken example in aws_opsworks_instance docs 2016-04-16 10:26:25 -07:00
Martin Atkins 94f338d5de Merge #4276: aws_opsworks_instance resource 2016-04-16 10:14:22 -07:00
Martin Atkins bb7b8d6550 Merge #4419: aws_opsworks_application resource 2016-04-16 09:28:12 -07:00
Martin Atkins 72f121aec1 Merge #4272: custom JSON for Opsworks layers 2016-04-16 08:48:36 -07:00
Chris Marchesi a38ccbe074 CloudFront distribution and origin access identity support (#5221)
* CloudFront implementation v3

* Update tests

* Refactor - new resource: aws_cloudfront_distribution

 * Includes a complete re-write of the old aws_cloudfront_web_distribution
   resource to bring it to feature parity with API and CloudFormation.
 * Also includes the aws_cloudfront_origin_access_identity resource to generate
   origin access identities for use with S3.
2016-04-14 14:55:11 -05:00
Yousef Alam 286d2fadea Add note about ports when rule is created for all protocols (#6131) 2016-04-12 16:46:18 -05:00
Raymond Fallon 0cd0a4ec9c provider/aws: Manage Triggers for AWS CodeDeploy Event Notifications (#5599)
* provider/aws: CodeDeploy Deployment Group Triggers

  - Create a Trigger to Send Notifications for AWS CodeDeploy Events
  - Update aws_codedeploy_deployment_group docs

* Refactor validateTriggerEvent function and test

  - also rename TestAccAWSCodeDeployDeploymentGroup_triggerConfiguration test

* Enhance existing Deployment Group integration tests

  - by using built in resource attribute helpers
  - these can get quite verbose and repetitive, so passing the resource to a function might be better
  - can't use these (yet) to assert trigger configuration state

* Unit tests for conversions between aws TriggerConfig and terraform resource schema

  - buildTriggerConfigs
  - triggerConfigsToMap
2016-04-11 19:42:21 +01:00
protomouse b45e941144 add resource aws_rds_cluster_parameter_group 2016-04-11 10:26:47 +02:00
Justin Clark 576e56025c Add undocumented custom_json argument to opsworks_stack doc (#6074) 2016-04-08 10:01:43 -05:00
Michael H. Oshita 786cc45d5f Update cloudwatch_metric_alarm.html.markdown (#6085)
On creating CloudWatch metric alarms, I need to get the HealthCheckId dimension. Reference would be useful.

```
    dimensions {
        "HealthCheckId" = "${aws_route53_health_check.foo.id}"
    }
```
2016-04-08 09:54:24 -05:00
Jan Nabbefeld 6bf9f21c39 Opsworks Application support 2016-04-07 14:18:50 -07:00
Paul Hinze 8380a7b03e provider/aws: Allow multiple EIPs to associate to single ENI
When calling AssociateAddress, the PrivateIpAddress parameter must be
used to select which private IP the EIP should associate with, otherwise
the EIP always associates with the _first_ private IP.

Without this parameter, multiple EIPs couldn't be assigned to a single
ENI. Includes covering test and docs update.

Fixes #2997
2016-04-07 13:26:15 -05:00
Paul Stack 662dc9f49c update docs on required parameter for api_gateway_integration
* update docs on required parameter for api_gateway_integration

This parameter was required for lambda integration.

Otherwise,

` Error creating API Gateway Integration: BadRequestException: Enumeration value for HttpMethod must be non-empty`

* documentation: Including the AWS type on the api_gateway_integration docs
2016-04-06 16:54:40 -05:00
Hector Rivas Gandara ad761f338d provider/aws: Doc cloudwatch SNS and lambda perms
Documentation for `aws_cloudwatch_event_target` to warn that in order to be

able to have your AWS Lambda function or SNS topic invoked by a CloudWatch

Events rule, you must setup the right permissions

using `aws_lambda_permission` or `aws_sns_topic.policy`
2016-04-06 10:28:24 -05:00
Jeff Tang 41a8220e0f add custom_json for opsworks layers 2016-04-05 08:57:19 -04:00
KOJIMA Kazunori d646682d7a provider/aws: Support S3 bucket notification
* Implement aws_s3_bucket_notification resource
2016-04-04 21:23:06 -05:00
Clint b351a72e4c provider/aws: Normalize and compact SQS Redrive, Policy JSON
* provider/aws: Nomralize SQS Redrive Policy JSON

* provider/aws: Fix typo in log statements

* compact the Policy on SNS Queue

* add acceptance test for policy formatting
2016-04-04 11:41:36 -05:00
Paul Stack 4c2738ae98 Merge pull request #5915 from dharrisio/f-aws-elastic-beanstalk-environment-options
provider/aws: Adding outputs for elastic_beanstalk_environment resource.
2016-04-01 17:34:56 -05:00
David Harris c3a6cf0620 provider/aws: Adding outputs for elastic_beanstalk_environment resource.
refs #5798
2016-04-01 13:58:09 -06:00
Alexander Savchuk b3675f4a41 Add link to Route table page, remove self-reference
This note must have been copied from the Route table page.
It makes more sense to remove the self reference and add a link to the
Route table page.
2016-04-02 08:39:19 +13:00
David Harris bb1d4ee886 provider/aws: Add support for `cname_prefix` to `aws_elastic_beanstalk_environment`. 2016-04-01 09:53:10 -06:00
David Harris a8c7fb0a06 Adds `wait_for_ready_timeout` option to `aws_elastic_beanstalk_environment`. 2016-03-31 17:28:02 -06:00
Paul Stack a8e0528784 Merge pull request #4277 from ctiwald/ct/add-new-asg-policy-type
Add support for "StepScaling" autoscaling policies.
2016-03-30 21:06:39 -05:00
Paul Stack 3ba1c5e7b8 Merge pull request #5884 from TimeIncOSS/docs-api-gateway-extra
docs: Add some details about API Gateway resources
2016-03-30 19:20:39 -05:00
Paul Stack 3dbedc6407 Merge pull request #5787 from iceycake/ISSUE-5702
ISSUE-5702: Making the Cloudwatch Event Rule Target target_id optional
2016-03-30 19:17:32 -05:00
Paul Stack 8ed809456d Merge pull request #5830 from hashicorp/phinze/asg-health-check-grace-period-default
provider/aws: set ASG health_check_grace_period default to 300
2016-03-30 19:05:06 -05:00
Dave Dash de61132564 ssl_certificate_id applies to lb_protocol only. 2016-03-29 14:13:54 -07:00
clint shryock ac063bf573 provider/aws: Document lifecycle block needs for IAM Server Certificate 2016-03-28 15:39:54 -05:00
Radek Simko 1ce0f1b828 docs: Add some details about API Gateway resources 2016-03-28 20:15:15 +01:00
Jeshua Borges 99a1474545 Fix typo in kinesis_firehose_delivery_stream.html.markdown
Silly fix, but should be updated.
2016-03-25 16:59:26 -04:00
Radek Simko 1324838a15 Merge pull request #5857 from hashicorp/doc-ebs-block-device-mixmatch
provider/aws: doc EBS block device mix-match caveats
2016-03-25 20:41:57 +00:00
Radek Simko 3afbadae75 docs: Fix API Gateway documentation 2016-03-25 20:11:00 +00:00
Paul Hinze 7501f32721 provider/aws: doc EBS block device mix-match caveats
refs #5706
2016-03-25 12:12:01 -05:00
Christopher Tiwald f5c898e345 aws_autoscaling_policy: Add documentation for StepScaling policies. 2016-03-24 16:35:54 -04:00
Jeff Tang 88de250615 style updates to documentation and nil checks 2016-03-24 08:08:01 -04:00
Paul Hinze 6f76fb0702 provider/aws: set ASG health_check_grace_period default to 300
Closes #5658
2016-03-23 18:55:37 -05:00
Andy Chan 76adbefb95 ISSUE-5702: 2nd attempt to impl the target_id be optional 2016-03-23 10:42:53 -07:00
Andy Chan 7008bb6b9a ISSUE-5702: Updating the documentation to reflex the corresponding change with target_id. 2016-03-23 10:25:13 -07:00
enspencer 7ee46ae343 Change stream_arm to stream_arn in docs 2016-03-22 14:08:57 -04:00
James Nugent 22a409e4cc Merge pull request #5774 from stack72/f-aws-iam-user-sshkey
provider/aws: Add `aws_iam_user_ssh_key` resource
2016-03-22 10:29:08 +00:00
stack72 49c5137ef5 provider/aws: Add documentation for `aws_iam_user_ssh_key` resource 2016-03-22 01:19:39 +00:00
Henning Sprang dbb543a1fd region available is growing
Same as just changed in e46d06bd81 ;)
2016-03-21 22:12:46 +01:00
Henning Sprang e46d06bd81 region available is growing 2016-03-21 21:04:30 +00:00
stack72 fb92896326 Merge branch 'master' of github.com:hashicorp/terraform 2016-03-21 18:48:47 +00:00
Andy Chan f7b85777d6 Added documentation for kms alias name_prefix 2016-03-21 18:48:15 +00:00
Clint f715c91666 Merge pull request #5756 from hashicorp/b-beanstalk-configuration-update
provider/aws: Fix crasher in Elastic Beanstalk Configuration with Options
2016-03-21 12:59:22 -05:00
James Nugent f946695187 Merge pull request #5444 from TimeIncOSS/f-aws-logs-metric-filter
provider/aws: Add support for CloudWatch Log Metric Filter
2016-03-21 16:43:38 +00:00
clint shryock 9ae8e85640 provider/aws: Fix crasher in Elastic Beanstalk Configuration with option settings 2016-03-21 11:43:31 -05:00
Paul Hinze fe04808d0d provider/aws: clarify `db_subnet_group_name` in Aurora docs
The `db_subnet_group_name` needs to match between clusters and their
instances.
2016-03-18 17:15:13 -05:00
Paul Hinze 4e5429a140 provider/aws: ability to generate unique RDS identifier
Needed to truncate the identifier for SQL Server engines to keep it at
max 15 chars per the docs. Not a full UUID going into it, but should be
"unique enough" to not matter in practice.

Modified the basic test to use the generated value. Other tests are
still working w/ explicitly specified identifiers.
2016-03-18 16:07:37 -05:00
stack72 2e1455df2f documentation/aws: Changing `aws_autoscaling_group` `metrics_granularity` to be optional and noting that it has a default value of 1Minute 2016-03-19 00:00:22 +05:30
Clint a8a5acec6f provider/aws: Update RDS Cluster Instance Docs
The provided config didn't work; this should patch that up, to avoid the name conflict
2016-03-18 09:34:28 -05:00
Kocsis Máté 7a0063c9eb docs/aws: Fixed aws_ecs_service example 2016-03-17 21:17:13 +01:00
clint shryock 93a1f7a41f provider/aws: Document volume_size requirement if using EBS in ElasticSearch Domain 2016-03-17 09:00:41 -05:00
Andy Chan 1fb74416ac Added the missing tags params to the doc 2016-03-16 16:20:40 -07:00
Radek Simko 7a33fad25f provider/aws: Add docs for CloudWatch Log Metric Filter 2016-03-15 15:01:20 +00:00
Jeff Tang bcd5904eea Add support for Opsworks Instances
New resource checklist
- [x] Acceptance testing
- [x] Documentation
- [x] Well-formed code
2016-03-14 15:12:43 -04:00
stack72 1f2072cd41 documentation: Marking `notification_target_arn` and `role_arn` as
optional in `aws_autoscaling_lifecycle_hook`
2016-03-14 13:23:03 +00:00
tjinjin 336822646f Fix typo: "messag" to "message." 2016-03-14 03:24:33 +09:00
Radek Simko 693b5de932 docs/aws: Add a note about ECS Service LB limitation 2016-03-13 15:22:29 +00:00