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

provider/aws: Add AWS error message to retry APIGateway acc update on (#8533)

This commit is contained in:
Radek Simko 2016-08-29 20:02:15 +01:00 committed by Paul Stack
parent 52eeaa0b72
commit 8317fe73d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/providers/aws/resource_aws_api_gateway_account.go
View File

@ -6,7 +6,6 @@ import (
"time" "time"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/apigateway" "github.com/aws/aws-sdk-go/service/apigateway"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
@ -95,15 +94,16 @@ func resourceAwsApiGatewayAccountUpdate(d *schema.ResourceData, meta interface{}
// Retry due to eventual consistency of IAM // Retry due to eventual consistency of IAM
expectedErrMsg := "The role ARN does not have required permissions set to API Gateway" expectedErrMsg := "The role ARN does not have required permissions set to API Gateway"
otherErrMsg := "API Gateway could not successfully write to CloudWatch Logs using the ARN specified"
var out *apigateway.Account var out *apigateway.Account
var err error var err error
err = resource.Retry(2*time.Minute, func() *resource.RetryError { err = resource.Retry(2*time.Minute, func() *resource.RetryError {
out, err = conn.UpdateAccount(&input) out, err = conn.UpdateAccount(&input)
if err != nil { if err != nil {
if awsErr, ok := err.(awserr.Error); ok && awsErr.Code() == "BadRequestException" && if isAWSErr(err, "BadRequestException", expectedErrMsg) ||
awsErr.Message() == expectedErrMsg { isAWSErr(err, "BadRequestException", otherErrMsg) {
log.Printf("[DEBUG] Retrying API Gateway Account update: %s", awsErr) log.Printf("[DEBUG] Retrying API Gateway Account update: %s", err)
return resource.RetryableError(err) return resource.RetryableError(err)
} }
return resource.NonRetryableError(err) return resource.NonRetryableError(err)