Merge pull request #3030 from KoenZomers/AdminContextRegression

Fixing PnPAdminCmdlet regressions

Author: gautamdsheth

CHANGELOG.md

@@ -20,7 +20,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fixed issue with `Grant-PnPAzureADAppSitePermission` cmdlet where users are not able to set selected site in the `Sites.Selected` permission. [#2983](https://github.com/pnp/powershell/pull/2983)
 - Fixed issue with `Get-PnPList` cmdlet not working with site-relative URL as identity. [#3005](https://github.com/pnp/powershell/pull/3005)
 - Fixed issue with `Add-PnPNavigationNode` cmdlet where the target audience would not correctly be set when creating a node as a child of a parent node [#2940](https://github.com/pnp/powershell/pull/2940)
-- Fixed issue where `Add-PnPSiteCollectionAdmin -PrimarySiteCollectionAdmin <user>` would require owners to be specified as well
+- Fixed regressions within the following cmdlets `Get-PnPTenantCdnEnabled`, `Get-PnPTenantCdnOrigin`, `Get-PnPTenantCdnPolicies`, `Get-PnPTenantDeletedSite`, `Get-PnPTenantInstance` [#3030](https://github.com/pnp/powershell/pull/3030)
+- Fixed issue where `Add-PnPSiteCollectionAdmin -PrimarySiteCollectionAdmin <user>` would require owners to be specified as well. [#3035](https://github.com/pnp/powershell/pull/3035)
 
 ### Contributors
 

src/Commands/Admin/GetTenantAppCatalogUrl.cs

@@ -1,7 +1,6 @@
 using System.Management.Automation;
 using Microsoft.SharePoint.Client;
 
-
 namespace PnP.PowerShell.Commands
 {
     [Cmdlet(VerbsCommon.Get, "PnPTenantAppCatalogUrl")]

src/Commands/Admin/GetTenantCdnEnabled.cs

@@ -1,6 +1,5 @@
 using Microsoft.Online.SharePoint.TenantAdministration;
 using Microsoft.SharePoint.Client;
-
 using PnP.PowerShell.Commands.Base;
 using System.Management.Automation;
 
@@ -15,7 +14,7 @@ public class GetTenantCdnEnabled : PnPAdminCmdlet
         protected override void ExecuteCmdlet()
         {
             var result = Tenant.GetTenantCdnEnabled(CdnType);
-            ClientContext.ExecuteQueryRetry();
+            AdminContext.ExecuteQueryRetry();
             WriteObject(result);
         }
     }

src/Commands/Admin/GetTenantCdnOrigin.cs

@@ -1,6 +1,5 @@
 using Microsoft.Online.SharePoint.TenantAdministration;
 using Microsoft.SharePoint.Client;
-
 using PnP.PowerShell.Commands.Base;
 using System.Management.Automation;
 
@@ -15,7 +14,7 @@ public class GetTenantCdnOrigin : PnPAdminCmdlet
         protected override void ExecuteCmdlet()
         {
             var origins = Tenant.GetTenantCdnOrigins(CdnType);
-            ClientContext.ExecuteQueryRetry();
+            AdminContext.ExecuteQueryRetry();
             WriteObject(origins, true);
         }
     }

src/Commands/Admin/GetTenantCdnPolicies.cs

@@ -1,12 +1,8 @@
 using Microsoft.Online.SharePoint.TenantAdministration;
 using Microsoft.SharePoint.Client;
-
 using PnP.PowerShell.Commands.Base;
 using System.Management.Automation;
-using PnP.Framework.Sites;
-using PnP.PowerShell.Commands.Base.PipeBinds;
 using System;
-using PnP.PowerShell.Commands.Enums;
 using System.Collections.Generic;
 
 namespace PnP.PowerShell.Commands.Admin
@@ -20,7 +16,7 @@ public class GetTenantCdnPolicies : PnPAdminCmdlet
         protected override void ExecuteCmdlet()
         {
             var result = Tenant.GetTenantCdnPolicies(CdnType);
-            ClientContext.ExecuteQueryRetry();
+            AdminContext.ExecuteQueryRetry();
 
             WriteObject(Parse(result),true);
         }

src/Commands/Admin/GetTenantDeletedSite.cs

@@ -62,11 +62,11 @@ protected override void ExecuteCmdlet()
             else
             {
                 DeletedSiteProperties deletedSitePropertiesByUrl = Tenant.GetDeletedSitePropertiesByUrl(Identity.Url);
-                ClientContext.Load(deletedSitePropertiesByUrl);
+                AdminContext.Load(deletedSitePropertiesByUrl);
 
                 try
                 {
-                    ClientContext.ExecuteQueryRetry();
+                    AdminContext.ExecuteQueryRetry();
                     WriteObject(new Model.SPODeletedSite(deletedSitePropertiesByUrl));
                 }
                 catch (Microsoft.SharePoint.Client.ServerException e) when (e.ServerErrorTypeName.Equals("Microsoft.SharePoint.Client.UnknownError", StringComparison.InvariantCultureIgnoreCase))
@@ -90,9 +90,9 @@ private bool RequestDeletedSitePropertiesFromSharePoint(Func<string, SPODeletedS
                     {
                         throw new ArgumentNullException("Something went wrong fetching deleted sites");
                     }
-                    ClientContext.Load(spoDeletedSitePropertiesEnumerable);
-                    ClientContext.Load(spoDeletedSitePropertiesEnumerable, (SPODeletedSitePropertiesEnumerable sp) => sp.NextStartIndexFromSharePoint);
-                    ClientContext.ExecuteQueryRetry();
+                    AdminContext.Load(spoDeletedSitePropertiesEnumerable);
+                    AdminContext.Load(spoDeletedSitePropertiesEnumerable, (SPODeletedSitePropertiesEnumerable sp) => sp.NextStartIndexFromSharePoint);
+                    AdminContext.ExecuteQueryRetry();
                     if (siteRowLimit == 0 || spoDeletedSitePropertiesEnumerable.Count <= siteRowLimit)
                     {
                         deletedSitePropertiesList.AddRange(spoDeletedSitePropertiesEnumerable);
@@ -134,9 +134,9 @@ private bool RequestDeletedSiteProperties(Func<int, SPODeletedSitePropertiesEnum
             while (num >= 0 && flag2)
             {
                 SPODeletedSitePropertiesEnumerable spoDeletedSitePropertiesEnumerable = getDeletedSitePropertiesFunc(num);
-                ClientContext.Load(spoDeletedSitePropertiesEnumerable);
-                ClientContext.Load(spoDeletedSitePropertiesEnumerable, (SPODeletedSitePropertiesEnumerable sp) => sp.NextStartIndex);
-                ClientContext.ExecuteQueryRetry();
+                AdminContext.Load(spoDeletedSitePropertiesEnumerable);
+                AdminContext.Load(spoDeletedSitePropertiesEnumerable, (SPODeletedSitePropertiesEnumerable sp) => sp.NextStartIndex);
+                AdminContext.ExecuteQueryRetry();
                 if (spoDeletedSitePropertiesEnumerable == null)
                 {
                     throw new ArgumentNullException("Something went wrong fetching deleted sites");

src/Commands/Admin/GetTenantInstance.cs

@@ -1,7 +1,5 @@
 using Microsoft.SharePoint.Client;
-
 using PnP.PowerShell.Commands.Base;
-using PnP.PowerShell.Commands.Base.PipeBinds;
 using System.Linq;
 using System.Management.Automation;
 
@@ -13,8 +11,8 @@ public class GetTenantInstance : PnPAdminCmdlet
         protected override void ExecuteCmdlet()
         {
            var instances = Tenant.GetTenantInstances();
-           ClientContext.Load(instances);
-           ClientContext.ExecuteQueryRetry();
+           AdminContext.Load(instances);
+           AdminContext.ExecuteQueryRetry();
            WriteObject(instances.Select(i => Model.TenantInstance.Convert(i)));
         }
     }