azurerm_eventhub_namespace_disaster_recovery_config: fixing breakin…

…g pair logic (#19030)
hashicorp · Oct 31, 2022 · d8181e5 · d8181e5
1 parent 495507f
commit d8181e5
Showing 1 changed file with 39 additions and 8 deletions.
diff --git a/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go b/internal/services/eventhub/eventhub_namespace_disaster_recovery_config_resource.go
@@ -123,15 +123,30 @@ func resourceEventHubNamespaceDisasterRecoveryConfigUpdate(d *pluginsdk.Resource
 	locks.ByName(id.NamespaceName, eventHubNamespaceResourceName)
 	defer locks.UnlockByName(id.NamespaceName, eventHubNamespaceResourceName)
 
-	if d.HasChange("partner_namespace_id") {
+	pairingStatus, err := client.Get(ctx, *id)
+	if err != nil {
+		return fmt.Errorf("checking the status of eventhub disaster recovery error: %+v", err)
+	}
+
+	// need to check if DCR needs pair-breaking first
+	breakPairFirst := false
+	if model := pairingStatus.Model; model != nil {
+		if model.Properties != nil {
+			if model.Properties.PartnerNamespace != nil && *model.Properties.PartnerNamespace != "" {
+				breakPairFirst = true
+			}
+		}
+	}
+
+	if d.HasChange("partner_namespace_id") && breakPairFirst {
 		// break pairing
 		if _, err := client.BreakPairing(ctx, *id); err != nil {
 			return fmt.Errorf("breaking the pairing for %s: %+v", *id, err)
 		}
+	}
 
-		if err := resourceEventHubNamespaceDisasterRecoveryConfigWaitForState(ctx, client, *id); err != nil {
-			return fmt.Errorf("waiting for the pairing to be broken for %s: %+v", *id, err)
-		}
+	if err := resourceEventHubNamespaceDisasterRecoveryConfigWaitForState(ctx, client, *id); err != nil {
+		return fmt.Errorf("waiting for the pairing to be broken for %s: %+v", *id, err)
 	}
 
 	parameters := disasterrecoveryconfigs.ArmDisasterRecovery{
@@ -194,12 +209,28 @@ func resourceEventHubNamespaceDisasterRecoveryConfigDelete(d *pluginsdk.Resource
 	locks.ByName(id.NamespaceName, eventHubNamespaceResourceName)
 	defer locks.UnlockByName(id.NamespaceName, eventHubNamespaceResourceName)
 
-	if _, err := client.BreakPairing(ctx, *id); err != nil {
-		return fmt.Errorf("breaking pairing of %s: %+v", *id, err)
+	pairingStatus, err := client.Get(ctx, *id)
+	if err != nil {
+		return fmt.Errorf("checking the status of eventhub disaster recovery error: %+v", err)
 	}
 
-	if err := resourceEventHubNamespaceDisasterRecoveryConfigWaitForState(ctx, client, *id); err != nil {
-		return fmt.Errorf("waiting for pairing to break for %s: %+v", *id, err)
+	// need to check if DCR needs pair-breaking first
+	breakPairFirst := false
+	if model := pairingStatus.Model; model != nil {
+		if model.Properties != nil {
+			if model.Properties.PartnerNamespace != nil && *model.Properties.PartnerNamespace != "" {
+				breakPairFirst = true
+			}
+		}
+	}
+
+	if breakPairFirst {
+		if _, err := client.BreakPairing(ctx, *id); err != nil {
+			return fmt.Errorf("breaking pairing of %s: %+v", *id, err)
+		}
+		if err := resourceEventHubNamespaceDisasterRecoveryConfigWaitForState(ctx, client, *id); err != nil {
+			return fmt.Errorf("waiting for pairing to break for %s: %+v", *id, err)
+		}
 	}
 
 	if _, err := client.Delete(ctx, *id); err != nil {