Update script storage new-azurermstorageaccount implementation to remove storage account from the output stream

- add remove-azurermstorageaccount cmdlet
- Add script into api management tests

Author: markcowl

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj

@@ -179,6 +179,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
+      <Link>ScenarioTests\AzureRM.Storage.ps1</Link>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs

@@ -176,8 +176,8 @@ private void RunPowerShellTest(params string[] scripts)
                     _helper.RMProfileModule,
                     _helper.RMResourceModule, 
                     _helper.RMStorageDataPlaneModule, 
-                    _helper.RMStorageModule, 
-                    _helper.GetRMModulePath("AzureRM.ApiManagement.psd1"));
+                    _helper.GetRMModulePath("AzureRM.ApiManagement.psd1"),
+                    "AzureRM.Storage.ps1");
 
                 _helper.RunPowerShellTest(scripts);
             }

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/AzureRM.Storage.ps1

@@ -5,15 +5,15 @@ function Get-AzureRmStorageAccount
   [CmdletBinding()]
   param(
     [string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
-    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] $Name)
+    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
   BEGIN { 
     $context = Get-Context
 	$client = Get-StorageClient $context
   }
   PROCESS {
     $getTask = $client.StorageAccounts.GetPropertiesAsync($ResourceGroupName, $name, [System.Threading.CancellationToken]::None)
 	$sa = $getTask.Result
-	$account = Get-StorageAccount $sa $ResourceGroupName
+	$account = Get-StorageAccount $ResourceGroupName $Name
 	Write-Output $account
   }
   END {}
@@ -25,7 +25,7 @@ function New-AzureRmStorageAccount
   [CmdletBinding()]
   param(
     [string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
-    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] $Name,
+    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)][alias("StorageAccountName")] $Name,
 	[string] [Parameter(Position=2, ValueFromPipelineByPropertyName=$true)] $Location,
 	[string] [Parameter(Position=3, ValueFromPipelineByPropertyName=$true)] $Type)
   BEGIN { 
@@ -38,8 +38,6 @@ function New-AzureRmStorageAccount
 	$createParms.Location = $Location
     $getTask = $client.StorageAccounts.CreateAsync($ResourceGroupName, $name, $createParms, [System.Threading.CancellationToken]::None)
 	$sa = $getTask.Result
-	$account = Get-StorageAccount $ResourceGroupName $Name
-	Write-Output $account
   }
   END {}
 
@@ -50,7 +48,7 @@ function Get-AzureRmStorageAccountKey
   [CmdletBinding()]
   param(
     [string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
-    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] $Name)
+    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
   BEGIN {  
     $context = Get-Context
 	$client = Get-StorageClient $context
@@ -62,6 +60,25 @@ function Get-AzureRmStorageAccountKey
   END {}
 }
 
+function Remove-AzureRmStorageAccount
+{
+
+  [CmdletBinding()]
+  param(
+    [string] [Parameter(Position=0, ValueFromPipelineByPropertyName=$true)] $ResourceGroupName,
+    [string] [Parameter(Position=1, ValueFromPipelineByPropertyName=$true)] [alias("StorageAccountName")] $Name)
+  BEGIN { 
+    $context = Get-Context
+	$client = Get-StorageClient $context
+  }
+  PROCESS {
+    $getTask = $client.StorageAccounts.DeleteAsync($ResourceGroupName, $name, [System.Threading.CancellationToken]::None)
+	$sa = $getTask.Result
+  }
+  END {}
+
+}
+
 function Get-Context
 {
     [Microsoft.Azure.Commands.Common.Authentication.Models.AzureContext]$context = $null
@@ -88,6 +105,9 @@ function Get-StorageClient
 
 function Get-StorageAccount {
   param([string] $resourceGroupName, [string] $name)
-  $sa = New-Object PSObject -Property @{"Name" = $name; "ResourceGroupName" = $resourceGroupName}
+	$endpoints = New-Object PSObject -Property @{"Blob" = "https://$name.blob.core.windows.net/"}
+  $sa = New-Object PSObject -Property @{"Name" = $name; "ResourceGroupName" = $resourceGroupName; 
+	  "PrimaryEndpoints" = $endpoints
+  }
   return $sa
 }

src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj

@@ -152,6 +152,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Storage.ps1">
+      <Link>ScenarioTests\AzureRM.Storage.ps1</Link>
+    </None>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
@@ -304,10 +307,6 @@
       <Project>{e1f5201d-6067-430e-b303-4e367652991b}</Project>
       <Name>Commands.Resources</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj">
-      <Project>{a50ab133-5c04-4a17-9054-f8343683ec23}</Project>
-      <Name>Commands.Management.Storage</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Commands.Websites\Commands.Websites.csproj">
       <Project>{80a92297-7c92-456b-8ee7-9fb6ce30149d}</Project>
       <Name>Commands.Websites</Name>

src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebsitesController.cs

@@ -117,9 +117,9 @@ public void RunPsTestWorkflow(
                     "ScenarioTests\\" + callingClassName + ".ps1",
                     helper.RMProfileModule,
                     helper.RMStorageDataPlaneModule,
-                    helper.RMStorageModule,
                     helper.RMResourceModule,
-                    helper.GetRMModulePath(@"AzureRM.WebSites.psd1"));
+                    helper.GetRMModulePath(@"AzureRM.WebSites.psd1"),
+                    "AzureRM.Storage.ps1");
 
                 try
                 {