Commit Graph

2539 Commits

Author SHA1 Message Date
Chris Marchesi c24fbc3f24 IGW detatch waiter tweak, 30 not found checks w/15 min max 2016-02-12 17:31:49 -08:00
clint shryock e7fa0952de provider/aws: Add some randomization for this IAM test 2016-02-12 14:38:23 -06:00
Srikalyan Swayampakula f21dc995c5 Update code based on the review suggestions.
1. Used resource.Retry instead of custom solution
2. Removed unnecessary variables and added required variable to resource.Retry.
2016-02-12 12:21:52 -08:00
clint shryock 9c3699d905 provider/aws: Add some randomization to this test 2016-02-12 14:17:19 -06:00
clint shryock 2a860ff564 provider/aws: Switch format for error message to utilize Go Stringer 2016-02-12 14:16:20 -06:00
clint shryock a344204cc7 provider/aws: format and randomize RDS Cluster Instance tests 2016-02-12 11:43:07 -06:00
clint shryock a7af4c46b2 rename test 2016-02-12 11:21:03 -06:00
Clint 169b63e401 Merge pull request #5032 from clstokes/f-aws-gateway-tunnel-info
provider/aws: Expose additional VPN Connection attributes.
2016-02-12 10:31:23 -06:00
Hasan Türken 766dac4d79 update documentation 2016-02-12 09:56:48 -06:00
Hasan Türken e41266e971 Move endpoint options into endpoints block 2016-02-12 09:38:21 -06:00
Hasan Türken 231604e8b7 support custom endpoints for AWS EC2 ELB and IAM 2016-02-12 09:35:50 -06:00
Paul Hinze 66ec38b2d9 Merge pull request #5046 from tpounds/use-built-in-schema-string-hash
Use built-in schema.HashString instead of custom hash functions.
2016-02-12 07:58:34 -06:00
clint shryock 8b4a366b43 Merge branch 'pr-4969'
* pr-4969:
  provider/aws: All security group mods on first run when restoring from snapshot
2016-02-11 16:40:29 -06:00
clint shryock 21a59fc708 provider/aws: All security group mods on first run when restoring from snapshot 2016-02-11 16:39:53 -06:00
Paul Stack 06fdadf491 Merge pull request #5099 from tpounds/cleanup-aws-type-conversions
provider/aws: Consolidate duplicate list/set type conversions
2016-02-11 22:29:50 +00:00
Clint 934c31f76b Merge pull request #4969 from Chili-Man/bugfix/aws_provider_rds_security_groups
provider/aws: apply security group changes in EC2 Classic RDS for aws_db_instance
2016-02-11 16:12:12 -06:00
Clint e04450d95f Merge pull request #4958 from hashicorp/b-aws-r53-record-tests
provider/aws: Add a regression test for Route53 records
2016-02-11 13:32:29 -06:00
Trevor Pounds 57a9048510 Consolidate duplicate list/set type conversions. 2016-02-11 00:48:58 -08:00
Trevor Pounds 164596880a Update acceptance test to use t2.micro instances.
The AWS free tier allows up to 750 hours on t2.micro
instance types. It's better to use cheaper instances
in case the resources are not cleaned up if a tests
is canceled or crashes.
2016-02-09 00:24:38 -08:00
Trevor Pounds 5624a33239 Change AWS ELB health_check to list type.
There can only be a single health_check configuration per load balancer
so choosing to use a list over a set is only relevant when comparing
changes during a plan. A list makes it much easier to compare updates
since the index is stable (0 vs. computed hash).
2016-02-08 23:08:35 -08:00
Trevor Pounds 5801b991c9 Cleanup unrelated config to speed up autogenerate name acc test.
Removes overspecified config that is unrelated to testing the auto scaling
group's autogenerated name. The test is only concerned with checking that
the auto scaling group was created successfully with an autogenerated name
matching a specific pattern.
2016-02-08 21:28:35 -08:00
Trevor Pounds eba605fa6a Cleanup unrelated config to speed up AZ/VPC acc tests.
Removes overspecified config that is unrelated to the auto scaling
group's availability zone and VPC identifier acceptance tests. The
created auto scaling groups do not need to spin up any hosts since
the acceptance tests are only concerned with checking the existence
of the associated availability zones and VPC identifiers.
2016-02-08 19:55:11 -08:00
Paul Stack 4baa8fa691 Merge pull request #5044 from tpounds/fix-read-aws-asg-az
provider/aws: Fix reading auto scaling group availability zones
2016-02-08 21:37:23 +00:00
Radek Simko 05b6af5d83 Merge pull request #5051 from TimeIncOSS/f-aws-cloudtrail-fields
provider/aws: Add support for CloudTrail log validation + KMS encryption
2016-02-08 21:05:35 +00:00
Radek Simko 531e60047b provider/aws: Add support for CloudTrail log validation + KMS encryption 2016-02-08 11:51:25 +00:00
Trevor Pounds 0cd0ff0f8e Use built-in schema.HashString. 2016-02-07 16:29:34 -08:00
Trevor Pounds 8ceeaaf7ff Fix load balancers read logic. 2016-02-07 15:00:21 -08:00
Trevor Pounds dac7226a8e Check calculated availability zones. 2016-02-07 14:24:31 -08:00
Trevor Pounds 37eb1cba88 Make availability zones a computed attribute.
Fixes a diff calculation error when only a VPC zone
identifiers is provided. In this case the associated
availability zones are computed from the subnets per
the AWS documentation.
2016-02-07 14:14:00 -08:00
Trevor Pounds e0f4be47a8 Remove redundant metadata get. 2016-02-07 14:14:00 -08:00
Trevor Pounds cd42705bf1 Fix availability zones read logic. 2016-02-07 14:14:00 -08:00
Paul Stack 00ea9c969d Merge pull request #4943 from stack72/f-aws-dynamodbtable-refresh
provider/aws: DynamoDB Table Refresh State on Error
2016-02-06 23:47:41 +00:00
Cameron Stokes 24f034a2c6 Acc tests for aws_vpn_connection tunnel attributes. 2016-02-06 14:00:26 -08:00
Cameron Stokes 6a5cb5b109 Provide tunnel info from XML config. 2016-02-06 12:39:49 -08:00
Maxime Bury eaacf5c618 Add multi-region option to cloudtrail 2016-02-05 13:15:05 -05:00
clint shryock 52f3e9b8db update provider test and extend the delete timelimit 2016-02-04 15:48:54 -06:00
Paul Tyng 0961033400 Add tag support for elasticsearch 2016-02-04 12:53:11 -05:00
Paul Tyng 20efc7688f Update validation on domain name 2016-02-04 12:53:10 -05:00
clint shryock 840d2e7ccc Switch to acctest.RandInt for acceptance tests 2016-02-04 11:20:22 -06:00
clint shryock 53a42eaa0f provider/aws: Add a regression test for Route53 records
This is a follow up on #4892 with tests that demonstrate creating a record and a zone, then destroying said record, and confirming that a new plan is generated, using the ExpectNonEmptyPlan flag

This simulates the bug reported in #4641 by mimicking the state file that one would have if they created a record with Terraform v0.6.6, which is to say a weight = 0 for a default value.

When upgrading, there would be an expected plan change to get that to -1. To mimic the statefile we apply the record and then in a follow up step change the attributes directly. We then try to delete the record.

I tested this by grabbing the source of aws_resource_route53.go from Terraform v0.6.9 and running the included test, which fails. The test will pass with #4892 , because we no longer reconstruct what the record should be based on the state (instead finding via the API and elimination/matching)
2016-02-03 09:16:50 -06:00
Diego Rodriguez cfafa3f574 fix ec2 classic security group changing 2016-02-03 00:33:42 -08:00
stack72 e87d3bb711 Enabled Enhanced Monitoring for RDS 2016-02-03 00:14:24 +00:00
stack72 9c17e5d3e8 DynamoDB Table now refreshes the state when NotFoundException occurs 2016-02-01 21:55:10 +00:00
clint shryock 772ac8522a provider/aws: Change VPC ClassicLink to be computed 2016-02-01 09:30:09 -06:00
Clint 41de3ee6bd Merge pull request #4892 from hashicorp/b-aws-r53-weight-update
provider/aws: Refactor Route53 record to fix regression in deleting
2016-01-29 13:36:32 -06:00
clint shryock 39f5a7e751 use the same error checking in DELETE 2016-01-29 12:38:22 -06:00
clint shryock 3bbb21d115 refactor error handling in findRecord 2016-01-29 11:56:19 -06:00
Clint b7582fa6d9 Merge pull request #4869 from hashicorp/b-aws-provider-auth-docs
provider/aws: Provide a better message if no AWS creds are found
2016-01-29 09:25:26 -06:00
Clint 800420cf9b Merge pull request #4856 from hashicorp/b-aws-test-randoms
provider/aws: Randomize all S3 bucket names per test, not per run
2016-01-29 06:52:29 -06:00
Clint 23cf9fdbd9 Merge pull request #4860 from hashicorp/b-aws-test-randoms-ops
provider/aws: Restructure OpsWorks test files
2016-01-29 06:52:16 -06:00
Paul Stack 2bc5d25bc0 Merge pull request #4891 from stack72/f-aws-sns-ui-deleted
provider/aws: SNS Topic State Refreshing correctly
2016-01-29 11:03:19 +00:00
Radek Simko 51f6a15803 Merge pull request #4894 from paultyng/pt/error-message
Add "lowercase" to error message
2016-01-29 10:39:43 +00:00
stack72 91cb65dd05 Provider/aws - SNS Topics deleted from the UI were causing Terraform to
throw an error:

* aws_sns_topic_subscription.checker: NotFound: Subscription does not
* exist
    status code: 404, request id: b8ca0c27-1a62-57b3-8b96-43038a0ead86

