From f48e9ae65024d8390b7c8683cbe9a72fdf308d79 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Sat, 24 Aug 2024 16:31:06 -0400 Subject: [PATCH] statusDomainProcessing: Correct handling for deleted clusters. --- internal/service/elasticsearch/domain.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/internal/service/elasticsearch/domain.go b/internal/service/elasticsearch/domain.go index efd9aba7b4c0..8c32a55fe5ab 100644 --- a/internal/service/elasticsearch/domain.go +++ b/internal/service/elasticsearch/domain.go @@ -1083,7 +1083,11 @@ func findDomainUpgradeStatus(ctx context.Context, conn *elasticsearch.Client, in func statusDomainProcessing(ctx context.Context, conn *elasticsearch.Client, name string) retry.StateRefreshFunc { return func() (interface{}, string, error) { - output, err := findDomainByName(ctx, conn, name) + // Don't call findDomainByName here as the domain's Deleted flag will be set while DomainProcessingStatus is "Deleting". + input := &elasticsearch.DescribeElasticsearchDomainInput{ + DomainName: aws.String(name), + } + output, err := findDomain(ctx, conn, input) if tfresource.NotFound(err) { return nil, "", nil