Commit Graph

2288 Commits

Author SHA1 Message Date
Andy Chan 0eee165a2b ISSUE-5702: Fixed a bug on target_id generation and related test case 2016-03-23 10:25:13 -07:00
Andy Chan 92590d1ac8 Fixed the test case to check if the targetId is created 2016-03-23 10:25:13 -07:00
Andy Chan 7dc5a272be ISSUE-5702: Making the CloudWatch Event Rule Target ID optional 2016-03-23 10:25:13 -07:00
Clint ccb9693994 Merge pull request #5676 from Originate/mb-ensure-iops-is-provided
provider/aws: Provide iops when changing storage type to io1 on RDS
2016-03-23 08:31:21 -05:00
Paul Hinze e5e6b571a5 provider/aws: Fix aws_route panic when destination CIDR block is nil
Fixes #5754
2016-03-22 10:35:22 -05:00
Edmund Craske edbc4fad13 Fail if failover set when set_identifier unset
Added as per
https://github.com/hashicorp/terraform/pull/5777#issuecomment-199802514
2016-03-22 13:19:24 +00:00
edmundcraske 4aa7d4f7db Fail when weight set and set_identifier not set
Resolves https://github.com/hashicorp/terraform/issues/5776
2016-03-22 12:20:47 +00: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
Paul Stack 12546c6fca Merge pull request #5065 from tpounds/fix-aws-elb-access-logs-type
provider/aws: Change ELB access_logs to list type
2016-03-22 01:40:14 +00:00
stack72 7e61947c0a provider/aws: Scaffold `aws_iam_user_ssh_key` resource 2016-03-22 01:19:16 +00:00
Paul Hinze 20e517475b Merge pull request #5724 from paulodeininger/feature/fix_aws_opsworks_windows
Add DefaultOs on Stack creation (fix Windows stack issue)
2016-03-21 15:10:03 -05:00
stack72 fb92896326 Merge branch 'master' of github.com:hashicorp/terraform 2016-03-21 18:48:47 +00:00
Andy Chan d6cd47fd5e Reformat the kms alias test code 2016-03-21 18:48:00 +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
Radek Simko 5c21422f7d Merge pull request #5712 from bjss/master
Use timeout_in_minutes for Terraform timeout in AWS CloudFormation
2016-03-21 17:06:20 +00: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
James Nugent 6732659fe9 provider/aws: Fix panic in VPN connection resource
Check to ensure that vpnConnection.CustomerGatewayConfiguration is not
nil prior to dereferencing it on read.

Fixes #5647.
2016-03-21 13:52:14 +00:00
Andrew Tarry c3b3feaf11 Set cloudformation timeout to more than timeout_in_minutes
updated cloudformation timeout to use timeout_in_minutes if greater than 30 minutes

set the retry timeout as int64 when created
2016-03-21 09:08:52 +00:00
Paul Hinze d60bf93b4d Merge pull request #5723 from hashicorp/phinze/rds-instance-generate-identifier
provider/aws: ability to generate unique RDS identifier
2016-03-18 16:16:35 -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
Paulo Eduardo Deininger Messias Alves 0a0ccb84f2 Add DefaultOs on Stack creation (fix Windows stack issue) 2016-03-18 17:51:25 -03:00
stack72 12ac0761b7 provider/aws: Modify `aws_redshift_cluster` now allows
`publicly_accessible` to be changed

Also updated the AWS Go SDK from 1.1.9 -> 1.1.12 as this was required to
allow the new behavior for the Redshift API
2016-03-19 01:05:09 +05:30
Paul Hinze 17775205f7 provider/aws: fix crash when Aurora instance disappears
Usage of a helper function was assuming that an error would be returned
in a not found condition, when in fact a nil pointer was
returned.

Attached test crashes w/o fix, passes with it.

Fixes #5350
Refs #5418
2016-03-18 12:27:57 -05:00
Maxime Bury 210eb3571e Provide iops when changing storage type to io1 2016-03-16 18:32:11 -04:00
Maxime Bury ec749d964f Correctly handle missing lambda function 2016-03-16 14:26:14 -04:00
Radek Simko af93183459 provider/aws: Add validation for CW Log Metric Filter 2016-03-15 15:01:21 +00:00
Radek Simko 7eba8f6f66 provider/aws: Add tests for CloudWatch Log Metric Filter 2016-03-15 15:01:20 +00:00
Radek Simko 3bfcd47238 provider/aws: Add support for CloudWatch Log Metric Filter 2016-03-15 15:01:20 +00:00
Paul Hinze 25fce81bfc provider/aws: log HTTP req/resp at DEBUG level
This should be quite helpful in debugging aws-sdk-go operations.

