Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aws_egress_only_internet_gateway: Adjust eventualy consistent logic #6190

Merged
merged 2 commits into from
Oct 30, 2018
Merged

aws_egress_only_internet_gateway: Adjust eventualy consistent logic #6190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb3d136
Adjust egress only internet gateway eventual consistency login.
gseyetik Oct 17, 2018
d48f167
Expand error message and use aws util for string compare.
gseyetik Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 22 additions & 50 deletions aws/resource_aws_egress_only_internet_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
Expand Down Expand Up @@ -40,69 +39,42 @@ func resourceAwsEgressOnlyInternetGatewayCreate(d *schema.ResourceData, meta int

d.SetId(*resp.EgressOnlyInternetGateway.EgressOnlyInternetGatewayId)

err = resource.Retry(5*time.Minute, func() *resource.RetryError {
igRaw, _, err := EIGWStateRefreshFunc(conn, d.Id())()
if igRaw != nil {
return nil
}
if err == nil {
return resource.RetryableError(err)
} else {
return resource.NonRetryableError(err)
}
})

if err != nil {
return fmt.Errorf("%s", err)
}

return resourceAwsEgressOnlyInternetGatewayRead(d, meta)
}

func EIGWStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
resp, err := conn.DescribeEgressOnlyInternetGateways(&ec2.DescribeEgressOnlyInternetGatewaysInput{
EgressOnlyInternetGatewayIds: []*string{aws.String(id)},
})
if err != nil {
ec2err, ok := err.(awserr.Error)
if ok && ec2err.Code() == "InvalidEgressInternetGatewayID.NotFound" {
resp = nil
} else {
log.Printf("[ERROR] Error on EIGWStateRefreshFunc: %s", err)
return nil, "", err
}
}
if len(resp.EgressOnlyInternetGateways) < 1 {
resp = nil
}

if resp == nil {
// Sometimes AWS just has consistency issues and doesn't see
// our instance yet. Return an empty state.
return nil, "", nil
}

ig := resp.EgressOnlyInternetGateways[0]
return ig, "available", nil
}
}

func resourceAwsEgressOnlyInternetGatewayRead(d *schema.ResourceData, meta interface{}) error {
conn := meta.(*AWSClient).ec2conn

resp, err := conn.DescribeEgressOnlyInternetGateways(&ec2.DescribeEgressOnlyInternetGatewaysInput{
var found bool
var req = &ec2.DescribeEgressOnlyInternetGatewaysInput{
EgressOnlyInternetGatewayIds: []*string{aws.String(d.Id())},
})
if err != nil {
return fmt.Errorf("Error describing egress internet gateway: %s", err)
}

found := false
for _, igw := range resp.EgressOnlyInternetGateways {
if *igw.EgressOnlyInternetGatewayId == d.Id() {
found = true
err := resource.Retry(1*time.Minute, func() *resource.RetryError {
resp, err := conn.DescribeEgressOnlyInternetGateways(req)
if err != nil {
return resource.NonRetryableError(err)
}
if resp != nil && len(resp.EgressOnlyInternetGateways) > 0 {
for _, igw := range resp.EgressOnlyInternetGateways {
if aws.StringValue(igw.EgressOnlyInternetGatewayId) == d.Id() {
found = true
break
}
}
}
if d.IsNewResource() && !found {
return resource.RetryableError(fmt.Errorf("Egress Only Internet Gateway (%s) not found.", d.Id()))
}
return nil
})

if err != nil {
return fmt.Errorf("Error describing egress internet gateway: %s", err)
}

if !found {
Expand Down