Terraform wasn't refreshing the state when the topic gave a 404
2016-01-28 23:26:05 +00:00
Paul Tyng 15f3091f9d Add "lowercase" to error message 2016-01-28 18:20:50 -05:00
clint shryock 125987994c provider/aws: Refactor Route53 record to fix regression in deleting
refactored to add a `findRecord` method to find the matching record set,
and use that for the `DELETE` method call.
2016-01-28 17:01:53 -06:00
stack72 bd4f8ed800 Refactoring the getAwsAutoscalingGroup func to accept only the arguments it needs rather than ResourceData and meta. This makes it more portable and reusable 2016-01-28 17:52:35 +00:00
Clint dd0475ca4e Merge pull request #4879 from hashicorp/b-aws-vpc-classiclink-fix
providers/aws: Fix issue with VPC Classic Link and regions that don't support it
2016-01-28 10:54:40 -06:00
clint shryock 2ac040bef2 providers/aws: Fix issue with VPC Classic Link and regions that don't support it
- use eu-central-1 to a config to check for #4874
- update documentation
2016-01-28 10:12:06 -06:00
Paul Stack 05d19b0fc3 Merge pull request #4693 from stack72/f-aws-asg-schedule-0values
provider/aws: aws autoscale schedule 0 values
2016-01-28 15:38:41 +00:00
clint shryock 45c9a10d0f provider/aws: Provide a better message if no AWS creds are found 2016-01-27 16:30:03 -06:00
clint shryock e64c23c69a patch up acc tests 2016-01-27 14:42:21 -06:00
Paul Hinze c70eab6500 aws: undeprecate min_elb_capacity; restore min capacity waiting
It was a mistake to switched fully to `==` when activating waiting for
capacity on updates in #3947. Users that didn't set `min_elb_capacity ==
desired_capacity` and instead treated it as an actual "minimum" would
see timeouts for every create, since their target numbers would never be
reached exactly.

Here, we fix that regression by restoring the minimum waiting behavior
during creates.

In order to preserve all the stated behavior, I had to split out
different criteria for create and update, criteria which are now
exhaustively unit tested.

The set of fields that affect capacity waiting behavior has become a bit
of a mess. Next major release I'd like to rework all of these into a
more consistently named block of config. For now, just getting the
behavior correct and documented.

(Also removes all the fixed names from the ASG tests as I was hitting
collision issues running them over here.)

Fixes #4792
2016-01-27 13:30:44 -06:00
clint shryock 99e9dca413 fix some typos 2016-01-27 11:46:46 -06:00
Lars Bahner 8f2d39be45 On Oracle RDS DB instances you can't change the encoding
of the database after creation. So we need to be able to
set the CharacterSetName on creation.
This is an option and will automagically default to
AL32UTF8.

The AWS SDK will give you an error message if you try to
apply this setting to other engines. The patch will only
report the character_set_name attribute, if CharacterSetName
is set on the instance.

Signed-off-by: Lars Bahner <lars.bahner@gmail.com>
2016-01-27 18:39:00 +01:00
clint shryock 303554c8df restructure OpsWorks test files to use random stack name, and duplication 2016-01-27 11:32:40 -06:00
clint shryock dd0ca302de guard against a nil dereference 2016-01-27 10:56:33 -06:00
clint shryock 244e727c6f provider/aws: Randomize all S3 bucket names per test, not per run
The existing `randInt` is being use per run (so all tests use the same bucket
name), not per run (where each test would get a random int)

Fixes that
2016-01-27 10:45:52 -06:00
Clint 24f10b024f Merge pull request #4838 from hashicorp/b-aws-rds-db-name-fix
provider/aws: Workaround API issue with RDS Cluster DatabaseName
2016-01-26 14:08:42 -06:00
clint shryock d78e897b46 provider/aws: Fix SG leak in opsworks custom layer test 2016-01-26 11:43:35 -06:00
clint shryock 8d3f309f62 provider/aws: Workaround API issue with RDS Cluster DatabaseName 2016-01-26 10:35:21 -06:00
Clint 0f2f9da2fd Merge pull request #4779 from hashicorp/aws-sg-drift-fix
provider/aws: Fix issue with detecting drift in AWS Security Groups rules
2016-01-25 16:35:43 -06:00
Clint 2faf1c1422 Merge pull request #4829 from hashicorp/b-aws-efs-test-updates
provider/aws: Update EFS test destroy methods
2016-01-25 16:34:59 -06:00
Clint 577618b368 Merge pull request #4825 from hashicorp/b-aws-elb-listener-retry
provider/aws: Retry Listener Creation for ELBs
2016-01-25 16:32:40 -06:00
Clint 6ce5ade259 Merge pull request #4828 from hashicorp/b-aws-state-funcs
provider/aws: Update refresh state func target for DHCP options
2016-01-25 16:30:55 -06:00
clint shryock a3bfec2684 provider/aws: Update EFS test destroy methods 2016-01-25 16:27:58 -06:00
clint shryock 1e03c90238 provider/aws: use a known good ami for spot instance test 2016-01-25 16:16:55 -06:00
clint shryock 48ecc9b3a0 provider/aws: Update refresh state func target for DHCP options 2016-01-25 14:47:25 -06:00
clint shryock 86ad4c4340 provider/aws: Retry Listener Creation for ELBs 2016-01-25 11:38:04 -06:00
clint shryock e865c342cc provider/aws: fix ELB SG test 2016-01-25 11:05:22 -06:00
Clint 4708e66328 Merge pull request #4098 from csabapalfi/f-aws-s3-redirect-protocol
Enable specifying aws s3 redirect protocol
2016-01-22 15:51:40 -06:00
Clint 6befb714cc Merge pull request #4734 from hashicorp/b-network-acl-visibility
provider/aws: Wait for NACL rule to be visible
2016-01-22 14:26:21 -06:00
Csaba Palfi 8f6404a0e1 provider/aws enable specifying aws s3 redirect protocol
Signed-off-by: Csaba Palfi <csaba@palfi.me>
2016-01-21 23:26:13 +00:00
clint shryock 9ee6f822f6 provider/aws: Default Autoscaling Schedule min/max/desired to zero 2016-01-21 16:02:46 -06:00
clint shryock 7462eb1742 provider/aws: Fix issue with detecting drift in AWS Security Groups in-line rules 2016-01-21 11:21:25 -06:00
Ian Duffy 47ac10d66b Change resource.StateChangeConf to use an array for target states
Signed-off-by: Ian Duffy <ian@ianduffy.ie>
2016-01-21 01:20:41 +00:00
Paul Hinze 7d10d454e2 Merge pull request #4749 from hashicorp/b-1752
core: fix diff mismatch when RequiresNew field and list both change
2016-01-19 18:29:10 -06:00
Paul Hinze 4af2c5f5dd core: fix diff mismatch when RequiresNew field and list both change
fixes #1752

Includes AccTest reproducing example from the issue as well as a bunch
of explanatory comments in the tests and impls.
2016-01-19 15:38:04 -06:00
Clint 569e74c2e7 Merge pull request #4481 from ElliotG/feature/encryptedBlockDevice
provider/aws: Added support for the encryption flag on ebs_block_devices in launch configurations
2016-01-19 10:26:11 -06:00
James Nugent 7620381a4f provider/aws: Wait for NACL rule to be visible
Fixes #4721. It seems there may be some eventual consistency in the API
for network ACLs. This fix doesn't use resource.WaitForState() as there
the NACL is not something that can be looked up by ID and has a
property which determines if it is present.

Instead we reuse the findNetworkAclRule function which the Read function
exhibiting the problem uses, and retry over a 3 minute period, returning
an error message informing the user that running `terraform apply` again
will likely allow them to continue.
2016-01-19 08:12:20 -05:00
Srikalyan Swayampakula 3d256dd021 Found an issue with more testing aws api is responding with various of
"pending confirmation" such as "PendingConfirmation", "Pending Confirmation" etc.
2016-01-18 15:38:34 -08:00
Srikalyan Swayampakula 63d6d8dbe2 Forgot to add one last condition to ensure that non pending confirmation subscription is returned. 2016-01-18 14:00:11 -08:00
Srikalyan Swayampakula 9d125944c0 Added support for http/https endpoints that auto confirms SNS topic subscription.
http and https SNS topic subscription endpoints require confirmation to set a valid arn otherwise
arn would be set to "pending confirmation". If the endpoints auto confirm then arn is set
asynchronously but if we try to create another subscription with same parameters then api returns
"pending subscription" as arn but does not create another a duplicate subscription. In order to
solve this we should be fetching the subscription list for the topic and identify the subscription
with same parameters i.e., protocol, topic_arn, endpoint and extract the subscription arn.

Following changes were made to support the http/https endpoints that auto confirms

1. Added 3 extra parameters i.e.,
   1. endpoint_auto_confirms -> boolean indicates if end points auto confirms
   2. max_fetch_retries -> number of times to fetch subscription list for the topic to get the subscription arn
   3. fetch_retry_delay -> delay b/w fetch subscription list call as the confirmation is done asynchronously.

  With these parameters help added support http and https protocol based endpoints that auto confirm.

2. Update website doc appropriately
2016-01-17 12:24:32 -08:00
stack72 acabd4d407 Change ASG Lifecycle Default Result to be computed and added a test to record what the default value is 2016-01-15 22:34:16 +00:00
stack72 318db85623 Added a test to prove that 0 values cannot be specified for the Autoscale Group Schedule resource 2016-01-15 17:45:09 +00:00
Clint 79c32ddbe9 Merge pull request #4627 from ColinHebert/patch-1
provider/aws: EBS optimised to force new resource
2016-01-14 14:57:13 -06:00
Clint 8e6fba43ef Merge pull request #4564 from hashicorp/pr-3741
provider/aws: Supporting New AWS Route53 HealthCheck additions (supersedes #3741)
2016-01-14 14:41:19 -06:00
James Nugent 6acc7a14e4 Merge pull request #4632 from hashicorp/f-aws-profile
provider/aws: Add profile to provider config
2016-01-14 17:08:04 +00:00
James Nugent ace215481a provider/aws: Add profile to provider config
This allows specification of the profile for the shared credentials
provider for AWS to be specified in Terraform configuration. This is
useful if defining providers with aliases, or if you don't want to set
environment variables. Example:

$ aws configure --profile this_is_dog
... enter keys

$ cat main.tf
provider "aws" {
    profile = "this_is_dog"

    # Optionally also specify the path to the credentials file
    shared_credentials_file = "/tmp/credentials"
}

This is equivalent to specifying AWS_PROFILE or
AWS_SHARED_CREDENTIALS_FILE in the environment.
2016-01-14 15:39:35 +00:00
James Nugent ea4595840c Merge pull request #4674 from stack72/carl-youngblood/master
Fix recurrence on `aws_autoscaling_schedule` resource
2016-01-14 12:22:43 +00:00
Carl Youngblood 5c68858c5b Bug fixes for aws_autoscaling_schedule resource
- Fix typo s/recurrance/recurrence
- Fix missing nil check on EndTime that was crashing
2016-01-14 10:08:37 +00:00
clint shryock 8181a4ea24 minor clean ups after #3862 2016-01-13 16:58:07 -06:00
Clint 7f6624e926 Merge pull request #3862 from stack72/aws-redshift
provider/aws: AWS Redshift
2016-01-13 16:52:47 -06:00
Clint 64f44c53c6 Merge pull request #4597 from tpounds/support-aws-elb-az-and-subnet-updates
provider/aws: Support updating ELB availability zones and subnets
2016-01-13 15:30:44 -06:00
Clint eed2a2a0f6 Merge pull request #3139 from koendc/b-rds-snapshots-required-fields
provider/aws: aws_db_instance: make some fields optional
2016-01-13 15:15:09 -06:00
Clint 921f6eb806 Merge pull request #4388 from jszwedko/add-support-for-aws-directory-service-microsoft-active-directory
Add support for creating Managed Microsoft Active Directory and Directory Connectors in AWS
2016-01-13 13:39:29 -06:00
Paul Hinze 395b61825d Merge pull request #4654 from hashicorp/gofmts
Go fmt updates
2016-01-13 12:55:36 -06:00
Clint c9231a73ec Merge pull request #4240 from hashicorp/b-aws-catch-sg-name-id-error
provider/aws: Trap Instance error from mismatched SG IDs and Names
2016-01-13 11:57:58 -06:00
clint shryock f084871fad move the 'color' assignment 2016-01-13 11:16:36 -06:00
clint shryock aa7ba9ab9b provider/aws: OpsWorks updates
- add UseOpsworksSecurityGroups to the Create ops
- toggle waiting on said membership of groups
2016-01-13 11:13:09 -06:00
aibou 5e9c17d008 Implement some lacking parameters and stop waiting when in vpc and un-use opsworks default SG 2016-01-13 10:45:32 -06:00
clint shryock 73064bcb87 formatting 2016-01-13 10:10:15 -06:00
Johannes Boyne df7ac2d51b Add AWS lambda alias support and documentation 2016-01-13 10:05:32 -06:00
Koen De Causmaecker 45ef11e59f provider/aws: aws_db_instance: unrequire fields
When spinning up from a snapshot or a read replica, these fields are
now optional:
* allocated_storage
* engine
* password
* username

Some validation logic is added to make these fields required when
starting a database from scratch.
The documentation is updated accordingly.
2016-01-13 15:40:15 +01:00
Clint 5c3b88a0a7 Merge pull request #4140 from hashicorp/b-empty-element-sg
provider/aws: error with empty list item on security group
2016-01-12 17:03:02 -06:00
clint shryock 57b9097015 provider/aws: Default false for VPC Classic Link 2016-01-12 16:49:51 -06:00
Clint 90e5f5f655 Merge pull request #3994 from Pryz/master
Add AWS Classiclink for AWS VPC resource
2016-01-12 16:48:23 -06:00
clint shryock 317ab83743 Go fmt updates 2016-01-12 16:07:26 -06:00
Clint a5f8c39ddd Merge pull request #3332 from ross/aws-instance-migrate-nil-attr
Avoid nil map assign in aws instance migrateStateV0toV1
2016-01-12 15:55:16 -06:00
Clint 4f8e9713cf Merge pull request #3261 from fatih/show-instance-state
aws: store and read instance state
2016-01-12 11:06:30 -06:00
clint shryock ac60d6b959 provider/aws: Limit SNS Topic Subscription protocols
- update the ARN with the new ID
2016-01-12 09:57:09 -06:00
Clint a69df4b77c Merge pull request #4637 from discogestalt/aws-ap-northeast-2
provider/aws: Allow ap-northeast-2 (Seoul) as valid region
2016-01-11 16:50:55 -06:00
Mark Troyer b396bbb3e4 provider/aws: Allow ap-northeast-2 (Seoul) as valid region 2016-01-11 13:46:53 -08:00
Clint f0ef2c1a72 Merge pull request #4631 from wata727/add_new_parameter_elasticache
provider/aws: Add new parameter az_mode and availabiliy_zone(s) in ElastiCache
2016-01-11 15:46:04 -06:00
Paul Hinze 771fba4913 provider/aws: use random cert name in ELB test 2016-01-11 14:23:33 -06:00
wata_mac bfcff6b068 Add az_mode and availability_zones parameters
Signed-off-by: wata727 <watassbass@gmail.com>
2016-01-11 23:45:07 +09:00
wata_mac df56ef44f7 Add availability_zone parameter.
Signed-off-by: wata727 <watassbass@gmail.com>
2016-01-11 23:33:21 +09:00
Colin Hebert 2948d3678d provider/aws: EBS optimised to force new resource
EBS optimised can't be changed without re-creating the instance. Apply forcenew.
2016-01-11 08:16:49 +01:00
Trevor Pounds 76e23a3b2e Fix ELB security groups read logic. 2016-01-09 16:09:14 -08:00
Trevor Pounds 6dd4578e7c Add ELB availability zones acceptance test. 2016-01-09 15:40:21 -08:00
Trevor Pounds c34c2249e7 Support updating ELB availability zones. 2016-01-09 15:40:21 -08:00
Trevor Pounds f75c3168d7 Support updating ELB subnets. 2016-01-09 15:40:21 -08:00
Trevor Pounds 9541c37ef4 Fix ELB availability zones and subnets read logic. 2016-01-09 15:40:21 -08:00
Kazunori Kojima f2ce28ed46 Add support for S3 logging. 2016-01-09 10:09:23 -08:00
Clint 3c494a4d6a Merge pull request #4550 from hashicorp/b-aws-acc-fixes
provider/aws: Update acceptance tests
2016-01-08 09:27:32 -06:00
stack72 e635878b11 Forcing all Route 53 Healthcheck Types to be Uppercase or it would show diffs unnecessarily 2016-01-07 17:14:11 -06:00
stack72 3ebbb62bb0 Adding child_healthchecks to the Route 53 HealthCheck resource 2016-01-07 17:13:24 -06:00
stack72 172faca052 Adding support to Route53 HealthCheck for measure_latency and inverting healthcheck 2016-01-07 17:12:45 -06:00
Clint 829fffce7e Merge pull request #3688 from ajvb/master
Added measure_latency option to Route 53 Health Check resource.
2016-01-07 17:07:06 -06:00
Clint e25aaa5fb3 Merge pull request #4368 from spenczar/kinesis_pagination
provider/aws: Kinesis DescribeStream pagination
2016-01-07 16:51:36 -06:00
Radek Simko ddcee32411 Merge pull request #4366 from TimeIncOSS/b-ecs-svc-fixes
provider/aws: Fix bug w/ changing ECS svc/ELB association
2016-01-07 21:11:35 +00:00
clint shryock 9a4f0a06b3 clean up debugging 2016-01-07 15:00:55 -06:00
clint shryock dcce2aa479 providers/aws: Update OpsWorks tests to inject the expected availability zone, based on if we are testing vpc or not 2016-01-07 14:16:41 -06:00
clint shryock e2a7d4d98b provider/aws: Update testAccCheckAWSVpcPeeringConnectionDestroy to correctly check the destroyed state 2016-01-07 11:48:53 -06:00
Radek Simko 72d3d7ed9b provider/aws: Fix template_url/template_body conflict 2016-01-07 12:07:43 +00:00
Paul Hinze 319f7d77a0 Merge pull request #3947 from hashicorp/phinze/asg-wait-on-update
provider/aws: wait for ASG capacity on update
2016-01-06 15:55:43 -06:00
Clint 98703490bc Merge pull request #4531 from hashicorp/b-aws-resources-tests
provider/aws: Clean up OpsWorks tests
2016-01-06 15:40:59 -06:00
clint shryock adcbe85e3b provider/aws: Clean up OpsWorks tests to use us-east, validate destroy of custom layer 2016-01-06 14:44:55 -06:00
Clint bbfb9f0463 Merge pull request #4527 from hashicorp/b-aws-resources-tests
provider/aws: Update opsworks, vpn connection route tests
2016-01-06 13:30:06 -06:00
clint shryock 266f216a13 provider/aws: Update Ops works tests, error catching 2016-01-06 11:19:42 -06:00
Radek Simko 2edc25e868 Merge pull request #4431 from TimeIncOSS/f-aws-validators
provider/aws: Add validation for ECR repository name
2016-01-06 16:43:50 +00:00
clint shryock 2be03ddf06 provider/aws: Update testAccAwsVpnConnectionRouteDestroy method 2016-01-06 10:22:54 -06:00
Elliot Graebert 65567cfbdc Added an acceptance test 2016-01-05 23:36:39 -08:00
Paul Hinze a8d2ad3ebe refactor s3 bucket test to expect non-empty plan
pushing to master but paging @catsby for post-hoc review
2016-01-05 17:38:38 -06:00
Clint 5b3ef43b1c Merge pull request #4518 from hashicorp/b-aws-resources-tests
providers/aws: Update VPN Gateway test
2016-01-05 16:43:14 -06:00
clint shryock 055482a9f5 providers/aws: Update VPN Gateway test 2016-01-05 16:16:32 -06:00
Clint efeb9b02e6 Merge pull request #4511 from hashicorp/b-aws-resources-tests
provider/aws: More Acc test updates
2016-01-05 14:14:09 -06:00
clint shryock 449ffe027f fix error with undefined err 2016-01-05 11:35:21 -06:00
clint shryock 312f2dd6e3 document why we retry in lambda source mapping 2016-01-05 11:27:49 -06:00
clint shryock 6b733a09eb provider/aws: more retrying with Lambda 2016-01-05 11:22:57 -06:00
Clint dedc17072e Merge pull request #4510 from hashicorp/b-aws-resources-tests
provider/aws:Updating AWS Acceptance tests
2016-01-05 10:24:39 -06:00
clint shryock 89ca1bc86f Merge branch 'pr-4316' into b-aws-resources-tests
* pr-4316:
  Retry InvalidParameterValueException errors due to newly created resources
2016-01-05 10:17:40 -06:00
clint shryock f0d1193f8f provider/aws: Update Lambda create error handling to be more flexible 2016-01-05 10:17:20 -06:00
clint shryock 1510277f45 update AWS Service Directory delete method and test 2016-01-05 09:33:34 -06:00
clint shryock dd3a2aa4e9 provider/aws: Dynamo DB test/destroy updates 2016-01-04 16:57:31 -06:00
James Nugent c519ea74c5 provider/aws: Don't set NatGatewayId with no value
This fixes create aws_route_table resources in regions which do not
support the NAT Gateway yet (e.g. eu-central) - unless a value is
explicitly set in which case the API call will fail until such time as
NAT Gateway is supported.

Fixes #4499.
2016-01-04 16:14:30 -05:00
Clint 89f71d4ec4 Merge pull request #4497 from hashicorp/b-aws-iam-role-test-fix
provider/aws: Update some IAM tests
2016-01-04 14:55:29 -06:00
clint shryock c94815d56d provider/aws: Update some IAM tests 2016-01-04 14:19:12 -06:00
James Nugent 7b9f6e5128 Merge pull request #4490 from hashicorp/b-rds-unexpected-state
provider/aws: Fix RDS unexpected state config
2016-01-04 14:20:13 -05:00
James Nugent 3c330f6e19 provider/aws: Fix RDS unexpected state config
This commit adds the various states (taken from the RDS documentation
here: http://amzn.to/1OHqi6g) to the list of allowable pending states
when creating an RDS instance.

In particular, `resetting-master-credentials` is returned when creating
an `aws_db_instance` from a snapshot. Fixes #4477.
2016-01-04 13:24:29 -05:00
Elliot Graebert 2112f763ee Added support for the encryption flag on ebs_block_devices in launch configurations 2016-01-01 15:47:36 -08:00
Radek Simko d853d2cc93 aws: Add validation for ECR repository name 2015-12-23 16:07:53 +01:00
Radek Simko a367886eaf provider/aws: Separate existing validate functions 2015-12-23 15:11:45 +01:00
Radek Simko b7ed0e1c80 Revert "provider/aws: fix ECS service CheckDestroy in tests"
This reverts commit 47f8b0cd79.

cc @phinze
2015-12-23 11:35:30 +01:00
Radek Simko 9a625427ca aws: Add regression acc test for ecs svc lb changes 2015-12-23 10:43:37 +01:00
Radek Simko 95367bc0fc aws: Fix CheckDestroy for ecs service 2015-12-23 10:17:52 +01:00
clint shryock f68a351fba provider/aws: Fix issue with Route53 and zero weighted records 2015-12-22 16:23:08 -06:00
Paul Hinze 0d895ffa96 provider/aws: mention us-east-1 in ECR docs and tests
ECR is only available in us-east-1 for now.

Also added missing sidebar links for ECR resources.

/cc @nextrevision
2015-12-22 16:00:21 -06:00
Clint c49802de87 Merge pull request #4422 from hashicorp/b-vpc-endpoint-updates
VPC Endpoint test updates
2015-12-22 15:46:59 -06:00
Paul Hinze 0616c51aa2 Merge pull request #4415 from nextrevision/provider/aws-ecr
provider/aws: ecr resources
2015-12-22 15:34:27 -06:00
clint shryock 363defb548 provider/aws: Update Route53 Zone tests 2015-12-22 14:58:43 -06:00
Radek Simko f8bb48b287 aws: Wait for ECS service to be drained before deletion 2015-12-22 21:11:16 +01:00
Radek Simko 583c0a54c4 aws: Fix bug w/ changing ECS service LB association
- fixes #3444
 - fixes #4227
2015-12-22 21:10:23 +01:00
clint shryock 558e839bf2 vpc vpn connection test fixes 2015-12-22 12:53:42 -06:00
clint shryock 70bb536be1 skip TestAccAWSVPCPeeringConnection_tags for now 2015-12-22 12:18:22 -06:00
clint shryock c3d987ab18 VPC Endpoint test updates 2015-12-22 12:12:25 -06:00
Clint 791b2f0ccd Merge pull request #4392 from hashicorp/b-vpc-endpoint-updates
provider/aws: Update VPC Endpoint to correctly set route table ids, a…
2015-12-22 11:44:49 -06:00
Clint 86776e8b42 Merge pull request #4417 from hashicorp/b-aws-elasticache-testupdates
provider/aws: Updates for ElastiCache, ElastiSearch tests
2015-12-22 11:25:20 -06:00
Clint 3fc370285b Merge pull request #4420 from hashicorp/b-aws-s-test-updates
provider/aws: Update tests destroy checks
2015-12-22 11:25:06 -06:00
Paul Hinze b9ea8d8698 provider/aws: fix CheckDestroy for ProtocolPolicy tests
Can only assert that the load balancer is gone, since the test suite
deletes everything, and the load balancer is the way you get to the
proxy protocol policy.
2015-12-22 11:18:11 -06:00
clint shryock 1c2c1a5edb provider/aws: Update tests destroy checks 2015-12-22 11:08:09 -06:00
clint shryock 84fe0b15fd provider/aws: Update ElastiCache tests to verify delete
provider/aws: update elasticache search domain to only save access policies if not empty
2015-12-22 10:21:40 -06:00
Paul Hinze 88b2b86978 Merge pull request #4416 from hashicorp/phinze/aws-network-acl-fixes
provider/aws: fixes for Network ACL Rules
2015-12-22 10:21:05 -06:00
Paul Hinze df0f65502f provider/aws: fix CheckDestroy on placement_group tests 2015-12-22 10:20:28 -06:00
nextrevision 27b8dd08e7 Check for ecr repository and policy removal 2015-12-22 11:18:14 -05:00
Paul Hinze 7f62a49ebd provider/aws: fixes for Network ACL Rules
* Fixup Exists and CheckDestroy assertions
 * Make ingress/egress computed on network_acl, otherwise you could
   never use network_acl_rule with a managed network_acl without a
   perpetual diff.
2015-12-22 09:58:22 -06:00
nextrevision 6a3ed429ad Adding AWS ECR provider resources
Adds ECR aws_ecr_repository and aws_ecr_repository_policy resources to
the AWS provider.
2015-12-22 10:31:30 -05:00
Paul Hinze b7e87bbf16 provider/aws: fix CheckDestroy for main_route_table_association tests 2015-12-22 09:02:01 -06:00
Paul Hinze c8319d3b72 provider/aws: fix CheckDestroy on aws_instance tests 2015-12-22 08:49:50 -06:00
Paul Hinze fd528df002 provider/aws: fix CheckDestroy for iam_group_policy tests 2015-12-22 08:05:37 -06:00
Paul Hinze c8e88ed1b4 provider/aws: fix CheckDestroy for group_membership test 2015-12-22 08:00:55 -06:00
Paul Hinze da2c545c8c Merge pull request #4370 from TimeIncOSS/b-cloudformation-params-fix
provider/aws: CloudFormation - Use body or URL for all updates
2015-12-22 07:56:23 -06:00
Paul Hinze bf40c48075 provider/aws: fix ELB acc tests
* LB Name test could end up too long and fail
 * CheckDestroy was looking for the wrong error code
2015-12-22 07:41:24 -06:00
Paul Hinze 10cc513ae0 provider/aws: fix CheckDestroy for aws_eip tests 2015-12-22 07:34:06 -06:00
Paul Hinze 51732ac9eb provider/aws: fix CheckDestroy for codedeploy_app tests 2015-12-22 07:22:06 -06:00
Paul Hinze 02f14ae34a provider/aws: fix CheckDestroy on glacier vault 2015-12-22 07:17:35 -06:00
Paul Hinze 7d6b98060a provider/aws: fix CheckDestroy on a bunch of resources 2015-12-21 21:43:42 -06:00
Paul Hinze 1d5c65fa86 provider/aws: fix cookie stickiness policy test destroys 2015-12-21 21:23:57 -06:00
Paul Hinze 67832f6bd0 provider/aws: fix cache SG tests
* CheckDestroy should handle not found error
 * Pin provider in config to region most likely to have EC2 Classic
2015-12-21 21:12:47 -06:00
Paul Hinze 47f8b0cd79 provider/aws: fix ECS service CheckDestroy in tests 2015-12-21 21:10:13 -06:00
Paul Hinze f473c2a6d4 provider/aws: don't set static ELB names in tests
Prevents ELB name collisions during test runs
2015-12-21 17:41:55 -06:00
Paul Hinze 3dd8bea986 provider/aws: route table test; use standard account id env var
also moves the env var check inside the PreCheck, which makes it a
little simpler
2015-12-21 15:09:12 -06:00
Paul Hinze 092c268681 provider/aws: kinesis firehose stream: retry through IAM propagation
As I was fixing up the AccTests to not depend on a single existing IAM
role (which this commit does), I noticed that without some sleeping that
the kinesis_firehose_delivery_stream would often come back with:

```
msg: Firehose is unable to assume role {{arn}}. Please check the role provided.
code: InvalidArgumentException
```

Similar to the strategy taken in aws_instance with IAM Instance Profile errors,
I dropped in a simple retry loop which seemed to take care of the issue. Seems
that the same permission propagation delays apply here too.
2015-12-21 14:46:25 -06:00
stack72 bf03752552 Adding the documentation for the AWS Redshift Subnet Group resource
also removed the notion of tags from the redshift security group and
parameter group documentation until that has been implemented

Redshift Cluster CRUD and acceptance tests

Removing the Acceptance test for the Cluster Updates. You cannot delete
a cluster immediately after performing an operation on it. We would need
to add a lot of retry logic to the system to get this test to work

Adding some schema validation for RedShift cluster

Adding the last of the pieces of a first draft of the Redshift work - this is the documentation
2015-12-20 20:20:05 +00:00
stack72 48091e37c7 Adding the documentation for the Redshift Parameter Groups
Changed the aws_redshift_security_group and aws_redshift_parameter_group
to remove the tags from the schema. Tags are a little bit more
complicated than originally though - I will revisit this later

Then added the schema, CRUD functionality and basic acceptance tests for
aws_redshift_subnet_group

Adding an acceptance test for the Update of subnet_ids in AWS Redshift Subnet Group
2015-12-20 20:20:03 +00:00
stack72 249e7df76c Adding the documentation for the Redshift security groups
Creation of the schema, CRUD and acceptance tests for Redshift Parameter Group
2015-12-20 20:20:01 +00:00
stack72 85afc7d614 Initial creation of the work for AWS RedShift Support
Finalising the schema and acceptance tests for the Redshift Security Group's
2015-12-20 20:19:55 +00:00
James Nugent 27008ae898 Merge pull request #4395 from stack72/gofmt_errors_2
Fix some gofmt errors in imports
2015-12-19 11:47:01 -05:00
stack72 244a75504e More gofmt errors I'm afraid 2015-12-19 16:42:10 +00:00
James Nugent c442ca3899 Merge pull request #4344 from hashicorp/b-aws-s3-test-fixes
provider/aws: Fix check destroy method for s3 tests
2015-12-19 11:41:00 -05:00
stack72 d932d99679 Adds documentation for the AWS Network ACL Rule resource 2015-12-18 23:17:08 +00:00
stack72 96ad95abe9 Adds an acceptance test for the AWS Network ACL Rules 2015-12-18 23:14:54 +00:00
stack72 2df8d7d9b0 Initial Scaffolding of the AWS Network ACL Entry resource 2015-12-18 23:14:54 +00:00
James Nugent 30f9d61a95 Merge pull request #4387 from justnom/master
provider/aws: EIP not noticing it has been unassigned from an ENI
2015-12-18 17:32:55 -05:00
Jesse Szwedko 48bfd67296 Add support for creating connectors to aws_directory_service_directory
This adds support for creating AD Connectors. It is pretty close to the
same as creating AD and simple directories so we reuse the resource.
2015-12-18 21:42:54 +00:00
James Nugent ceee811625 Merge pull request #4381 from hashicorp/f-nat-gateway
provider/aws: Support for aws_nat_gateway
2015-12-18 16:00:42 -05:00
clint shryock 3b21fbc1bc provider/aws: Update VPC Endpoint to correctly set route table ids, and read after update 2015-12-18 14:18:30 -06:00
Clint 058b55635e Merge pull request #4264 from h-imaoka/b-aws-vpce-fix
providers_aws_vpce issue #4137
2015-12-18 14:10:01 -06:00
Jesse Szwedko 2d06381824 Increase aws_directory_service_directory timeouts
According to the AWS docs, creating a MS directory could take up to 25
minutes.
2015-12-18 20:07:34 +00:00
Jesse Szwedko 6bf1011df4 Validate type earlier for aws_directory_service_directory
Also DRY it up a little
2015-12-18 19:56:58 +00:00
Radek Simko b120f8c123 Merge pull request #4372 from TimeIncOSS/b-cf-deleted-fix
provider/aws: Treat CF stacks in DELETE_COMPLETE state as deleted
2015-12-18 20:44:11 +01:00
James Nugent 0bdf249f2c provider/aws: Add aws_nat_gateway Resource 2015-12-18 14:12:27 -05:00
Jesse Szwedko 82fe67f7fc Add support for creating Managed Microsoft Active Directory in AWS
This action is almost exactly the same as creating a SimpleAD so we
reuse this resource and allow the user to specify the type when creating
the directory (ignoring the size if the type is MicrosoftAD).
2015-12-18 18:24:51 +00:00
Clint e273fe6cfc Merge pull request #3663 from semarj/master
get profile name even if profile path exists
2015-12-18 10:55:23 -06:00
James Nugent 8e538b68ec Fix errors with gofmt compliance 2015-12-17 12:35:19 -05:00
Radek Simko 4e408d1593 provider/aws: CloudFormation - Add regression test for #4332 2015-12-17 18:00:09 +01:00
Radek Simko f017d2d2d6 aws: Treat CF stacks in DELETE_COMPLETE state as deleted 2015-12-17 17:59:38 +01:00
Radek Simko 8b30fd484d Merge pull request #4365 from TimeIncOSS/b-ecs-td-fix
provider/aws: Treat INACTIVE ECS TDs as deleted in acc tests
2015-12-17 17:38:46 +01:00
Radek Simko 202b0aef1b provider/aws: Always use either body or URL for all updates
- fixes #4332
2015-12-17 17:01:34 +01:00
Radek Simko a080447471 aws: Treat INACTIVE ECS TDs as deleted in acc tests
- related to https://github.com/hashicorp/terraform/pull/3924
2015-12-17 15:40:27 +01:00
Radek Simko 7f5e2b66ff aws: Treat INACTIVE ECS cluster as deleted 2015-12-17 15:34:49 +01:00
Harry Macey 4f5df717b4 Fixes #4351
Adding empty string defaults for network interface and instance when reading `aws_eip` resource.
2015-12-16 17:38:05 -05:00
clint shryock d4e4fb6ea0 Reuse structure method for network interface ips 2015-12-16 13:56:23 -06:00
Clint fb2735e470 Merge pull request #4307 from justnom/b-private-ips-eni
provider/aws: Allow changing private IPs for ENIs
2015-12-16 11:43:07 -06:00
Clint 60817ae91a Merge pull request #4315 from paybyphone/paybyphone_s3bucketpolicywaiter
aws_s3_bucket: Retry MalformedPolicy errors due to newly created principals
2015-12-16 11:21:52 -06:00
clint shryock b172d94381 provider/aws: Fix check destroy method for s3 tests 2015-12-16 11:07:15 -06:00
James Nugent 19e68da388 Merge pull request #4340 from stack72/f-aws-db_subnet_group_name-downcase
provider/aws: StateFunc on db_subnet_group name to be lowercase
2015-12-16 11:36:37 -05:00
stack72 57bcb49ede Change the DB Subnet Group Name to not allow UPPERCASE characters. If
this happens, throw a validation error

Add some ValidationTests for the DBSubnetGroupName ValidateFunc
2015-12-16 17:32:47 +01:00
Clint 54e44328e6 Merge pull request #4254 from hashicorp/b-aws-auth-refactor
provider/aws: WIP Refactor AWS Authentication chain
2015-12-16 10:12:06 -06:00
Clint 64482422b5 Merge pull request #4146 from hashicorp/b-aws-ebs-validate
providers/aws: Validate IOPs for EBS Volumes
2015-12-15 11:33:49 -06:00
clint shryock adf417809a add some comments on auth refactoring 2015-12-15 10:49:23 -06:00
clint shryock 5f5459a1fb provider/aws: Refactor AWS Authentication chain
- update auth checking to check metadata header
- refactor tests to not export os env vars
2015-12-15 10:46:10 -06:00
clint shryock d7a73937eb provider/aws: Guard against nil DB Parameter vaules 2015-12-14 14:45:27 -06:00
Chris Marchesi bfa4a88170 Retry InvalidParameterValueException errors due to newly created resources 2015-12-14 11:12:06 -08:00
Chris Marchesi 559aa50a31 Retry MalformedPolicy errors due to newly created principals 2015-12-14 10:42:08 -08:00
Spencer Nelson 063d770e51 provider/aws: Kinesis DescribeStream pagination
Each call to the Kinesis DescribeStream API returns a limited number of
shards. When interrogating AWS for the state of a Kinesis stream, the
client needs to page through the API's responses to get the true number
of shards.
2015-12-14 11:27:00 -05:00
justnom 38509d583d Fixes #4253 2015-12-14 10:33:08 -05:00
James Nugent 19ea14bf8d Merge pull request #4256 from stack72/aws-asg-scheduled-actions
provider/aws: Autoscaling Group Scheduled Actions
2015-12-11 16:54:13 -05:00
stack72 c965d2278e Adding a resource for aws_autoscaling_schedule 2015-12-11 18:43:38 +00:00
toshihisa bedd020dee issue #4137
vpc_endpoint bug fix.
2015-12-12 01:15:54 +09:00
Clint 8b21f284b4 Merge pull request #4259 from stack72/aws-db_parameter_group-tags
provider/aws: Adding Tag support for DB Param Groups
2015-12-11 08:58:26 -06:00
Clint 5b2230588a Merge pull request #4260 from stack72/aws-db_security_group-tags
provider/aws: Adding support for Tags to DB SecurityGroup
2015-12-11 08:48:59 -06:00
stack72 dec5a27f19 Adding the ARN as an output of the DB Subnet Group 2015-12-11 12:39:15 +00:00
stack72 474d6080f0 Adding support for Tags to the DB Security Group 2015-12-11 12:28:24 +00:00
stack72 67c1971e63 Adding support to DB Parameter Group for Tags 2015-12-11 12:07:50 +00:00
stack72 d84d6796c4 Initial CRUD work for the Autoscaling Group Scheduled Actions 2015-12-11 10:53:46 +00:00
James Nugent fb4878cf37 Merge pull request #3853 from stack72/f-aws-db-instance-omit-snapshot
provider/aws: add DB Instance skip_final_snapshot
2015-12-10 18:38:11 -05:00
stack72 2b0c7aa4e9 Making the changes to db_instance skip_final_snapshot on the feedback from @catsby 2015-12-10 23:21:36 +00:00
James Nugent 2fecc72fb0 Merge pull request #3809 from stack72/f-aws-elasticache-cache-nodes-reduction
provider/aws: Ability to reduce nodes in an ElastiCache cluster
2015-12-10 15:30:09 -05:00
stack72 6082e3e732 Changing the db_instance to throw an error is a final snapshot is required but yet no identified is given 2015-12-10 19:11:47 +00:00
stack72 5796b13373 Adding skip_final_snapshop bool to th db_instance. This will allow us to specify whether a snapshot is needed directly rather than checking for an empty string 2015-12-10 19:11:47 +00:00
James Nugent a213fe121d Merge pull request #4245 from grisha/esd_fix
Fix a bug whereby AWS elasticsearch domain access_policies will always appear changed
2015-12-10 14:08:38 -05:00
Clint eb3840c574 Merge pull request #4242 from hashicorp/b-aws-lc-guard
provider/aws: Fix missing AMI issue with Launch Configurations
2015-12-10 08:55:49 -06:00
Grisha Trubetskoy 6fbfd99ace Fix a bug whereby AWS elasticsearch domain access_policy will
always appear changed because of a missing normalizeJson().
2015-12-09 23:29:38 -05:00
Martin Atkins b679bb2b31 Merge pull request #4241 from b-ryan/fix/opsworks-ssh-key-write-only
Make the OpsWorks cookbooks SSH key write only
2015-12-09 18:04:58 -08:00
clint shryock e4dba86098 provider/aws: Fix missing AMI issue with Launch Configurations 2015-12-09 16:39:03 -06:00
clint shryock 5c60f7f2c1 provider/aws: Trap Instance error from mismatched SG IDs and Names 2015-12-09 15:59:36 -06:00
Buck Ryan 921944c956 Make the OpsWorks cookbooks SSH key write only
Fixes #3635

This follows the suggestion of @apparentlymart in
https://github.com/hashicorp/terraform/issues/3635#issuecomment-151000068
to fix the issue of OpsWorks stacks always complaining about the custom
cookbooks SSH key needing to be changed.

Functional tests:

* Created a new stack and gave it an SSH key. The key was written to
  OpsWorks properly.
* Ran "plan" again and terraform indicated it needed to change the SSH
  key, which is expected since terraform cannot read what the existing
  SSH is.
* Removed the key from my resource and this time, "plan" did not have
  any changes. The `tfstate` file indicated the SSH key was "" (empty
  string).
* Changed an unrelated property of the stack. Previously this was not
  working for me due to terraform attempting to change the SSH key.
2015-12-09 16:58:05 -05:00
Clint 078280f1ea Merge pull request #4155 from hashicorp/b-aws-db-replica-storage
providers/aws: Update DB Replica to honor storage type
2015-12-09 13:30:23 -06:00
Clint 501a016692 Merge pull request #4127 from hashicorp/aws-vet
Small updates to AWS provider to make go vet happy
2015-12-09 13:30:07 -06:00
clint shryock 6015874273 providers/aws: Update DB Replica to honor storage type
DB Replica can be of a different storage type, but we were skipping that part.
Note that they are created as the default (or as the primary?) initially,
and then modified to be of the correct type
2015-12-09 13:24:10 -06:00
Clint 9cc5e52cf0 Merge pull request #4167 from stack72/aws-security_group_name_prefix
provider/aws: securitygroup name_prefix
2015-12-09 11:42:34 -06:00
Clint 8e20552d44 Merge pull request #4236 from hashicorp/b-aws-s3-hosted-zone-update
providers/aws: Update Hosted Zones to fix issue with eu-central
2015-12-09 10:51:02 -06:00
clint shryock bd22c77c1f providers/aws: Update Hosted Zones to fix issue with eu-central 2015-12-09 10:44:22 -06:00
Clint ced42342ff Merge pull request #4215 from hashicorp/pr-4207
Fix issue creating AWS RDS replicas across regions
2015-12-09 09:54:53 -06:00
Clint 9044807152 Merge pull request #4221 from hashicorp/b-aws-runinstances-check
provider/aws: Handle empty Instances response from RunInstances
2015-12-09 09:54:02 -06:00
Paul Hinze 5884323c99 Merge pull request #4208 from stack72/aws-dynamodb_streams
provider/aws: DynamoDB Table StreamSpecifications
2015-12-08 18:42:48 -06:00
Paul Hinze baeb790ed9 provider/aws: fix capitalization in acctest names 2015-12-08 17:49:17 -06:00
Clint 9f5f30650f Merge pull request #4168 from combor/malformed_xml_fix
S3 bucket force_destroy error: MalformedXML
2015-12-08 15:24:50 -06:00
stack72 8b79881dea Adding a validation function for the DynamoDb Table StreamViewType 2015-12-08 20:58:06 +00:00
Paul Hinze a6ca034968 provider/aws: run codeclimate tests in us-east-1
It's only available there.
2015-12-08 14:46:08 -06:00
Paul Hinze 6e32320e41 provider/aws: switch test to use more accessible ami
Switch out an AMI that doesn't require marketplace terms acceptance.
2015-12-08 14:40:24 -06:00
clint shryock 9fc6c27de1 provider/aws: Check for empty instances in AWS Instance RunInstance response
Fixes #4206
2015-12-08 14:37:54 -06:00
clint shryock e52af33db7 remove extra DBSubnetGroupName 2015-12-08 10:55:57 -06:00
clint shryock 0619898f6a provider/aws: Add arn to DB Instance output 2015-12-08 10:52:17 -06:00
stack72 d46348c233 Adding support for AWS DynamoDB Table for StreamSpecifications 2015-12-08 14:07:11 +00:00
Philipp Preß 1cd2fea1f9 Fix AWS RDS cross-region read replica always being placed in default VPC
Fixes #4192 by honouring the `db_subnet_group_name` parameter when creating a cross-region read replica.
2015-12-08 15:06:57 +01:00
clint shryock cf87642bc8 provider/aws: Fix issue destroy Route 53 zone/record if it no longer exists 2015-12-07 16:33:37 -06:00
clint shryock 7bf404619c adjust the ebs validation to not error, only log, and only set iops for io1 2015-12-07 14:49:44 -06:00
clint shryock 5e54bcc6ff Add test for iops with gp2, remove strict validation 2015-12-07 11:16:29 -06:00
Piotr Komborski 3d28b8dec2 S3 bucket force_destroy error: MalformedXML
AWS provider was not checking whether DeleteMarkers are left in S3
bucket causing s3.DeleteObjectsInput to send empty XML which resulted in
400 error and MalformedXML message.
2015-12-04 15:24:23 +00:00
stack72 6817e0d144 Adding the ability to generate a securitygroup name-prefix 2015-12-04 09:21:08 -05:00
Paul Hinze 8e40b6b855 provider/aws: fixes to ASG placement_group tests
Based on @stack72's recommendations in #3704, thanks @stack72!
2015-12-03 18:17:54 -06:00
Paul Hinze 709d1f3599 Merge pull request #3704 from dayer4b/add-placement-group
added placement group as an option for autoscaling groups
2015-12-03 18:05:01 -06:00
Clint 79c9953b83 Merge pull request #4075 from elblivion/fix-elb-ec2-classic
provider/aws: Skip SG ID determination logic for Classic ELBs
2015-12-03 14:23:14 -06:00
clint shryock d1bba3095b providers/aws: Validate IOPs for EBS Volumes 2015-12-02 15:20:11 -06:00
stack72 2882d01904 Work to allow reducing the Number of Cache Nodes in an ElastiCache Cluster 2015-12-02 21:07:50 +00:00
James Nugent 69272f3113 provider/aws: error with empty list item on sg
This addresses the case where `compact` has not been used on a list
passed into security group as cidr_block. See #3786. Compact is still
the correct answer there, but we should prefer returning an error to
a panic. Fixes #3786.
2015-12-02 11:36:50 -05:00
clint shryock be07e4c0c9 cleanup spot instance attribute setting 2015-12-01 15:25:53 -06:00
clint shryock c5f0c8ced6 provider/aws: Check for nil on some spot instance attributes 2015-12-01 14:58:59 -06:00
clint shryock 4a5847f9ea providers/aws: Vet aws 2015-12-01 10:00:35 -06:00
James Nugent 9987f36d86 Merge pull request #4093 from paybyphone/master
provider/aws: New resource `aws_lambda_event_source_mapping`
2015-12-01 08:36:45 -05:00
Chris Marchesi 85627630bd New resource (AWS provider) - aws_lambda_event_source_mapping 2015-11-30 07:45:38 -08:00
James Nugent 85c8595c89 Merge pull request #4108 from stack72/f-aws-route53-spf-record
provider/aws: Normalization of SPF records to prevent reporting changes
2015-11-30 13:15:32 +00:00
stack72 fece57f83b Changing the IAM Role resource to allow update of Assume Policy Document 2015-11-30 12:52:07 +00:00
stack72 a556c98cde Adding support for the escapaing of Route53 SPF records 2015-11-30 12:14:39 +00:00
stack72 0cca74fe76 Changing the S3 Bucket resource to allow the update of ACL by using PutBucketAcl 2015-11-26 21:45:48 +00:00
Anthony Stanton 5753efa8af Skip SG ID determination logic for Classic ELBs 2015-11-26 15:34:28 +01:00
stack72 632a9147cc Adding support for Block_Durations to AWS Spot instance 2015-11-26 11:56:04 +00:00
James Nugent b7a12e3a58 Merge pull request #4009 from apparentlymart/aws-opsworks-acctest-iam
provider/aws: AWS Opsworks tests bring their own IAM objects
2015-11-25 21:26:40 +02:00
James Nugent c262bc72ea Merge pull request #3895 from br0ch0n/rds_pub_access_param
Issue #3894 RDS publicly_accessible param shouldn't force new resource
2015-11-25 21:09:23 +02:00
clint shryock e9cb722471 providers/aws: Fix issue recreating security group rule if it has been destroyed 2015-11-24 13:50:30 -06:00
James Nugent 288e568272 Merge pull request #4024 from rjeczalik/nil-deref-fix
provider/aws: fix for https://github.com/aws/aws-sdk-go/issues/452
2015-11-24 11:52:33 +02:00
Rafal Jeczalik 9e66e18334 provider/aws: fix for https://github.com/aws/aws-sdk-go/issues/452 2015-11-24 09:30:21 +01:00
James Nugent 99e3d62cd8 provider/aws: Make VPC ID required on subnets 2015-11-23 16:53:49 +02:00
Clint 82050ff832 Merge pull request #4005 from hashicorp/b-aws-iam-user-delete
provider/aws: Fix issue deleting users who are attached to a group
2015-11-23 08:22:48 -06:00
Clint 7772a66b2f Merge pull request #3940 from hashicorp/b-aws-spot-instance-updates
providers/aws: Update Spot Instance request to provide connection information
2015-11-23 08:22:07 -06:00
stack72 150e997a96 Changing the AWS ElastiCache cluster maintenance_window to enforce lowercase 2015-11-23 12:54:56 +00:00
Paul Forman 52aad04930 Mistake in type refactor in cloudTrailGetLoggingStatus
When adjusting the types to prevent casting, I didn't change the error
message to handle the pointer change.  "go tool vet" caught this.
2015-11-22 13:23:08 -07:00
Paul Forman 9cec40ea3c Add missing error-checks from code review
Some error-checking was omitted.

Specifically, the cloudTrailSetLogging call in the Create function was
ignoring the return and cloudTrailGetLoggingStatus could crash on a
nil-dereference during the return.  Fixed both.

Fixed some needless casting in cloudTrailGetLoggingStatus.
Clarified error message in acceptance tests.
Removed needless option from example in docs.
2015-11-22 12:54:11 -07:00
Paul Forman 484887c0c5 Change default for logging in CloudTrail to true
The default for `enable_logging`, which defines whether CloudTrail
actually logs events was originally written as defaulting to `false`,
since that's how AWS creates trails.

`true` is likely a better default for Terraform users.

Changed the default and updated the docs.
Changed the acceptance tests to verify new default behavior.
2015-11-22 10:47:23 -07:00
Paul Forman c9eeb161e0 Add a comment in tests
The purpose of the first test of enable_logging wasn't quite clear.

It's future-proofing against the assumptions made about AWS behavior.
2015-11-21 14:55:08 -07:00
Martin Atkins 11190144f0 AWS Opsworks tests bring their own IAM objects.
Previously we assumed the existence of some default objects that most
Opsworks users have because the Opsworks console creates them by default
when a new stack is created.

However, that meant that these tests wouldn't work correctly for anyone
who either had never used Opsworks via the UI or who had never accepted
the default of having the console create some predefined IAM objects to
use. It may also have led to some weird failures if a particular user had
customized the settings for these default objects.

Now the tests create suitable IAM roles, a policy and an instance profile
and use these when creating Opsworks stacks, avoiding any dependency
on any pre-existing objects.

This fixes #3998.
2015-11-21 11:13:25 -08:00
Paul Forman f98dbbb580 Tests and docs for AWS CloudTrail "enable_logging"
Add acceptance tests for creation, enable, and disable logging.

Add option to docs and example.
2015-11-21 00:18:38 -07:00
Paul Forman 52db098292 Add enable_logging to AWS CloudTrail
The AWS CloudTrail resource is capable of creating CloudTrail resources,
but AWS defaults the actual logging of the trails to `false`, and
Terraform has no method to enable or monitor the status of logging.

CloudTrail trails that are inactive aren't very useful, and it's a
surprise to discover they aren't logging on creation.

Added an `enable_logging` parameter to resource_aws_cloudtrail to enable
logging.  This requires some extra API calls, which are wrapped in new
internal functions.

For compatibility with AWS, the default of `enable_logging` is set to
`false`.
2015-11-21 00:18:38 -07:00
clint shryock 233aab6e0a provider/aws: Fix issue deleting users who are attached to a group
If you want to delete an IAM user, that user must not belong to any groups
2015-11-20 16:54:26 -06:00
Clint cc70d25dc5 Merge pull request #3898 from hashicorp/b-aws-elb-iam-cert-delete
providers/aws: Retry deleting IAM Server Cert on dependency violation
2015-11-20 14:50:18 -06:00
Clint 9edbf6a7fc Merge pull request #3908 from hashicorp/b-elb-cookie-fix
provider/aws: Fix issue with LB Cookie Stickiness and empty expiration period
2015-11-20 14:49:00 -06:00
clint shryock 9eb46c28b2 use a log group resourcE 2015-11-20 13:15:20 -06:00
clint shryock cf5b32617b fix vpn gateway refresh/reattach issue 2015-11-20 11:47:10 -06:00
Julien Fabre ed3f54cc47 Add AWS Classiclink for AWS VPC resource 2015-11-20 16:48:48 +01:00
clint shryock 73475edceb update TestAccAWSFlowLog_subnet to use new cloudwatch resource, not needing env var anymore 2015-11-20 09:39:43 -06:00
clint shryock fe204bb291 error test when env var is not supplied 2015-11-20 09:39:17 -06:00
clint shryock 4d0699b9dd mark snapshots as computed for ElastiCache clusters 2015-11-20 09:39:17 -06:00
clint shryock 01b9af40d1 fix resource name in test 2015-11-19 15:44:40 -06:00
clint shryock 0874347478 update ami id for test 2015-11-19 15:37:05 -06:00
clint shryock fd251e8b45 rename TestAccAWSRoute53Record_weighted to TestAccAWSRoute53Record_weighted_basic to test in isolation 2015-11-18 16:08:23 -06:00
Clint 5024d66f3c Merge pull request #3970 from hashicorp/b-aws-iam-policy-attachfix
providers/aws: Fix typo in error checking for IAM Policy Attachments
2015-11-18 13:57:03 -06:00
clint shryock 5482e98927 Fix typo in error checking for IAM Policy Attachments 2015-11-18 13:48:46 -06:00
Paul Hinze a211fc3469 Merge pull request #3965 from hashicorp/b-aws-sg-rules-v2-race
provider/aws: serialize SG rule access to fix race condition
2015-11-18 12:47:55 -06:00
Paul Hinze 6b6b5a43c3 provider/aws: serialize SG rule access to fix race condition
Because `aws_security_group_rule` resources are an abstraction on top of
Security Groups, they must interact with the AWS Security Group APIs in
a pattern that often results in lots of parallel requests interacting
with the same security group.

We've found that this pattern can trigger race conditions resulting in
inconsistent behavior, including:

 * Rules that report as created but don't actually exist on AWS's side
 * Rules that show up in AWS but don't register as being created
   locally, resulting in follow up attempts to authorize the rule
   failing w/ Duplicate errors

Here, we introduce a per-SG mutex that must be held by any security
group before it is allowed to interact with AWS APIs. This protects the
space between `DescribeSecurityGroup` and `Authorize*` / `Revoke*`
calls, ensuring that no other rules interact with the SG during that
span.

The included test exposes the race by applying a security group with
lots of rules, which based on the dependency graph can all be handled in
parallel. This fails most of the time without the new locking behavior.

I've omitted the mutex from `Read`, since it is only called during the
Refresh walk when no changes are being made, meaning a bunch of parallel
`DescribeSecurityGroup` API calls should be consistent in that case.
2015-11-18 12:39:59 -06:00
Nashwan Azhari da8314ce8a provider/aws: removed build-blocking unused variable. 2015-11-18 15:08:45 +02:00
Radek Simko 306046b82b Merge pull request #3955 from cbusbey/db_subnet_spaces
allow spaces in db subnet name
2015-11-17 22:38:36 +00:00
Clint 0bd8b32637 Merge pull request #3237 from GrayCoder/group-work
provider/aws: add support for group name and path changes with group update function
2015-11-17 16:37:40 -06:00
Chris Busbey 12d51edeb6 allow spaces in db subnet name 2015-11-17 12:48:56 -08:00
Paul Hinze 7f9360797c provider/aws: wait for ASG capacity on update
It's a bit confusing to have Terraform poll until instances come up on
ASG creation but not on update. This changes update to also poll if
min_size or desired_capacity are changed.

This changes the waiting behavior to wait for precisely the desired
number of instances instead of that number as a "minimum". I believe
this shouldn't have any undue side effects, and the behavior can still
be opted out of by setting `wait_for_capacity_timeout` to 0.
2015-11-17 10:25:41 -06:00
Clint 2ed867b5ab Merge pull request #3945 from hashicorp/b-aws-r53-record-zone-fix
provider/aws: Fix crash in Route53 Record if Zone not found
2015-11-17 09:10:50 -06:00
Brandon Rochon 6875e9aaec Issue #3894 RDS publicly_accessible param shouldn't force new resource
Change-Id: I0a10e050ca1c4f2dde5e04f237de6115723522d8
2015-11-16 17:47:35 -08:00
Radek Simko 00d0551933 aws: Add missing dereference operator 2015-11-16 23:19:45 +00:00
clint shryock 1413d032ee provider/aws: Fix crash in Route53 Record if Zone not found 2015-11-16 17:15:17 -06:00
clint shryock 901e5fbf9f fix log reference 2015-11-16 17:14:02 -06:00
clint shryock 8085e55eda fix issue with undefined var 2015-11-16 16:29:52 -06:00
Radek Simko a8ceda1b15 Merge pull request #3914 from TimeIncOSS/b-aws-ecs-service-gone
provider/aws: Prevent crashing when deleting ecs_service which is gone
2015-11-16 21:46:06 +00:00
clint shryock 70f1c9c1e6 remove duplicate readInstance call 2015-11-16 15:16:41 -06:00
clint shryock 66ad974193 add acceptance test for spot instanace updates 2015-11-16 15:11:44 -06:00
clint shryock f31b30d4a5 minor tweaks to connection info setup 2015-11-16 14:51:14 -06:00
clint shryock d998e883fb providers/aws: Update Spot Instance request to provide connection information 2015-11-16 14:43:24 -06:00
Radek Simko 5c59bd95cb Merge pull request #3924 from TimeIncOSS/b-aws-ecs-td-computed
provider/aws: Make all fields in ecs_task_definition ForceNew
2015-11-16 15:31:17 +00:00
Rafal Jeczalik 4f25b552bb use single import path for aws-sdk-go 2015-11-16 00:42:08 +01:00
Radek Simko 33ca2a796f Fix typo (Modifier -> Modified) 2015-11-14 12:19:29 +00:00
Radek Simko 308edd6dd7 provider/aws: Make all fields in ecs_task_definition ForceNew
- fixes https://github.com/hashicorp/terraform/issues/2694
2015-11-14 10:36:01 +00:00
Radek Simko aae8fc8494 provider/aws: Add acceptance test for bugfix for #2694 2015-11-14 10:34:17 +00:00
Radek Simko d5ae5ba062 Merge pull request #3910 from hashicorp/phinze/s3-object-homedir-expand
provider/aws: homedir expand in s3 object source
2015-11-14 09:35:09 +00:00
Radek Simko 0822776de0 provider/aws: If ecs_service isn't found during Read, delete it 2015-11-13 21:45:21 +00:00
Radek Simko d9a5de7f7d provider/aws: Prevent crashing when deleting ecs_service which is gone
- fixes https://github.com/hashicorp/terraform/issues/3868
2015-11-13 21:42:29 +00:00
clint shryock 7d94c86958 go fmt structure files 2015-11-13 13:53:52 -06:00
Sunil K Chopra bf88ee8ddb fix test to include creation of placement group 2015-11-13 12:40:19 -06:00
Paul Hinze 44f259bd74 provider/aws: homedir expand in s3 object source
fixes #3856
2015-11-13 11:21:22 -06:00
clint shryock e94fcdb9df add validation for cookie stickiness 2015-11-13 10:46:27 -06:00
clint shryock b81f9a9c52 provider/aws: Fix issue with LB Cookie Stickiness and empty expiration period 2015-11-13 10:34:15 -06:00
James Nugent 839fc5bfee Merge pull request #3900 from Banno/fix-aws-route53-record-failover-weight
provider/aws: fix for creating failover route53 records
2015-11-12 16:56:59 -06:00
clint shryock 6fa69ede1c add debugging statements to add/remove listeners 2015-11-12 16:20:54 -06:00
Luke Amdor 10ca0559ae provider/aws: no weight for all set_identifier 2015-11-12 16:15:05 -06:00
clint shryock c60a963908 providers/aws: Retry deleting IAM Server Cert on dependency violation
This will retry deleting a server cert
if it throws an error about being in use with an ELB (that we've likely just
  deleted)

Includes test for ELB+IAM SSL cert bug dependency violation
2015-11-12 16:07:34 -06:00
Brandon Rochon b6738f13c1 Issue #3894 RDS publicly_accessible param shouldn't force new resource
Change-Id: I833f9e07f3fc1f6ee475673ad978b3982f0b6273
2015-11-12 13:33:27 -08: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
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
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 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
clint shryock 7f2244183c providers/aws: Fix issue with removing access_logs from ELB 2015-11-11 15:25:24 -06: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 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 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 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
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 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
Clint 9e93f655e2 Merge pull request #3829 from hashicorp/b-aws-ecs-cluster-read
provider/aws: Fix issue that could occur if no ECS Cluster was found for a give name
2015-11-10 16:43:42 -06:00
Clint dbc008e330 Merge pull request #3574 from hashicorp/b-aws-r53-name-fix
provider/aws: Downcase Route 53 record names in statefile
2015-11-10 16:41:40 -06: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 shryock 7152674f9b upgrade a warning to error 2015-11-10 16:27:41 -06:00
clint shryock b16b634e2b add some logging around create/update requests for IAM user 2015-11-10 16:19:15 -06:00
Clint 8b1f7498af Merge pull request #3227 from GrayCoder/master
provider/aws Implement username updates properly for aws-sdk-go
2015-11-10 16:17:07 -06:00
James Nugent 06d493cfb6 Merge pull request #3849 from hashicorp/b-fix-kinesis-firehose-vet
provider/aws: Fix error format in Kinesis Firehose
2015-11-10 16:55:53 -05: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 b48bd30227 provider/aws: Fix error format in Kinesis Firehose 2015-11-10 16:39:23 -05: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
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
Patrick Gray eadee6bd33 modify aws_iam_user_test to correctly check username and path for initial and changed username/path 2015-11-10 15:24:45 -05:00
stack72 6e21cd746e Removing the AWS DBInstance Acceptance Test for withoutEngine as this is now part of the checkInstanceAttributes func 2015-11-10 17:35:12 +00:00
Paul Stack e3a66d0928 Making engine_version be computed in the db_instance provider 2015-11-10 17:30:19 +00:00
stack72 1abb0b19bf Changing the db_instance resource to mark the engine_version as Optional 2015-11-10 17:30:09 +00:00
stack72 d14d891367 Finishing the first pass at Kinesis Firehose. I have only implemented the S3 configuration right now as Terraform doesn't include RedShift support 2015-11-10 16:24:33 +00:00
stack72 5dfa9ac823 Adding the shell for the acceptance tests for the AWS Kinesis Firehose work 2015-11-09 22:44:26 +00:00
stack72 fc983c5505 Initial Create, Read and Delete work for the S3 part of the Kinesis Firehose resource 2015-11-09 22:26:55 +00:00
clint shryock 2694022b4a Fix a panic that could occur if no ECS Cluster was found for a given cluster name 2015-11-09 14:33:20 -06:00
Radek Simko 9683896480 provider/aws: Treat ecs_service w/ Status==INACTIVE as deleted
- fixes https://github.com/hashicorp/terraform/issues/3582
2015-11-09 20:46:05 +01:00
Radek Simko cf5cfdbff0 provider/aws: Set previously missing ARN in iam_saml_provider
- fixes https://github.com/hashicorp/terraform/issues/3820
2015-11-09 20:26:23 +01:00
Radek Simko 63049c0176 provider/aws: Support scratch volumes in ecs_task_definition 2015-11-08 20:31:34 +01: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 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
clint shryock dbd2a43f46 config updates for ElastiCache test 2015-11-06 16:55:04 -06:00
Rob Zienert 327bd4f9c0 Adding S3 support for Lambda provider 2015-11-06 15:57:18 -06:00
clint shryock 15533dca09 actually use the value 2015-11-06 14:06:50 -06:00
clint shryock c905bfef22 Test source_security_group_id for ELBs 2015-11-06 11:18:57 -06: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 shryock 9390674a05 providers/aws: Provide source security group id for ELBs 2015-11-05 16:43:49 -06:00
clint shryock 274781224e provider/aws: fix panic with SNS topic policy if omitted 2015-11-05 15:25:04 -06: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
stack72 6a5e591143 Removing an unnecessary duplicate test for the RDS Cluster Backups 2015-11-05 19:01:41 +00:00
stack72 9cee18b3de ElastiCache cluster read tolerates removed cluster.
Previously it would fail if a Terraform-managed ElastiCache cluster were
deleted outside of Terraform. Now it marks it as deleted in the state so that
Terraform can know it doesn't need to be destroyed, and can potentially
recreate it if asked.
2015-11-05 08:55:35 -08:00
stack72 ca2ea80af3 Making the changes to the snapshotting for Elasticache Redis as per @catsby's findings 2015-11-05 12:23:07 +00:00
stack72 409df4866d Changes after the feedback from @catsby - these all made perfect sense 2015-11-05 10:25:01 +00:00
stack72 4e485d4254 Fixing the spelling mistakes and adding a test to prove that the Updates to the new properties of RDS Cluster work as expected 2015-11-04 21:06:41 +00: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
clint shryock 5f7254eb1a providers/aws: Add ELB Access Logs (continues #3708)
- continues #3708
- adds some tests
- other fixes I found along the way
2015-11-04 11:58:29 -06:00
Tomas Doran 87dd5c5bd0 Fix panic I see when upgrading to 0.6.6
Check if the policy is nil or not before type casting it
2015-11-04 04:23:13 -08:00
clint shryock 2e03a7ebff go fmt after rebase 2015-11-03 16:30:18 -06:00
Trevor Pounds 4e3d0b5f6c Fix schema conversion. 2015-11-03 16:29:57 -06:00
Trevor Pounds 91b1d0c23d Can only set access logs once per ELB. 2015-11-03 16:29:57 -06:00
Trevor Pounds e8f1f57ead Fix int64 cast. 2015-11-03 16:29:57 -06:00
Florin Patan e173b60f10 Changes per feedback 2015-11-03 16:29:57 -06:00
Florin Patan e390d7ddf2 Add elb access logs setting 2015-11-03 16:29:57 -06:00
stack72 707bfd739a 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 2015-11-03 12:35:24 +00:00
Clint cb8962a6c6 Merge pull request #3710 from stack72/f-aws-asg-generated-name
provider/aws: Making the AutoScalingGroup name optional
2015-11-02 16:07:49 -06:00
Clint 6492853e84 Merge pull request #3513 from iJoinSolutions/5873-terraform-snapshot-security-v6.3
Provider/aws Apply security group after restoring db_instance from snapshot
2015-11-02 15:06:02 -06:00
stack72 4f05df6cad When I was setting the update parameters for the Snapshotting, I didn't update the copy/pasted params 2015-11-02 20:57:04 +00:00
Sunil K Chopra df41f10d1d tests! yes! (thanks stack72) 2015-11-02 09:37:09 -06:00
Sunil K Chopra c7b02d9fdb handling updates 2015-11-02 09:33:46 -06:00
Sunil K Chopra 68c7baa20e as per advice from stack72 to stick to strings 2015-11-02 09:33:35 -06:00
Sunil K Chopra 0d2007e8bd as per advice from stack72, simplified 2015-11-02 09:26:25 -06:00
Patrick Gray 8fcc13adbc update aws_iam_group tests to check proper paths and name 2015-10-31 12:04:54 -04:00
Patrick Gray 6a2d3eaa6b remove unneeded print function 2015-10-31 10:52:12 -04:00
stack72 69b905fb92 Making the AutoScalingGroup name optiona 2015-10-31 09:24:46 +00:00
stack72 7dd15469a5 Adding the ability to specify a snapshot window and retention limit for Redis ElastiCache clusters 2015-10-31 00:09:20 +00:00
Paul Hinze 5b78a9f635 provider/aws: var name tweak
as discussed in #3274 w/ @stack72
2015-10-30 17:50:57 -05:00
stack72 63d7f5993d Changing the AWS CodeCommit Connection Initiation to use the new session based work 2015-10-30 22:23:28 +00:00
Sunil K Chopra 006cac56a2 added placement group as an option for autoscaling groups 2015-10-30 16:45:19 -05:00
stack72 14604e432e Added the documentation for the CodeCommit repository 2015-10-30 21:39:16 +00:00
stack72 2ad006ab50 Currently, AWS CodeCommit is only available in us-east-1, therefore we
need to error out early if the region is anything other than this

Also added a test that will show that changes get applied on subsequent
runs
2015-10-30 21:39:16 +00:00
stack72 d9fd77c141 Finishing the last of the CodeCommit Repository resource. Also started to add some tests. The trouble for me right now is that CodeCommit is only in US-East-1 so I need to guard against that right now 2015-10-30 21:39:16 +00:00
stack72 89ce6f7c83 Started the work for the AWS CodeCommit Repository resource
Starting to add the skeleton for the creation and update of a repository
2015-10-30 21:39:04 +00:00
clint shryock 3f2a0ee743 provider/aws: Refresh SNS Topic updates in event of IAM role failure
- encode the json policy to match what we get back from the API
- retry if the IAM resource isn't yet available
- include regression test
2015-10-30 12:09:44 -05:00
Clint 4db8ef4a45 Merge pull request #3529 from hashicorp/b-aws-rds-copy-tags-to-snapshots
provider/aws: Add configuration to enable copying RDS tags to final snapshot
2015-10-30 09:09:41 -05:00
Paul Hinze cadbbbae08 aws: fix build after upstream breaking change
see
1a69d06935
2015-10-29 18:52:10 -05:00
clint shryock ec2d22cf29 update with go fmt 2015-10-29 17:10:44 -05:00
Clint 5c3c1e2327 Merge pull request #3548 from MDL/aws_route
provider/aws: add aws_route resource (finish)
2015-10-29 17:06:56 -05:00
Michael Austin a0322f9b8c go fmt 2015-10-29 17:55:23 -04:00
Michael Austin 5448e01269 removed extraneous debug code and clarified INFO logging 2015-10-29 17:53:40 -04:00
Paul Hinze 73569dc83c Merge pull request #3616 from Vlatombe/GH-3615
provider/aws: ignore association not exist on route table destroy [GH-3615]
2015-10-29 14:56:16 -05:00
AJ Bahnken ab273bb2ee Fixed up measure_latency option in r53 health checks.
* Added ignoring of param when Type is CALCULATED
* Added ForceNew param to measure_latency item in schema
* Added check to test
2015-10-29 12:50:02 -07:00
AJ Bahnken c1bb852390 Added measure_latency option to Route 53 Health Check resource.
Related to #3273
2015-10-29 10:28:26 -07:00
Clint cc0b941ba2 Merge pull request #3685 from stack72/f-aws-s3bucket-arn
Adding a computed ARN for the S3 Bucket as per #3666
2015-10-29 11:09:54 -05:00
stack72 8eec0c896f Adding a computed ARN for the S3 Bucket as per #3666 2015-10-29 13:33:35 +00:00
Clint cb2ecf5733 Merge pull request #3255 from Runscope/local-kinesis
provider/aws: allow local kinesis
2015-10-29 08:24:07 -05:00
Radek Simko 678c7e905a Merge pull request #3094 from TimeIncOSS/f-aws-cloudtrail
provider/aws: Add support for CloudTrail
2015-10-29 07:03:17 +00:00
clint shryock 2cd47ec195 add test for elasticache cluster and topic arn 2015-10-28 14:09:45 -05:00
clint shryock 9aeb04909c Merge branch 'master' into pr-2836
* master: (335 commits)
  Update CHANGELOG.md
  config: return to the go1.5 generated lang/y.go
  Update CHANGELOG.md
  Allow cluster name, not only ARN for aws_ecs_service
  Update CHANGELOG.md
  Add check errors on reading CORS rules
  Update CHANGELOG.md
  website: docs for null_resource
  dag: use hashcodes to as map key to edge sets
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  Use hc-releases
  provider/google: Added scheduling block to compute_instance
  Use vendored fastly logo
  Use releases for releases
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update vpn.tf
  Update CHANGELOG.md
  ...
2015-10-28 13:20:10 -05:00
Radek Simko 7265bdaaf0 aws: Add acceptance test for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko a618b048cf aws: Add support for aws_cloudtrail 2015-10-28 17:13:14 +00:00
Radek Simko 91f4be2261 Merge pull request #3668 from TimeIncOSS/b-aws-ecs-cluster-arn
provider/aws: Allow cluster name, not only ARN for aws_ecs_service
2015-10-28 16:28:47 +00:00
Radek Simko 0d8d6fde79 Merge pull request #2636 from TimeIncOSS/f-aws-cloudformation
provider/aws: Add aws_cloudformation_stack
2015-10-28 16:16:14 +00:00
Radek Simko 784aadd505 Allow cluster name, not only ARN for aws_ecs_service 2015-10-28 15:43:42 +00:00
Clint 5cedd64a15 Merge pull request #3387 from kjmkznr/s3-cors
provider/aws: Add CORS settings to S3 bucket
2015-10-28 10:09:44 -05:00
Joshua Semar 31767accac get profile name even if profile path exists 2015-10-27 21:30:44 -05:00
Kazunori Kojima 122790d32b Add check errors on reading CORS rules 2015-10-28 09:19:37 +09:00
Clint 3ce656b007 Merge pull request #2890 from pforman/asg-termination
Update AWS ASG termination policy code and tests
2015-10-26 16:42:53 -05:00
BSick7 e0aad68ef1 Relying on `ForceNew` for `destination_cidr_block` since it is part of the unique id instead of manually recreating the resource. 2015-10-26 13:45:21 -04:00
BSick7 e4465adca5 Removing usage of awsutil.Prettify. 2015-10-26 13:38:17 -04:00
Vincent Latombe 44e93526a1 provider/aws: ignore association not exist on route table destroy
[GH-3615]
2015-10-23 15:03:54 +02:00
Jeff Mitchell 1373a6086b Use cleanhttp for new http clients 2015-10-22 14:23:59 -04:00
Martin Atkins dd56b39e0c Codeploy deployment group app_name instead of application_name.
The corresponding resource is called aws_codeploy_app, so for consistency
we'll name the attribute app_name instead of application_name.
2015-10-21 08:34:46 -07:00
Christopher Tiwald 390f226eb5 aws: Add aws_codedeploy_deployment_group tests 2015-10-20 18:05:40 -04:00
Christopher Tiwald a546a12c2d aws: Add support for aws_codedeploy_deployment_group resources 2015-10-20 18:05:40 -04:00
Christopher Tiwald 42c077700a aws: Add acceptance tests for "aws_codedeploy_app" resources. 2015-10-20 18:05:39 -04:00
Christopher Tiwald e59fb4e6ca aws: Add support for "aws_codedeploy_app" resources. 2015-10-20 18:05:39 -04:00
clint shryock 953f38c534 lowercase everything in r53 names 2015-10-20 16:36:25 -05:00
clint shryock d798042475 provider/aws: Downcase Route 53 record names in statefile 2015-10-20 13:32:35 -05:00
Jeff Mitchell b0ceffc322 Remove usage from dependencies as well. Other dependencies need upstream merging to completely solve this. 2015-10-19 12:06:34 -04:00
BSick7 6a593f9d17 Fixing aws identifiers for aws_route.
Fixing basic acceptance test.
Adding warning to website about mixed mode.
Adding exists to aws_route.
Adding acceptance test for changing destination_cidr_block.
2015-10-19 09:16:27 -04:00
gkze ac0afad6e9 Add aws_route resource 2015-10-19 09:16:26 -04:00
clint shryock a273b9b93b provider/aws: Add configuration to copy tags to RDS Snapshots 2015-10-16 11:14:11 -05:00
Michael Austin 53e196eaed fix vet error 2015-10-15 12:55:33 -04:00
Clint 2f94e575ef Merge pull request #3300 from Runscope/fix-dynamodb-gsi-bug
provider/aws: fix bug with reading GSIs from dynamodb
2015-10-15 10:04:33 -05:00
Martin Atkins 3708e752af Merge pull request #3138 from mastor/master
Support tags for aws_db_subnet_group
2015-10-14 19:36:45 -07:00
Martin Atkins 1300f165b1 Merge pull request #3311 from caarlos0/allow-non-persistent-spot-requests
Allow non-persistent spot requests
2015-10-14 19:34:31 -07:00
Clint 6eadfcae21 Merge pull request #3500 from stack72/aws-dynamodb-table-arn
provider/aws: DynamoDB Table ARN
2015-10-14 16:25:49 -05:00
Clint Shryock 6ab339b62d unset website_endpoint, website_domain if website part is removed 2015-10-14 14:49:33 -05:00
Clint Shryock f9c577aa2a update requirement for peer test 2015-10-14 13:55:37 -05:00
Clint Shryock 4fb7ae6600 rename test so it can be ran in isolation 2015-10-14 13:55:19 -05:00
stack72 7af484c8f6 Changing the DynamoDb Create to do a Read at the end 2015-10-14 19:16:58 +01:00
Michael Austin 1ff02d9f31 Merge commit '0c2f189d083e49b49747ce323702db1861cb2cbf' into 5873-terraform-snapshot-security-v6.3 2015-10-14 13:56:27 -04:00
Michael Austin 32d04797f9 update security group after restore from snapshot 2015-10-14 13:23:11 -04:00
stack72 6d2fee9c28 After the DynamoDB table is created, the ARN wasn't being set 2015-10-14 18:06:09 +01:00
Paul Hinze 5f6c03f515 Merge pull request #3191 from hashicorp/f-asg-wait-config
provider/aws: configurable capacity waiting duration
2015-10-14 10:34:55 -05:00
Garrett Heel 9c2725e0a5 provider/aws: allow local kinesis 2015-10-13 14:29:50 -07:00
Garrett Heel 127c1aef61 provider/aws: fix bug with reading GSIs from dynamodb 2015-10-13 14:14:58 -07:00
Radek Simko 7088a0096e provider/aws: Add acceptance tests for aws_cloudformation_stack 2015-10-13 22:55:55 +02:00
Radek Simko 4dfbbe3074 provider/aws: Add implementation for aws_cloudformation_stack 2015-10-13 22:55:55 +02:00
Clint c0c81dc78f Merge pull request #3490 from hashicorp/b-aws-vpc-peering-checks
provider/aws: Additional error checking to VPC Peering conn
2015-10-13 12:55:45 -05:00
stack72 9f01efae6f Adding a test to make sure that the diffGlacierVaultTags func works as expected 2015-10-13 15:01:58 +01:00
stack72 2a7b8be9f3 Gofmt of the aws glacier vault resource 2015-10-13 14:58:29 +01:00
stack72 5266db31e2 Adding the ability to manage a glacier vault 2015-10-13 14:58:29 +01:00
Clint Shryock 60b7037cdd provider/aws: Additional error checking to VPC Peering conn 2015-10-13 06:20:46 -05:00
Paul Hinze a811a72f11 provider/aws: fix force_delete on ASGs
The `ForceDelete` parameter was getting sent to the upstream API call,
but only after we had already finished draining instances from
Terraform, so it was a moot point by then.

This fixes that by skipping the drain when force_delete is true, and it
also simplifies the field config a bit:

 * set a default of false to simplify the logic
 * remove `ForceNew` since there's no need to replace the resource to
   flip this value
 * pull a detail comment from code into the docs
2015-10-12 17:10:01 -05:00
Clint 8df9d706fb Merge pull request #3488 from hashicorp/b-aws-sgrule-migrate-test
update migration test
2015-10-12 16:34:44 -05:00
Clint a1f2b824cc Merge pull request #3470 from hashicorp/b-aws-key-pair-key-sig
provider/aws: Migrate KeyPair to version 1
2015-10-12 16:33:24 -05:00
Clint Shryock c44e9d10a4 update migration test 2015-10-12 16:26:49 -05:00
Clint Shryock 31b8f04bda provider/aws: Migrate KeyPair to version 1 2015-10-12 16:04:51 -05:00
Clint Shryock 9f3a17e9b4 update sg rule ids 2015-10-12 15:51:47 -05:00
Clint Shryock 03aac9f42b Expand on an error case with more descriptive error 2015-10-12 15:51:21 -05:00
Clint Shryock e0bb04b822 update expeded hash for migration test 2015-10-12 15:51:21 -05:00
Clint Shryock d3c5c0d85f provider/aws: Update Security Group Rules to Version 2 2015-10-12 15:51:21 -05:00
Clint Shryock 810d088279 Fix whitespace formatting with go fmt 2015-10-12 15:50:04 -05:00
Paul Hinze 61721387b3 Merge pull request #3457 from TimeIncOSS/f-aws-ec2-placement-groups
provider/aws: Add support for EC2 Placement Group
2015-10-12 14:24:12 -05:00
Clint 8152f5822e Merge pull request #3265 from stack72/aws-s3-bucket-update
provider/aws: Adding some other simple S3 Bucket Object (Optional) Inputs
2015-10-12 14:23:29 -05:00
Martin Atkins 51630aea26 Merge #3397: Tags for AWS Kinesis Streams 2015-10-12 09:38:09 -07:00
Garrett Heel 36f78cc1dc provider/aws: Allow tags for kinesis streams 2015-10-12 09:00:56 -07:00
stack72 3809cb5b88 Fixing the merge conflicts on the s3 bucket object resource after another PR had been merged 2015-10-12 16:51:27 +01:00
Martin Atkins 091d3fe206 Merge #3351: aws_autoscaling_lifecycle_hook resource 2015-10-11 22:52:00 -07:00
Jonathan Leibiusky 57c80a0d46 Add support for aws autoscaling lifecycle hooks. 2015-10-11 20:42:40 -03:00
Martin Atkins b7247026e9 Merge #3228: aws_directory_service_directory resource 2015-10-10 18:09:17 -07:00
Martin Atkins a888cd6f62 Merge pull request #3200 from zpatrick/master
Optional "content" argument for "s3_bucket_object"
2015-10-10 11:26:38 -07:00