Required some tweaking around the `helper/logging` functions to expose an
`IsDebugOrHigher()` helper for us to use.
2016-03-14 12:26:37 -05:00
Paul Hinze fff441b4ac provider/aws: send Terraform version in User-Agent 2016-03-14 12:16:49 -05:00
Paul Hinze 60b239d7d1 provider/aws: Switch to session.Copy to build up configs
Found this function which makes the config setup much nicer - looks like
it's meant to be used for the very thing we're doing, which is starting
w/ a base config and customizing it slightly.

https://docs.aws.amazon.com/sdk-for-go/api/aws/session/Session.html#Copy-instance_method

This will make the User-Agent setting code to follow much simpler.
2016-03-14 11:42:37 -05:00
Pierre Carrier a8865b8901 provider/aws: optional fields in aws_autoscaling_lifecycle_hook
See hashicorp/terraform/issues/5614
2016-03-14 11:45:17 +00:00
Radek Simko 189e9b5ceb Merge pull request #5605 from nicolai86/bugfix/verify-ecs-elb-count
provider/aws validate number of load_balancers before creating aws_ecs_service
2016-03-13 15:15:00 +00:00
Raphael Randschau fc0c2c0ea7 Validate number of load_balancers
see #5336
2016-03-13 12:51:51 +01:00
Oleg Chunikhin 25383ad5a3 aws: Fix CloudFormation update for parameters & capabilities if not modified 2016-03-13 08:10:57 +00:00
Radek Simko 8612cc3373 aws: Improve acceptance test for CloudFormation w/ all attributes 2016-03-13 08:10:54 +00:00
clint shryock 66eb7c6055 provider/aws: Guard against Nil Reference in Redshift Endpoints 2016-03-11 12:16:29 -06:00
Radek Simko d8b36532ef Merge pull request #5239 from TimeIncOSS/f-aws-lambda-func-updates
provider/aws: Add support for updating Lambda function
2016-03-11 16:59:18 +00:00
Paul Hinze 82765ea589 Merge pull request #5453 from bigkraig/aws-s3-kms-key
provider/aws: Support KMS encryption of S3 objects
2016-03-10 15:44:10 -06:00
Paul Hinze 5ce68fd1bd Merge pull request #5571 from hashicorp/revert-5193-f-aws-instance-security-groups-updates
Revert "provider/aws: Support additional changes to security groups of instance without forcing new"
2016-03-10 15:09:16 -06:00
Paul Hinze e9c4d4f6d5 Revert "provider/aws: Support additional changes to security groups of instance without forcing new" 2016-03-10 14:51:30 -06:00
clint shryock 02ba1bf2d4 provider/aws: More Acc test updates
Working on the green

- randomize some Autoscaling lifecycle hook test names
- use vpc_security_group_ids for this test
2016-03-10 14:33:54 -06:00
Clint 99ddea503d Merge pull request #5495 from nicolai86/bugfix/aws_security_group-protocol-case-sensitivity
provider/aws Always transform aws_security_group protocol to lower case
2016-03-10 09:34:55 -06:00
Clint 239b3e4f5f Merge pull request #5533 from hashicorp/pr-5184
provider/aws: Fix EC2 Classic SG Rule issue
2016-03-10 08:56:29 -06:00
Radek Simko d777141a7b provider/aws: Add tests for Lambda function updates 2016-03-10 12:31:35 +00:00
Radek Simko fdc21aad25 provider/aws: Simplify update logic for Lambda function 2016-03-10 12:31:35 +00:00
Chris Marchesi b5c7521f52 aws_lambda_function: Force code update on SHA sum mismatch 2016-03-10 12:31:35 +00:00
Rob Zienert 4aeb5bb8e9 Adding support for Lambda function updates 2016-03-10 12:31:35 +00:00
Kraig Amador 76b3c74a58 Providing a more informative error message when combining kms_key_id and etag as well as using aws_kms_key to test aws_s3_bucket's kms_key_id. 2016-03-09 19:06:36 -08:00
Paul Hinze d12944797a Merge pull request #3928 from TimeIncOSS/aws-kms
provider/aws: Add support for KMS
2016-03-09 18:30:06 -06:00
Paul Hinze 108ccf0007 builtin: Refactor resource.Retry to clarify return
Change the `RetryFunc` from a plain `error` return type to a
specialized `RetryError` which must decide whether it is
retryable or not.

