Merge branch 'master' into xscl11.1

Author: isra-fel

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.2.0" />
   </ItemGroup>
 
 </Project>

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.ps1

@@ -73,7 +73,9 @@ function Test-StorageBlobContainer
 		Assert-AreEqual $publicAccess $container.PublicAccess
 		Assert-AreEqual $metadata.Count $container.Metadata.Count
 
-		$containers = Get-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname
+		$job = Get-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname -AsJob
+		$job | Wait-Job
+		$containers = $job.Output
 		Assert-AreEqual 2 $containers.Count
 		Assert-AreEqual $containerName  $containers[1].Name
 		Assert-AreEqual $containerName2  $containers[0].Name

src/Storage/Storage.Management.Test/Storage.Management.Test.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.2.0" />
   </ItemGroup>
 
 </Project>

src/Storage/Storage.Management/Blob/GetAzureStorageContainer.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.Management.Storage.Models;
 using Microsoft.Azure.Management.Storage;
 using Microsoft.Azure.Management.Storage.Models;
+using Microsoft.Rest.Azure;
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
@@ -68,6 +69,9 @@ public class GetAzureStorageContainerCommand : StorageBlobBaseCmdlet
             ValueFromPipelineByPropertyName = true)]
         public string Name { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Run cmdlet in the background")]
+        public SwitchParameter AsJob { get; set; }
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -88,10 +92,15 @@ public override void ExecuteCmdlet()
             }
             else
             {
-                var container = this.StorageClient.BlobContainers.List(
-                           this.ResourceGroupName,
-                           this.StorageAccountName);
-                WriteContainerList(container);
+                IPage<ListContainerItem> containerlistResult = this.StorageClient.BlobContainers.List(
+                               this.ResourceGroupName,
+                               this.StorageAccountName);
+                WriteContainerList(containerlistResult);
+                while (containerlistResult.NextPageLink != null)
+                {
+                    containerlistResult = this.StorageClient.BlobContainers.ListNext(containerlistResult.NextPageLink);
+                    WriteContainerList(containerlistResult);
+                }
             }
         }
     }

src/Storage/Storage.Management/ChangeLog.md

@@ -19,6 +19,10 @@
 -->
 ## Upcoming Release
 * Upgrade Storage Client Library to 11.1.0
+* List containers with Management plane API, will list with NextPageLink
+    -  Get-AzRmStorageContainer
+* List Storage accounts from subscription, will list with NextPageLink
+    -  Get-AzStorageAccount
 
 ## Version 1.7.0
 * Updated example in reference documentation for `Get-AzStorageAccountKey`

src/Storage/Storage.Management/Storage.Management.csproj

@@ -14,7 +14,7 @@
     <RootNamespace>$(LegacyAssemblyPrefix)$(PsModuleName)</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.1.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="13.2.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.1.0" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.0" />
     <PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.1.0" />

src/Storage/Storage.Management/StorageAccount/GetAzureStorageAccount.cs

@@ -15,6 +15,7 @@
 using Microsoft.Azure.Commands.Management.Storage.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Storage;
+using Microsoft.Rest.Azure;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.Management.Storage
@@ -57,9 +58,14 @@ public override void ExecuteCmdlet()
 
             if (string.IsNullOrEmpty(this.ResourceGroupName))
             {
-                var storageAccounts = this.StorageClient.StorageAccounts.List();
-
+                IPage<Microsoft.Azure.Management.Storage.Models.StorageAccount> storageAccounts = this.StorageClient.StorageAccounts.List();
                 WriteStorageAccountList(storageAccounts);
+
+                while (storageAccounts.NextPageLink != null)
+                {
+                    storageAccounts = this.StorageClient.StorageAccounts.ListNext(storageAccounts.NextPageLink);
+                    WriteStorageAccountList(storageAccounts);
+                }
             }
             else if (string.IsNullOrEmpty(this.Name))
             {

src/Storage/Storage.Management/help/Get-AzRmStorageContainer.md

@@ -1,4 +1,4 @@
----
+---
 external help file: Microsoft.Azure.PowerShell.Cmdlets.Storage.Management.dll-Help.xml
 Module Name: Az.Storage
 online version: https://docs.microsoft.com/en-us/powershell/module/az.storage/get-azrmstoragecontainer
@@ -14,13 +14,13 @@ Gets or lists Storage blob containers
 
 ### AccountName (Default)
 ```
-Get-AzRmStorageContainer [-ResourceGroupName] <String> [-StorageAccountName] <String> [-Name <String>]
+Get-AzRmStorageContainer [-ResourceGroupName] <String> [-StorageAccountName] <String> [-Name <String>] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
 ### AccountObject
 ```
-Get-AzRmStorageContainer -StorageAccount <PSStorageAccount> [-Name <String>]
+Get-AzRmStorageContainer -StorageAccount <PSStorageAccount> [-Name <String>] [-AsJob]
  [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
@@ -53,6 +53,21 @@ This command gets a Storage blob container with Storage account object and conta
 
 ## PARAMETERS
 
+### -AsJob
+Run cmdlet in the background
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -DefaultProfile
 The credentials, account, tenant, and subscription used for communication with azure.