Merge branch 'master' of github.com:hashicorp/terraform
This commit is contained in:
commit
a04e336ef9
|
@ -170,6 +170,7 @@ BUG FIXES:
|
|||
* 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: 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: Make 'stage_name' required in api_gateway_deployment [GH-6797]
|
||||
* provider/aws: Mark Lambda function as gone when it's gone [GH-6924]
|
||||
|
|
|
@ -98,7 +98,7 @@ func resourceAwsLambdaEventSourceMappingCreate(d *schema.ResourceData, meta inte
|
|||
//
|
||||
// The role may exist, but the permissions may not have propagated, so we
|
||||
// retry
|
||||
err := resource.Retry(1*time.Minute, func() *resource.RetryError {
|
||||
err := resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||
eventSourceMappingConfiguration, err := conn.CreateEventSourceMapping(params)
|
||||
if err != nil {
|
||||
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)),
|
||||
}
|
||||
|
||||
err := resource.Retry(1*time.Minute, func() *resource.RetryError {
|
||||
err := resource.Retry(5*time.Minute, func() *resource.RetryError {
|
||||
_, err := conn.UpdateEventSourceMapping(params)
|
||||
if err != nil {
|
||||
if awserr, ok := err.(awserr.Error); ok {
|
||||
|
|
Loading…
Reference in New Issue