Add `RetryableError` / `NonRetryableError` factory functions that
callers are meant to use to build up these errors.

This makes it eminently clear whether or not a given error is
retryable from inside the client code.

Goal here is to _not_ change any behavior, simply reflect the
existing behavior with the new, clearer, API.
2016-03-09 17:37:56 -06:00
Paul Stack ab075bca60 Merge pull request #5193 from innossh/f-aws-instance-security-groups-updates
provider/aws: Support additional changes to security groups of instance without forcing new
2016-03-10 00:28:32 +01:00
James Nugent 7436cf7f89 Merge pull request #5376 from stack72/b-aws-ELBListner
provider/aws: Fixes the use of Uppercase chars in ELB Listeners
2016-03-09 23:18:56 +00:00
Paul Hinze ffa5db4f52 Merge pull request #5538 from hashicorp/phinze/retryerror-pointers-are-evil
provider/aws: Fix all pointer RetryError returns
2016-03-09 16:53:19 -06:00
Brad Sickles 3f41515d2b Fixing noop differences in aws_route. 2016-03-09 23:27:09 +01:00
Brad Sickles 16f94ed4b7 Added failing aws_route test that shows diff after apply. 2016-03-09 23:27:09 +01:00
clint shryock f96ec46681 update comments 2016-03-09 15:50:01 -06:00
Clint d14920adaf Merge pull request #5515 from hashicorp/b-aws-acc-test-updates
provider/aws: Retry DB Creation on IAM propigation error
2016-03-09 15:08:13 -06:00
clint shryock 23c42cd6cf Add test for flattenSecurityGroups 2016-03-09 15:00:30 -06:00
Paul Hinze de656942ae provider/aws: Fix all pointer RetryError returns
All of these RetryErrors were meant to fail right away, but instead
caused retry looping because the typecheck in the implementation of
`resource.Retry()` only catches the value type, and not the pointer
type.

Refs #5537
2016-03-09 14:59:55 -06:00
Maxime Bury 9e0bac6c9f Terraform should keep track of the publicly accessible attribute 2016-03-09 13:33:00 -05:00
ephemeralsnow 54cb5ffe00 provider/aws: Fix EC2 Classic SG Rule issue
Fixes an issue where security groups would fail to update after applying an
initial security_group, because we were improperly saving the id of the group
and not the name (EC2 Classic only).

