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

resource/aws_main_route_table_association: Prevent crash on creation when VPC main route table association is not found #16680

Merged
merged 1 commit into from
Dec 16, 2020
Merged

resource/aws_main_route_table_association: Prevent crash on creation when VPC main route table association is not found #16680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion aws/resource_aws_main_route_table_association.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,13 @@ func resourceAwsMainRouteTableAssociationCreate(d *schema.ResourceData, meta int
log.Printf("[INFO] Creating main route table association: %s => %s", vpcId, routeTableId)

mainAssociation, err := findMainRouteTableAssociation(conn, vpcId)

if err != nil {
return err
return fmt.Errorf("error finding EC2 VPC (%s) main route table association for replacement: %w", vpcId, err)
}

if mainAssociation == nil {
return fmt.Errorf("error finding EC2 VPC (%s) main route table association for replacement: association not found", vpcId)
}

resp, err := conn.ReplaceRouteTableAssociation(&ec2.ReplaceRouteTableAssociationInput{
Expand Down