Fix Get-AzureRmCognitiveServicesAccount to support paging

felixwa · felixwa · commit 6ef56c4c9a7d · 2017-09-05T18:09:58.000+08:00
Integrate with Cognitive Services Management SDK version 2.0.0.
Get-AzureRmCognitiveServicesAccount now can correctly support paging.
diff --git a/src/ResourceManager/CognitiveServices/ChangeLog.md b/src/ResourceManager/CognitiveServices/ChangeLog.md
@@ -19,6 +19,10 @@
 -->
 ## Current Release
 
+## Version 0.8.5
+* Integrate with Cognitive Services Management SDK version 2.0.0.
+* Get-AzureRmCognitiveServicesAccount now can correctly support paging.
+
 ## Version 0.8.4
 
 ## Version 0.8.3
diff --git a/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.csproj b/src/ResourceManager/CognitiveServices/CognitiveServices.Test/Commands.Management.CognitiveServices.Test.csproj
@@ -51,8 +51,8 @@
     <Reference Include="Microsoft.Azure.Management.Authorization">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.1.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.2.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/CognitiveServices/CognitiveServices.Test/packages.config b/src/ResourceManager/CognitiveServices/CognitiveServices.Test/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.CognitiveServices" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.CognitiveServices" version="2.0.0" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/CognitiveServicesAccount/GetAzureCognitiveServicesAccount.cs b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/CognitiveServicesAccount/GetAzureCognitiveServicesAccount.cs
@@ -15,7 +15,8 @@
 using Microsoft.Azure.Commands.Management.CognitiveServices.Models;
 using Microsoft.Azure.Management.CognitiveServices;
 using Microsoft.Azure.Management.CognitiveServices.Models;
-using System.Globalization;
+using Microsoft.Rest.Azure;
+using System.Collections.Generic;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Management.CognitiveServices
@@ -62,13 +63,13 @@ public override void ExecuteCmdlet()
             {
                 if (string.IsNullOrEmpty(this.ResourceGroupName))
                 {
-                    var cognitiveServicesAccounts = this.CognitiveServicesClient.Accounts.List();
+                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.List());
 
                     WriteCognitiveServicesAccountList(cognitiveServicesAccounts);
                 }
                 else if (string.IsNullOrEmpty(this.Name))
                 {
-                    var cognitiveServicesAccounts = this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName);
+                    var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName));
                     if (cognitiveServicesAccounts == null)
                     {
                         WriteWarningWithTimestamp("Received empty accounts list");
@@ -85,5 +86,18 @@ public override void ExecuteCmdlet()
                 }
             });
         }
+
+        private IEnumerable<CognitiveServicesAccount> GetWithPaging(IPage<CognitiveServicesAccount> firstPage)
+        {
+            var cognitiveServicesAccounts = new List<CognitiveServicesAccount>(firstPage);
+            IPage<CognitiveServicesAccount> nextPage = null;
+            for (var nextLink = firstPage.NextPageLink; !string.IsNullOrEmpty(nextLink); nextLink = nextPage.NextPageLink)
+            {
+                nextPage = this.CognitiveServicesClient.Accounts.ListNext(nextLink);
+                cognitiveServicesAccounts.AddRange(nextPage);
+            }
+
+            return cognitiveServicesAccounts;
+        }
     }
 }
diff --git a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.csproj b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Commands.Management.CognitiveServices.csproj
@@ -48,8 +48,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.1.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.CognitiveServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.CognitiveServices.2.0.0\lib\net452\Microsoft.Azure.Management.CognitiveServices.dll</HintPath>
     </Reference>
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
diff --git a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Properties/AssemblyInfo.cs b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/Properties/AssemblyInfo.cs
@@ -46,5 +46,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.8.4")]
-[assembly: AssemblyFileVersion("0.8.4")]
+[assembly: AssemblyVersion("0.8.5")]
+[assembly: AssemblyFileVersion("0.8.5")]
diff --git a/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/packages.config b/src/ResourceManager/CognitiveServices/Commands.Management.CognitiveServices/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.Management.CognitiveServices" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.CognitiveServices" version="2.0.0" targetFramework="net452" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`using Microsoft.Azure.Commands.Management.CognitiveServices.Models;`
`16`	`16`	`using Microsoft.Azure.Management.CognitiveServices;`
`17`	`17`	`using Microsoft.Azure.Management.CognitiveServices.Models;`
`18`		`-using System.Globalization;`
	`18`	`+using Microsoft.Rest.Azure;`
	`19`	`+using System.Collections.Generic;`
`19`	`20`	`using System.Management.Automation;`
`20`	`21`
`21`	`22`	`namespace Microsoft.Azure.Commands.Management.CognitiveServices`
`@@ -62,13 +63,13 @@ public override void ExecuteCmdlet()`
`62`	`63`	`{`
`63`	`64`	`if (string.IsNullOrEmpty(this.ResourceGroupName))`
`64`	`65`	`{`
`65`		`- var cognitiveServicesAccounts = this.CognitiveServicesClient.Accounts.List();`
	`66`	`+ var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.List());`
`66`	`67`
`67`	`68`	`WriteCognitiveServicesAccountList(cognitiveServicesAccounts);`
`68`	`69`	`}`
`69`	`70`	`else if (string.IsNullOrEmpty(this.Name))`
`70`	`71`	`{`
`71`		`- var cognitiveServicesAccounts = this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName);`
	`72`	`+ var cognitiveServicesAccounts = GetWithPaging(this.CognitiveServicesClient.Accounts.ListByResourceGroup(this.ResourceGroupName));`
`72`	`73`	`if (cognitiveServicesAccounts == null)`
`73`	`74`	`{`
`74`	`75`	`WriteWarningWithTimestamp("Received empty accounts list");`
`@@ -85,5 +86,18 @@ public override void ExecuteCmdlet()`
`85`	`86`	`}`
`86`	`87`	`});`
`87`	`88`	`}`
	`89`	`+`
	`90`	`+ private IEnumerable<CognitiveServicesAccount> GetWithPaging(IPage<CognitiveServicesAccount> firstPage)`
	`91`	`+ {`
	`92`	`+ var cognitiveServicesAccounts = new List<CognitiveServicesAccount>(firstPage);`
	`93`	`+ IPage<CognitiveServicesAccount> nextPage = null;`
	`94`	`+ for (var nextLink = firstPage.NextPageLink; !string.IsNullOrEmpty(nextLink); nextLink = nextPage.NextPageLink)`
	`95`	`+ {`
	`96`	`+ nextPage = this.CognitiveServicesClient.Accounts.ListNext(nextLink);`
	`97`	`+ cognitiveServicesAccounts.AddRange(nextPage);`
	`98`	`+ }`
	`99`	`+`
	`100`	`+ return cognitiveServicesAccounts;`
	`101`	`+ }`
`88`	`102`	`}`
`89`	`103`	`}`