update per comment

Author: ziyeqf

internal/services/dataprotection/custompollers/data_protection_backup_instance_poller.go

@@ -6,6 +6,7 @@ package custompollers
 import (
 	"context"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/hashicorp/go-azure-helpers/lang/pointer"
@@ -16,16 +17,18 @@ import (
 var _ pollers.PollerType = &dataProtectionBackupInstancePoller{}
 
 type dataProtectionBackupInstancePoller struct {
-	client      *backupinstanceresources.BackupInstanceResourcesClient
-	id          backupinstanceresources.BackupInstanceId
-	targetState backupinstanceresources.CurrentProtectionState
+	client        *backupinstanceresources.BackupInstanceResourcesClient
+	id            backupinstanceresources.BackupInstanceId
+	pendingStates []backupinstanceresources.CurrentProtectionState
+	targetState   backupinstanceresources.CurrentProtectionState
 }
 
-func NewDataProtectionBackupInstancePoller(client *backupinstanceresources.BackupInstanceResourcesClient, id backupinstanceresources.BackupInstanceId, targetState backupinstanceresources.CurrentProtectionState) *dataProtectionBackupInstancePoller {
+func NewDataProtectionBackupInstancePoller(client *backupinstanceresources.BackupInstanceResourcesClient, id backupinstanceresources.BackupInstanceId, targetState backupinstanceresources.CurrentProtectionState, pendingStates []backupinstanceresources.CurrentProtectionState) *dataProtectionBackupInstancePoller {
 	return &dataProtectionBackupInstancePoller{
-		client:      client,
-		id:          id,
-		targetState: targetState,
+		client:        client,
+		id:            id,
+		pendingStates: pendingStates,
+		targetState:   targetState,
 	}
 }
 
@@ -51,8 +54,12 @@ func (p dataProtectionBackupInstancePoller) Poll(ctx context.Context) (*pollers.
 		}, nil
 	}
 
-	return &pollers.PollResult{
-		PollInterval: 1 * time.Minute,
-		Status:       pollers.PollingStatusInProgress,
-	}, nil
+	if slices.Contains(p.pendingStates, currentState) {
+		return &pollers.PollResult{
+			PollInterval: 1 * time.Minute,
+			Status:       pollers.PollingStatusInProgress,
+		}, nil
+	}
+
+	return nil, fmt.Errorf("waiting for %s to reach state `%s` but got unexpected state `%s`", p.id, string(p.targetState), string(currentState))
 }

internal/services/dataprotection/data_protection_backup_instance_data_lake_storage_resource.go

@@ -166,7 +166,9 @@ func (r DataProtectionBackupInstanceDataLakeStorageResource) Create() sdk.Resour
 				return fmt.Errorf("creating %s: %+v", id, err)
 			}
 
-			pollerType := custompollers.NewDataProtectionBackupInstancePoller(client, id, backupinstanceresources.CurrentProtectionStateProtectionConfigured)
+			pollerType := custompollers.NewDataProtectionBackupInstancePoller(client, id, backupinstanceresources.CurrentProtectionStateProtectionConfigured, []backupinstanceresources.CurrentProtectionState{
+				backupinstanceresources.CurrentProtectionStateConfiguringProtection,
+			})
 			poller := pollers.NewPoller(pollerType, 1*time.Minute, pollers.DefaultNumberOfDroppedConnectionsToAllow)
 			if err := poller.PollUntilDone(ctx); err != nil {
 				return fmt.Errorf("waiting for %s to become available: %+v", id, err)
@@ -296,7 +298,9 @@ func (r DataProtectionBackupInstanceDataLakeStorageResource) Update() sdk.Resour
 				return fmt.Errorf("updating %s: %+v", id, err)
 			}
 
-			pollerType := custompollers.NewDataProtectionBackupInstancePoller(client, *id, backupinstanceresources.CurrentProtectionStateProtectionConfigured)
+			pollerType := custompollers.NewDataProtectionBackupInstancePoller(client, *id, backupinstanceresources.CurrentProtectionStateProtectionConfigured, []backupinstanceresources.CurrentProtectionState{
+				backupinstanceresources.CurrentProtectionStateUpdatingProtection,
+			})
 			poller := pollers.NewPoller(pollerType, 1*time.Minute, pollers.DefaultNumberOfDroppedConnectionsToAllow)
 			if err := poller.PollUntilDone(ctx); err != nil {
 				return fmt.Errorf("waiting for %s to become available: %+v", id, err)