From 47a252cde23b24e3ed8516024e7aaa2f77de5f7d Mon Sep 17 00:00:00 2001 From: Alena Varkockova Date: Wed, 26 Apr 2023 15:41:22 +0200 Subject: [PATCH 1/2] Fix inconsistent read after create for vpc_route_table --- internal/service/ec2/vpc_route_table.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/service/ec2/vpc_route_table.go b/internal/service/ec2/vpc_route_table.go index e50a3ae2216a..1787277730bd 100644 --- a/internal/service/ec2/vpc_route_table.go +++ b/internal/service/ec2/vpc_route_table.go @@ -206,8 +206,9 @@ func resourceRouteTableCreate(ctx context.Context, d *schema.ResourceData, meta func resourceRouteTableRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Conn(ctx) - - routeTable, err := FindRouteTableByID(ctx, conn, d.Id()) + outputRaw, err := tfresource.RetryWhenNewResourceNotFound(ctx, RouteTableAssociationPropagationTimeout, func() (interface{}, error) { + return FindRouteTableByID(ctx, conn, d.Id()) + }, d.IsNewResource()) if !d.IsNewResource() && tfresource.NotFound(err) { log.Printf("[WARN] Route Table (%s) not found, removing from state", d.Id()) @@ -219,6 +220,7 @@ func resourceRouteTableRead(ctx context.Context, d *schema.ResourceData, meta in return sdkdiag.AppendErrorf(diags, "reading Route Table (%s): %s", d.Id(), err) } + routeTable := outputRaw.(*ec2.RouteTable) ownerID := aws.StringValue(routeTable.OwnerId) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition, From 0ca5545afc76d277bcded7d17a81b231f161a24c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Fri, 16 Jun 2023 10:19:34 -0400 Subject: [PATCH 2/2] Add CHANGELOG entry. --- .changelog/30999.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/30999.txt diff --git a/.changelog/30999.txt b/.changelog/30999.txt new file mode 100644 index 000000000000..33a724669548 --- /dev/null +++ b/.changelog/30999.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_route_table: Fix `reading Route Table (rtb-abcd1234): couldn't find resource` errors when reading new resource +``` \ No newline at end of file