statusDomainProcessing: Correct handling for deleted clusters.

hashicorp · Aug 24, 2024 · f48e9ae · f48e9ae
1 parent 5a49343
commit f48e9ae
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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