From 71de23e0cffb1e8cafc99f11c4660ad188466bbc Mon Sep 17 00:00:00 2001
From: Vidyadhari Jami <vijami@microsoft.com>
Date: Fri, 9 Apr 2021 17:05:04 +0530
Subject: [PATCH] Fix for Resource Tagging to clear off tags

---
 ...veryServicesAsrReplicationProtectedItem.cs | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs
index ec2fd3ef285b..89ec43ab73dd 100644
--- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs
+++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/SetAzureRmRecoveryServicesAsrReplicationProtectedItem.cs
@@ -145,21 +145,21 @@ public class SetAzureRmRecoveryServicesAsrReplicationProtectedItem : SiteRecover
         /// Gets or sets target VM tags.
         /// </summary>
         [Parameter]
-        [ValidateNotNullOrEmpty]
+        [ValidateNotNull]
         public IDictionary<string, string> RecoveryVmTag { get; set; }
 
         /// <summary>
         /// Gets or sets the tags for the disks.
         /// </summary>
         [Parameter]
-        [ValidateNotNullOrEmpty]
+        [ValidateNotNull]
         public IDictionary<string, string> DiskTag { get; set; }
 
         /// <summary>
         /// Gets or sets the tags for the target NICs.
         /// </summary>
         [Parameter]
-        [ValidateNotNullOrEmpty]
+        [ValidateNotNull]
         public IDictionary<string, string> RecoveryNicTag { get; set; }
 
         // <summary>
@@ -458,20 +458,17 @@ public override void ExecuteSiteRecoveryCmdlet()
                             ToDictionary(x => x.DiskId, x => x.DiskEncryptionSetId);
                     }
 
-                    if (this.RecoveryVmTag == null ||
-                      this.RecoveryVmTag.Count == 0)
+                    if (this.RecoveryVmTag == null)
                     {
                         recoveryVmTag = providerSpecificDetails.TargetVmTags;
                     }
 
-                    if (this.RecoveryNicTag == null ||
-                       this.RecoveryNicTag.Count == 0)
+                    if (this.RecoveryNicTag == null)
                     {
                         recoveryNicTag = providerSpecificDetails.TargetNicTags;
                     }
 
-                    if (this.DiskTag == null ||
-                      this.DiskTag.Count == 0)
+                    if (this.DiskTag == null)
                     {
                         diskTag = providerSpecificDetails.TargetManagedDiskTags;
                     }
@@ -572,20 +569,17 @@ public override void ExecuteSiteRecoveryCmdlet()
                         primaryNic = providerSpecificDetails.SelectedSourceNicId;
                     }
 
-                    if (this.RecoveryVmTag == null ||
-                     this.RecoveryVmTag.Count == 0)
+                    if (this.RecoveryVmTag == null)
                     {
                         recoveryVmTag = providerSpecificDetails.TargetVmTags;
                     }
 
-                    if (this.RecoveryNicTag == null ||
-                       this.RecoveryNicTag.Count == 0)
+                    if (this.RecoveryNicTag == null)
                     {
                         recoveryNicTag = providerSpecificDetails.TargetNicTags;
                     }
 
-                    if (this.DiskTag == null ||
-                      this.DiskTag.Count == 0)
+                    if (this.DiskTag == null)
                     {
                         diskTag = providerSpecificDetails.TargetManagedDiskTags;
                     }