ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/terraform

This commit is contained in:
stack72 2016-07-18 13:34:17 +01:00
parent 1c07582990 8b11bc0581
commit a04e336ef9
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -170,6 +170,7 @@ BUG FIXES:
* provider/aws: Fix issue reattaching a VPN gateway to a VPC [GH-6987] * provider/aws: Fix issue reattaching a VPN gateway to a VPC [GH-6987]
* provider/aws: Fix issue with Root Block Devices and encrypted flag in Launch Configurations [GH-6512] * provider/aws: Fix issue with Root Block Devices and encrypted flag in Launch Configurations [GH-6512]
* provider/aws: If more ENIs are attached to `aws_instance`, the one w/ DeviceIndex `0` is always used in context of `aws_instance` (previously unpredictable) [GH-6761] * provider/aws: If more ENIs are attached to `aws_instance`, the one w/ DeviceIndex `0` is always used in context of `aws_instance` (previously unpredictable) [GH-6761]
* provider/aws: Increased lambda event mapping creation timeout [GH-7657]
* provider/aws: Handle spurious failures in resourceAwsSecurityGroupRuleRead [GH-7377] * provider/aws: Handle spurious failures in resourceAwsSecurityGroupRuleRead [GH-7377]
* provider/aws: Make 'stage_name' required in api_gateway_deployment [GH-6797] * provider/aws: Make 'stage_name' required in api_gateway_deployment [GH-6797]
* provider/aws: Mark Lambda function as gone when it's gone [GH-6924] * provider/aws: Mark Lambda function as gone when it's gone [GH-6924]

4
builtin/providers/aws/resource_aws_lambda_event_source_mapping.go
View File

@ -98,7 +98,7 @@ func resourceAwsLambdaEventSourceMappingCreate(d *schema.ResourceData, meta inte
// //
// The role may exist, but the permissions may not have propagated, so we // The role may exist, but the permissions may not have propagated, so we
// retry // retry
err := resource.Retry(1*time.Minute, func() *resource.RetryError { err := resource.Retry(5*time.Minute, func() *resource.RetryError {
eventSourceMappingConfiguration, err := conn.CreateEventSourceMapping(params) eventSourceMappingConfiguration, err := conn.CreateEventSourceMapping(params)
if err != nil { if err != nil {
if awserr, ok := err.(awserr.Error); ok { if awserr, ok := err.(awserr.Error); ok {
@ -184,7 +184,7 @@ func resourceAwsLambdaEventSourceMappingUpdate(d *schema.ResourceData, meta inte
Enabled: aws.Bool(d.Get("enabled").(bool)), Enabled: aws.Bool(d.Get("enabled").(bool)),
} }
err := resource.Retry(1*time.Minute, func() *resource.RetryError { err := resource.Retry(5*time.Minute, func() *resource.RetryError {
_, err := conn.UpdateEventSourceMapping(params) _, err := conn.UpdateEventSourceMapping(params)
if err != nil { if err != nil {
if awserr, ok := err.(awserr.Error); ok { if awserr, ok := err.(awserr.Error); ok {