diff --git a/.changelog/45245.txt b/.changelog/45245.txt new file mode 100644 index 000000000000..18016bcc5cb6 --- /dev/null +++ b/.changelog/45245.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_opensearch_domain: Remove hardcoded delays before polling domain state during creation, update, and deletion operations +``` diff --git a/internal/service/opensearch/wait.go b/internal/service/opensearch/wait.go index 1c1a7a560851..3a829d5768d8 100644 --- a/internal/service/opensearch/wait.go +++ b/internal/service/opensearch/wait.go @@ -58,7 +58,7 @@ func waitForDomainCreation(ctx context.Context, conn *opensearch.Client, domainN return tfresource.RetryableError( fmt.Errorf("%q: Timeout while waiting for OpenSearch Domain to be created", domainName)) - }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) + }, tfresource.WithPollInterval(10*time.Second)) if err != nil { return fmt.Errorf("waiting for OpenSearch Domain to be created: %w", err) @@ -82,7 +82,7 @@ func waitForDomainUpdate(ctx context.Context, conn *opensearch.Client, domainNam return tfresource.RetryableError( fmt.Errorf("%q: Timeout while waiting for changes to be processed", domainName)) - }, tfresource.WithDelay(1*time.Minute), tfresource.WithPollInterval(10*time.Second)) + }, tfresource.WithPollInterval(10*time.Second)) if err != nil { return fmt.Errorf("waiting for OpenSearch Domain changes to be processed: %w", err) @@ -109,7 +109,7 @@ func waitForDomainDelete(ctx context.Context, conn *opensearch.Client, domainNam } return tfresource.RetryableError(fmt.Errorf("timeout while waiting for the OpenSearch Domain %q to be deleted", domainName)) - }, tfresource.WithDelay(10*time.Minute), tfresource.WithPollInterval(10*time.Second)) + }, tfresource.WithPollInterval(10*time.Second)) if err != nil { return fmt.Errorf("waiting for OpenSearch Domain to be deleted: %w", err)