Continued NextPageLink when listing key vaults from ARM API (#17235)

* Continued NextPageLink when listing key vaults from ARM API

* fix

* Fix version for DnsResolver and add mapping for new modules (#17232)

* fix dnsresolver version

* add mapping for new modules

* remove regex for quota/dnsresolver in mapping rule

Co-authored-by: Yabo Hu <[email protected]>

Author: BethanyZhou

src/Accounts/Accounts/ChangeLog.md

@@ -19,6 +19,7 @@
 -->
 
 ## Upcoming Release
+* Fixed NextPageLink deserialization issue for ResourceManager
 * Fixed the issue that authorization does not work in Dogfood environment
 * Enabled Continue Access Evaluation for MSGraph
 * Improved error message when login is blocked by AAD

src/DnsResolver/Az.DnsResolver.psd1

@@ -12,7 +12,7 @@
 RootModule = './Az.DnsResolver.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.1.6'
+ModuleVersion = '0.1.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'

src/KeyVault/KeyVault/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Continued NextPageLink when listing key vaults from ARM API
 * `New-AzKeyVaultManagedHsm`: supported specifying how long a deleted managed hsm is retained by `SoftDeleteRetentionInDays` and enabling purge protection by `EnablePurgeProtection`
 * `Update-AzKeyVaultManagedHsm`: supported enabling purge protection by `EnablePurgeProtection`
 * `Get-AzKeyVaultManagedHsm`: Supported getting or listing deleted managed HSM(s)

src/KeyVault/KeyVault/Commands/GetAzureKeyVault.cs

@@ -14,6 +14,8 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.KeyVault.Helpers;
 using Microsoft.Azure.Commands.KeyVault.Models;
@@ -103,7 +105,13 @@ public override void ExecuteCmdlet()
             switch (ParameterSetName)
             {
                 case GetVaultParameterSet:
-                    ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName) : ResourceGroupName;
+                    List<PSKeyVaultIdentityItem> vaults = new List<PSKeyVaultIdentityItem>();
+
+                    if (string.IsNullOrWhiteSpace(ResourceGroupName))
+                    {
+                        vaults.AddRange(ListVaults(ResourceGroupName, Tag));
+                        ResourceGroupName = vaults.FirstOrDefault(r => r.VaultName.Equals(VaultName, StringComparison.OrdinalIgnoreCase))?.ResourceGroupName;
+                    }
 
                     if (ShouldGetByName(ResourceGroupName, VaultName))
                     {
@@ -115,7 +123,7 @@ public override void ExecuteCmdlet()
                     }
                     else
                     {
-                        WriteObject(TopLevelWildcardFilter(ResourceGroupName, VaultName, ListVaults(ResourceGroupName, Tag)), true);
+                        WriteObject(TopLevelWildcardFilter(ResourceGroupName, VaultName, vaults), true);
                     }
 
                     break;

src/KeyVault/KeyVault/Models/KeyVaultManagementCmdletBase.cs

@@ -141,8 +141,9 @@ protected List<PSKeyVaultIdentityItem> ListVaults(string resourceGroupName, Hash
             if (ShouldListByResourceGroup(resourceGroupName, null))
             {
                 listResult = ListByResourceGroup(resourceGroupName,
-                    new Rest.Azure.OData.ODataQuery<GenericResourceFilter>(
-                        r => r.ResourceType == resourceType));
+                      new Rest.Azure.OData.ODataQuery<GenericResourceFilter>(
+                          r => r.ResourceType == resourceType));
+
             }
             else
             {
@@ -161,22 +162,36 @@ protected List<PSKeyVaultIdentityItem> ListVaults(string resourceGroupName, Hash
             return vaults;
         }
 
-        public virtual IEnumerable<PSKeyVaultIdentityItem> ListResources(Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter = null, ulong first = ulong.MaxValue, ulong skip = ulong.MinValue)
+        public virtual IEnumerable<PSKeyVaultIdentityItem> ListResources(Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter = null)
         {
             IResourceManagementClient armClient = ResourceClient;
-
-            return new GenericPageEnumerable<GenericResource>(() => armClient.Resources.List(filter), armClient.Resources.ListNext, first, skip).Select(r => new PSKeyVaultIdentityItem(r));
+            var response = armClient.Resources.List(filter);
+            var results = new List<PSKeyVaultIdentityItem>();
+            results.AddRange(response.Select(r => new PSKeyVaultIdentityItem(r)));
+            while (!string.IsNullOrEmpty(response.NextPageLink))
+            {
+                response = armClient.Resources.ListNext(response.NextPageLink);
+                results.AddRange(response.Select(r => new PSKeyVaultIdentityItem(r)));
+            }
+            return results;
         }
 
         private IEnumerable<PSKeyVaultIdentityItem> ListByResourceGroup(
             string resourceGroupName,
-            Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter,
-            ulong first = ulong.MaxValue,
-            ulong skip = ulong.MinValue)
+            Rest.Azure.OData.ODataQuery<GenericResourceFilter> filter)
         {
             IResourceManagementClient armClient = ResourceClient;
 
-            return new GenericPageEnumerable<GenericResource>(() => armClient.ResourceGroups.ListResources(resourceGroupName, filter), armClient.ResourceGroups.ListResourcesNext, first, skip).Select(r => new PSKeyVaultIdentityItem(r));
+            var response = armClient.ResourceGroups.ListResources(resourceGroupName, filter);
+            var results = new List<PSKeyVaultIdentityItem>();
+            results.AddRange(response.Select(r => new PSKeyVaultIdentityItem(r)));
+
+            while (!string.IsNullOrEmpty(response.NextPageLink))
+            {
+                response = armClient.ResourceGroups.ListResourcesNext(response.NextPageLink);
+                results.AddRange(response.Select(r => new PSKeyVaultIdentityItem(r)));
+            }
+            return results;
         }
 
         protected string GetResourceGroupName(string name, bool isHsm = false)

tools/Common.Netcore.Dependencies.targets

@@ -3,6 +3,23 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23"/>
     <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.19"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Common" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Compute" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Graph.Rbac" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.KeyVault" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Monitor" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Network" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.PolicyInsights" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.ResourceManager" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Storage" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Storage.Management" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.0.0-preview"/>
+    <PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.0.0-preview"/>
+    <!-- 
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Aks" Version="1.3.56-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Authentication.Abstractions" Version="1.3.56-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Authorization" Version="1.3.56-preview"/>
@@ -19,6 +36,7 @@
     <PackageReference Include="Microsoft.Azure.PowerShell.Strategies" Version="1.3.56-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Clients.Websites" Version="1.3.56-preview"/>
     <PackageReference Include="Microsoft.Azure.PowerShell.Common.Share" Version="1.3.56-preview"/>
+    -->
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Core" Version="1.21.0"/>
@@ -36,7 +54,7 @@
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>
-    <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.56-preview\tools\</StorageToolsPath>
+    <StorageToolsPath>$(NugetPackageRoot)\microsoft.azure.powershell.storage\1.0.0-preview\tools\</StorageToolsPath>
   </PropertyGroup>
   <ItemGroup Condition="'$(OmitJsonPackage)' != 'true'">
     <PackageReference Include="Newtonsoft.Json" Version="10.0.3"/>

tools/CreateMappings_rules.json

@@ -100,6 +100,10 @@
     "group": "Network",
     "alias": "Route"
   },
+  {
+    "group": "DnsResolver",
+    "alias": "DnsResolver"
+  },
   {
     "regex": "Dns",
     "group": "Network",
@@ -671,6 +675,10 @@
     "alias": "Private DNS",
     "module": "PrivateDns"
   },
+  {
+    "alias": "Quota",
+    "module": "Quota"
+  },
   {
     "regex": "ContainerInstance",
     "alias": "ContainerInstance"
@@ -715,4 +723,4 @@
     "alias": "Lab Services",
     "module": "LabServices"
   }
-]
+]