Merge pull request Azure#7069 from deathly809/Commerce1.5.0

[Azure Stack][Admin] Commerce for Azure Stack 1.5.0

Author: Maddie Clayton

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Azs.Commerce.Admin.psd1

@@ -17,7 +17,7 @@ Licensed under the MIT License. See License.txt in the project root for license
     RootModule        = 'Azs.Commerce.Admin.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '0.1.1'
+    ModuleVersion     = '0.2.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -29,7 +29,7 @@ Licensed under the MIT License. See License.txt in the project root for license
     Author            = 'Microsoft'
 
     # Company or vendor of this module
-    CompanyName       = 'Unknown'
+    CompanyName       = 'Microsoft'
 
     # Copyright statement for this module
     Copyright         = '(c) 2018 Microsoft. All rights reserved.'
@@ -38,7 +38,7 @@ Licensed under the MIT License. See License.txt in the project root for license
     Description       = 'Commerce Admin Client'
 
     # Minimum version of the Windows PowerShell engine required by this module
-    # PowerShellVersion = ''
+    PowerShellVersion = '5.0'
 
     # Name of the Windows PowerShell host required by this module
     # PowerShellHostName = ''
@@ -56,8 +56,8 @@ Licensed under the MIT License. See License.txt in the project root for license
     # ProcessorArchitecture = ''
 
     # Modules that must be imported into the global environment prior to importing this module
-    RequiredModules      = @(@{ModuleName = 'AzureRM.Profile'; RequiredVersion = '3.4.1'; },
-                             @{ModuleName = 'AzureRM.Resources'; RequiredVersion = '4.4.1'; })
+    RequiredModules   = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '5.5.1'; },
+        @{ModuleName = 'AzureRM.Resources'; ModuleVersion = '6.0.2'; })
 
     # Assemblies that must be loaded prior to importing this module
     # RequiredAssemblies = @()
@@ -101,19 +101,23 @@ Licensed under the MIT License. See License.txt in the project root for license
         PSData = @{
 
             # Tags applied to this module. These help with module discovery in online galleries.
-            # Tags = @()
+            Tags       = @('AzureStack', 'Azure Stack', 'Commerce', 'Usage')
 
             # A URL to the license for this module.
-            # LicenseUri = ''
+            LicenseUri = 'https://aka.ms/azps-license'
 
             # A URL to the main website for this project.
-            # ProjectUri = ''
+            ProjectUri = 'https://github.com/Azure/azure-powershell'
 
             # A URL to an icon representing this module.
             # IconUri = ''
 
             # ReleaseNotes of this module
-            # ReleaseNotes = ''
+            ReleaseNotes = '## 2018.8.12
+            * Module dependencies updated
+                * AzureRM.Profile
+                * AzureRM.Resources
+            '
 
         } # End of PSData hashtable
 

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Azs.Commerce.Admin.psm1

@@ -29,5 +29,6 @@ if (Test-Path -Path $ClrPath -PathType Container) {
 . (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ApplicableFilters.ps1')
 . (Join-Path -Path $PSScriptRoot -ChildPath 'Test-FilteredResult.ps1')
 . (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ArmResourceIdParameterValue.ps1')
+. (Join-Path -Path $PSScriptRoot -ChildPath 'Get-ResourceNameSuffix.ps1')
 $allPs1FilesPath = Join-Path -Path $PSScriptRoot -ChildPath 'Generated.PowerShell.Commands' | Join-Path -ChildPath '*.ps1'
 Get-ChildItem -Path $allPs1FilesPath -Recurse -File | ForEach-Object { . $_.FullName}

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Get-ApplicableFilters.ps1

@@ -21,7 +21,7 @@ function Get-ApplicableFilters {
         $Filters
     )
 
-    $ErrorActionPreference = 'Stop'
+
     foreach ($filter in $Filters) {
         $res = @{
             Filter = $filter
@@ -31,7 +31,7 @@ function Get-ApplicableFilters {
             if (Test-WildcardFilter -Filter $filter) {
                 $res['Strict'] = $true
             }
-        } 
+        }
         elseif ($filter.Type -eq 'equalityOperator') {
             if (Test-EqualityFilter -Filter $filter) {
                 $res['Strict'] = $true

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Get-ResourceNameSuffix.ps1

@@ -0,0 +1,10 @@
+
+function Get-ResourceNameSuffix {
+    param(
+        [string]$ResourceName
+    )
+    if ($null -ne $ResourceName -and $ResourceName.Contains('/')) {
+        $ResourceName = $ResourceName.Split("/")[-1]
+    }
+    return $ResourceName
+}

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Get-TaskResult.ps1

@@ -59,11 +59,11 @@ function Get-TaskResult {
         } catch {
             # Catch exception so no output.
         } finally {
-            throw $Exception
+            Write-Error -Exception $Exception
         }
     }
 
-    $ErrorActionPreference = 'Stop'
+
     $null = $TaskResult.AsyncWaitHandle.WaitOne()
     Write-Debug -Message "$($TaskResult | Out-String)"
 

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Test-FilteredResult.ps1

@@ -27,7 +27,7 @@ function Test-FilteredResult {
         $Filter
     )
 
-    $ErrorActionPreference = 'Stop'
+
     if ($Filter.Type -eq 'wildcard') {
         Test-WildcardFilterOnResult -Filter $Filter -Result $Result
     } elseif ($Filter.Type -eq 'equalityOperator') {

src/StackAdmin/Azs.Commerce.Admin/Tests/Azs.Commerce.Admin.Tests.csproj

@@ -65,4 +65,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/StackAdmin/Azs.Commerce.Admin/Tests/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AzureStack.Management.Commerce.Admin" version="0.1.0-preview" targetFramework="net45" />
-  <package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.6.0" targetFramework="net45" />
-</packages>
+  <package id="Microsoft.AzureStack.Management.Commerce.Admin" version="0.2.0-preview" targetFramework="net45" />
+</packages>

src/StackAdmin/Azs.Commerce.Admin/Tests/src/Common.ps1

@@ -1,13 +1,32 @@
-
-$global:SkippedTests = $('TestListSubscriberUsageAggregatesFromLastTwoDays')
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+
+ $global:SkippedTests = $()
 
 [DateTime]$global:Start = "2017-09-06T00:00:00Z"
 [DateTime]$global:End = "2017-09-07T00:00:00Z"
 $global:Granularity = 'Hourly'
 
+$global:Client = $null
+
 if (-not $global:RunRaw) {
     $scriptBlock = {
-        Get-MockClient -ClassName 'CommerceAdminClient' -TestName $global:TestName -Verbose
+        if ($null -eq $global:Client) {
+            $global:Client = Get-MockClient -ClassName 'CommerceAdminClient' -TestName $global:TestName -Verbose
+        }
+        return $global:Client
     }
     Mock New-ServiceClient $scriptBlock -ModuleName $global:ModuleName
 }

src/StackAdmin/Azs.Commerce.Admin/Tests/src/UsageAggregate.Tests.ps1

@@ -77,6 +77,10 @@ InModuleScope Azs.Commerce.Admin {
             }
         }
 
+        AfterEach {
+            $global:Client = $null
+        }
+
         # Record again.
         It "TestListSubscriberUsageAggregatesFromLastTwoDays" -Skip:$('TestListSubscriberUsageAggregatesFromLastTwoDays' -in $global:SkippedTests) {
             $global:TestName = 'TestListSubscriberUsageAggregatesFromLastTwoDays'