azurerm_eventhub_namespace - adding wait before deletion (#19165)

hashicorp · Jan 9, 2023 · 9d7fa92 · 9d7fa92
1 parent 56131de
commit 9d7fa92
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/internal/services/eventhub/eventhub_namespace_resource.go b/internal/services/eventhub/eventhub_namespace_resource.go
@@ -622,6 +622,11 @@ func resourceEventHubNamespaceDelete(d *pluginsdk.ResourceData, meta interface{}
 		return err
 	}
 
+	// need to wait for namespace status to be ready before deleting.
+	if err := waitForEventHubNamespaceStatusToBeReady(ctx, meta, *id, d.Timeout(pluginsdk.TimeoutUpdate)); err != nil {
+		return fmt.Errorf("waiting for eventHub namespace %s state to be ready error: %+v", *id, err)
+	}
+
 	future, err := client.Delete(ctx, *id)
 	if err != nil {
 		if response.WasNotFound(future.HttpResponse) {
@@ -633,6 +638,27 @@ func resourceEventHubNamespaceDelete(d *pluginsdk.ResourceData, meta interface{}
 	return waitForEventHubNamespaceToBeDeleted(ctx, client, *id)
 }
 
+func waitForEventHubNamespaceStatusToBeReady(ctx context.Context, meta interface{}, id namespaces.NamespaceId, timeout time.Duration) error {
+	namespaceClient := meta.(*clients.Client).Eventhub.NamespacesClient
+	stateConf := &pluginsdk.StateChangeConf{
+		Pending: []string{
+			string(namespaces.EndPointProvisioningStateUpdating),
+			string(namespaces.EndPointProvisioningStateCreating),
+			string(namespaces.EndPointProvisioningStateDeleting),
+		},
+		Target:                    []string{string(namespaces.EndPointProvisioningStateSucceeded)},
+		Refresh:                   eventHubNamespaceProvisioningStateRefreshFunc(ctx, namespaceClient, id),
+		Timeout:                   timeout,
+		PollInterval:              10 * time.Second,
+		ContinuousTargetOccurence: 5,
+	}
+
+	if _, err := stateConf.WaitForStateContext(ctx); err != nil {
+		return err
+	}
+	return nil
+}
+
 func waitForEventHubNamespaceToBeDeleted(ctx context.Context, client *namespaces.NamespacesClient, id namespaces.NamespaceId) error {
 	deadline, ok := ctx.Deadline()
 	if !ok {