feat: Add ExecuteQueryRetry to Admin commands for improved reliability (

pnp#3988)

Co-authored-by: Gautam Sheth <[email protected]>

src/Commands/Admin/SetHomeSite.cs

@@ -46,7 +46,7 @@ protected override void ExecuteCmdlet()
                         Tenant.RemoveTargetedSite(enumerable.First().SiteId);
                         AdminContext.ExecuteQueryRetry();
                         Tenant.AddHomeSite(HomeSiteUrl, 1, null);
-                        AdminContext.ExecuteQuery();
+                        AdminContext.ExecuteQueryRetry();
                         flag = true;
                     }
                     HomeSiteConfigurationParam configurationParam = new()

src/Commands/Admin/UnlockSensitivityLabelEncryptedFile.cs

@@ -1,22 +1,24 @@
+using Microsoft.SharePoint.Client;
 using PnP.PowerShell.Commands.Base;
 using System.Management.Automation;
 
 namespace PnP.PowerShell.Commands.Files
 {
-        [Cmdlet(VerbsCommon.Unlock, "PnPSensitivityLabelEncryptedFile")]
-        public class UnlockSensitivityLabelEncryptedFile : PnPAdminCmdlet
+    [Cmdlet(VerbsCommon.Unlock, "PnPSensitivityLabelEncryptedFile")]
+    public class UnlockSensitivityLabelEncryptedFile : PnPAdminCmdlet
+    {
+        [Parameter(Mandatory = true, Position = 0, ValueFromPipeline = true)]
+        public string Url = string.Empty;
+
+        [Parameter(Mandatory = true)]
+        public string JustificationText = string.Empty;
+        protected override void ExecuteCmdlet()
         {
-            [Parameter(Mandatory = true, Position = 0, ValueFromPipeline = true)]
-            public string Url = string.Empty;
-            [Parameter(Mandatory = true)]
-            public string JustificationText = string.Empty;
-            protected override void ExecuteCmdlet()
-            {
-                // Remove URL decoding from the Url as that will not work. We will encode the + character specifically, because if that is part of the filename, it needs to stay and not be decoded.
-                Url = Utilities.UrlUtilities.UrlDecode(Url.Replace("+", "%2B"));
+            // Remove URL decoding from the Url as that will not work. We will encode the + character specifically, because if that is part of the filename, it needs to stay and not be decoded.
+            Url = Utilities.UrlUtilities.UrlDecode(Url.Replace("+", "%2B"));
 
-                Tenant.UnlockSensitivityLabelEncryptedFile(Url, JustificationText);
-                AdminContext.ExecuteQuery();
-            }
+            Tenant.UnlockSensitivityLabelEncryptedFile(Url, JustificationText);
+            AdminContext.ExecuteQueryRetry();
+        }
     }
 }

src/Commands/InformationManagement/ResetRetentionLabel.cs

@@ -68,7 +68,7 @@ protected override void ExecuteCmdlet()
 
                         WriteVerbose($"Clearing retention label on batch {rangeIndex} of items");
                         Microsoft.SharePoint.Client.CompliancePolicy.SPPolicyStoreProxy.SetComplianceTagOnBulkItems(ClientContext, range, rootUrl + list.RootFolder.ServerRelativeUrl, string.Empty);
-                        ClientContext.ExecuteQuery();
+                        ClientContext.ExecuteQueryRetry();
 
                         ItemIds.RemoveRange(0, itemsToProcess);
                     }

src/Commands/InformationManagement/SetRetentionLabel.cs

@@ -71,8 +71,7 @@ protected override void ExecuteCmdlet()
                     if (ParameterSetName == ParamSet_BulkItems) 
                     {
                         PnPContext.Web.LoadAsync(i => i.Url);
-                        list.LoadAsync(i => i.RootFolder);
-
+                        list.LoadAsync(i => i.RootFolder);                        
 
                         var rootUrl = PnPContext.Web.Url.GetLeftPart(UriPartial.Authority);
 
@@ -87,7 +86,7 @@ protected override void ExecuteCmdlet()
 
                             WriteVerbose($"Setting retention label to batch {rangeIndex} of items");
                             Microsoft.SharePoint.Client.CompliancePolicy.SPPolicyStoreProxy.SetComplianceTagOnBulkItems(ClientContext, range, rootUrl + list.RootFolder.ServerRelativeUrl, Label);
-                            ClientContext.ExecuteQuery();
+                            ClientContext.ExecuteQueryRetry();
                             ItemIds.RemoveRange(0, itemsToProcess);
                         }
                     }