This is a PR combining https://github.com/hashicorp/terraform/pull/4983 and
https://github.com/hashicorp/terraform/pull/5184 . It's majority
@ephemeralsnow's work.
2016-03-09 09:51:41 -06:00
Paul Stack 4601d371e1 Merge pull request #5524 from stack72/f-aws-ecr-repository_name
provider/aws: `repository_url` is computed for `aws_ecr_repository`
2016-03-09 09:38:09 +00:00
stack72 7c5ab40b74 provider/aws: Add support for the `repository_url` to be computed for
ECR
2016-03-09 09:29:23 +00:00
Paul Stack b5e6cb5f88 Merge pull request #5520 from bsiegel/aws_rds_cluster_encryption
Add storage_encrypted as an optional parameter to aws_rds_cluster
2016-03-09 00:21:26 +00:00
stack72 cad550e63d provider/aws: Add support for `description` to `aws_network_interface`
resource
2016-03-08 23:28:37 +00:00
Brandon Siegel fc7e9fcd53 Ensure aws_rds_cluster can have storage_encrypted set to true 2016-03-08 17:28:44 -05:00
Brandon Siegel 0085bf6ae8 Ensure aws_rds_cluster has storage_encrypted set to false by default 2016-03-08 17:28:32 -05:00
Brandon Siegel b3864db462 fixup! Add storage_encrypted as an optional parameter to aws_rds_cluster 2016-03-08 17:15:01 -05:00
Brandon Siegel 8aadf1d56d Add storage_encrypted as an optional parameter to aws_rds_cluster 2016-03-08 16:48:04 -05:00
clint shryock c29e1f24b8 provider/aws: Retry DB Creation on IAM propigation error 2016-03-08 14:09:42 -06:00
clint shryock 5dc387354d provider/aws: Randomize tests more to reduce conflicts
- ASG placement tests
- Randomize DynamoDB names in tests
- tag the sg created in this test to help identify in the console
- randomize policy and role names
2016-03-08 09:56:14 -06:00
Radek Simko d4d20a9f5a kms: Treat keys in PendingDeletion state as deleted 2016-03-08 09:30:47 +00:00
Radek Simko 6f8a9c0f77 aws: kms_key - Add support for is_enabled + enable_key_rotation 2016-03-08 09:30:47 +00:00
Radek Simko 347913a3be aws: kms_key - Iterate over all aliases (not just 50) 2016-03-08 09:30:47 +00:00
Radek Simko ff2d040d28 aws: kms_key + kms_alias - Add acceptance tests 2016-03-08 09:30:47 +00:00
Radek Simko ccedb36a86 aws: kms_key - add forgotten policy read call + normalize 2016-03-08 09:30:47 +00:00
Radek Simko 4c1f8db32d aws: kms_key - Change field name (deletion_window -> deletion_window_in_days) 2016-03-08 09:30:47 +00:00
Radek Simko fccffbcbb1 aws: kms_alias - Remove unnecessary default ForceNew state 2016-03-08 09:30:47 +00:00
Radek Simko 5c9fe668f5 aws: kms resources - Simplify error handling 2016-03-08 09:30:47 +00:00
Radek Simko 2b244e21bc aws: kms validation - Add missing placeholders for Errorf 2016-03-08 09:30:47 +00:00
Radek Simko 5466d69450 aws: kms resources - gofmt all the code 2016-03-08 09:30:47 +00:00
Philip Witty 5e18031367 Update AWS KMS with respect to key deletion features 2016-03-08 09:30:47 +00:00
Philip Witty 6648df7acc Added AWS KMS key & alias support 2016-03-08 09:30:47 +00:00
Raphael Randschau 2c698d2cb0 Always transform aws_security_group protocol to lower case
fixes #5489
2016-03-07 22:40:29 +01:00
clint shryock f0d3176999 provider/aws: Add Elastic Beanstalk Application, Configuration Template, and Environment
This adds support for Elastic Beanstalk Applications, Configuration Templates,
and Environments.

This is a combined work of @catsby, @dharrisio, @Bowbaq, and @jen20
2016-03-07 14:43:23 -06:00
Paul Stack 46e4717428 Merge pull request #5474 from kjmkznr/skip-normalize-empty-policy
provider/aws: Fix error parsing JSON in S3 bucket policy
2016-03-07 18:53:51 +01:00
Michael H. Oshita 00288c36b9 fix indentation 2016-03-07 22:18:58 +09:00
Kazunori Kojima 8d1292d608 Return empty string when input empty S3 bucket policy
Before:

"" -> "Error parsing JSON: unexpected end of JSON input"

After:

"" -> ""
2016-03-07 09:31:33 +09:00
Radek Simko c6c2752211 provider/aws: Sort API Gateway resources alphabetically 2016-03-06 09:29:31 +00:00
Radek Simko fa0d6af524 provider/aws: Remove unnecessary GetChange in Delete funcs 2016-03-06 09:29:31 +00:00
Radek Simko a338eae72a provider/aws: Guard APIGateway resource & REST API against deletion 2016-03-06 09:29:30 +00:00
Radek Simko ce5324b341 Merge pull request #4295 from nicolai86/feature/aws-api-gateway
provider/aws: API Gateway resources
2016-03-06 09:00:02 +00:00
Raphael Randschau 6430fca7f6 Add aws_api_gateway_deployment resource 2016-03-05 23:21:58 +01:00
Raphael Randschau 8c59d0861e Add aws_api_gateway_api_key resource 2016-03-05 23:21:54 +01:00
Raphael Randschau b4c99f1009 Add aws_api_gateway_model resource 2016-03-05 23:21:51 +01:00
Raphael Randschau 4da8b3d03a Add aws_api_gateawy_integration_response resource 2016-03-05 23:21:48 +01:00
Raphael Randschau 1593dbe9c8 Add aws_api_gateway_integration resource 2016-03-05 23:21:44 +01:00
Raphael Randschau 91f5206f8d Add aws_api_gateway_method_response resource 2016-03-05 23:21:41 +01:00