Merge developer into master

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## v0.3.0 - 2017-09-29
+## v0.3.0
+- Generate single Verb-Noun cmdlet for OperationIds like Noun_Verb and Noun_VerbBySomething (#358)
+- Move New-HttpClientHandler logic into New-ServiceClient for non-Azure services. (#357)
+- Add few verb mappings for Azure RPs (#356)
+- Add NoVersionFolder switch parameter on New-PSSwaggerModule cmdlet to not create the version folder. (#355)
+- Add all non-complex type properties in output format ps1xml files. (#354)
+- Escape '<#' and '#>', and replace '--' with '==' in Header content (#352)
+- Use separate PSCmdletOutputItemType variable for getting the output item type of pageable swagger operations. (#351)
+- Verb map change: 'Regenerate' to 'New' instead of 'Update' as per the feedback recieved from Azure PowerShell team. (#347)
+- [Azure and AzureStack] Use IClientFactory to create ARM Client in Azure PowerShell way. (#348)
+- New-ServiceClient error on custom host (#350)
+- Add CHANGELOG.md, and minor update for releasing the 0.3.0 version of PSSwagger and PSSwaggerUtility modules. (#345)
 - Add support for generating proper output type for the Swagger operations with x-ms-pageable extension (#342)
 - Add support for parameter type references to enum definitions (#341)
 - Add support for AdditionalProperties Json schema with array type (#339)
@@ -21,7 +32,7 @@
 - Update Readme and fix an error related to importing the PSSwaggerUtility module (#300)
 - Support custom x-ms-pageable\NextLinkName field name (#294)
 
-## v0.2.0 - 2017-08-15
+## v0.2.0
 
 * First preview release
 

PSSwagger/AssemblyGenerationHelpers.Resources.psd1

@@ -1,11 +1,3 @@
-#########################################################################################
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-#
-# Licensed under the MIT license.
-#
-#########################################################################################
-
 ConvertFrom-StringData @'
 ###PSLOC
 

PSSwagger/AssemblyGenerationHelpers.ps1

@@ -1,11 +1,3 @@
-#########################################################################################
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-#
-# Licensed under the MIT license.
-#
-#########################################################################################
-
 Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 Microsoft.PowerShell.Utility\Import-LocalizedData  LocalizedData -FileName AssemblyGenerationHelpers.Resources.psd1
 

PSSwagger/Definitions.psm1

@@ -988,26 +988,37 @@ function New-SwaggerDefinitionFormatFile
     $ViewTypeName = $ViewName
     $TableColumnItemsList = @()
     $TableColumnItemCount = 0
-    $ParametersCount = Get-HashtableKeyCount -Hashtable $FunctionDetails.ParametersTable
-    $SkipParameterList = @('id', 'tags')
 
     $FunctionDetails.ParametersTable.GetEnumerator() | ForEach-Object {        
-
         $ParameterDetails = $_.Value
-
-        # Add all properties when definition has 4 or less properties.
-        # Otherwise add the first 4 properties with basic types by skipping the complex types, id and tags.
-        if(($ParametersCount -le 4) -or
-           (($TableColumnItemCount -le 4) -and
-            ($SkipParameterList -notcontains $ParameterDetails.Name) -and
-            (-not $ParameterDetails.Type.StartsWith($Namespace, [System.StringComparison]::OrdinalIgnoreCase))))
+        # Add all properties otherthan complex typed properties.
+        # Complex typed properties are not displayed by the PowerShell Format viewer.
+        if(-not $ParameterDetails.Type.StartsWith($Namespace, [System.StringComparison]::OrdinalIgnoreCase))
         {
             $TableColumnItemsList += $TableColumnItemStr -f ($ParameterDetails.Name)
             $TableColumnItemCount += 1
         }
     }
 
-    $TableColumnHeaders = $null
+    if(-not $TableColumnItemCount) {
+        Write-Verbose -Message ($LocalizedData.FormatFileNotRequired -f $FunctionDetails.Name)
+        return    
+    }
+
+    $TableColumnHeadersList = @()
+    $DefaultWindowSizeWidth = 120
+    # Getting the width value for each property column. Default console window width is 120.
+    $TableColumnHeaderWidth = [int]($DefaultWindowSizeWidth/$TableColumnItemCount)
+
+    if ($TableColumnItemCount -ge 2) {
+        1..($TableColumnItemCount - 1) | ForEach-Object {
+            $TableColumnHeadersList += $TableColumnHeaderStr -f ($TableColumnHeaderWidth)
+        }
+    }
+    # Allowing the last property to get the remaining column width, this is useful when customer increases the default window width.
+    $TableColumnHeadersList += $LastTableColumnHeaderStr
+
+    $TableColumnHeaders = $TableColumnHeadersList -join "`r`n"
     $TableColumnItems = $TableColumnItemsList -join "`r`n"
     $FormatViewDefinition = $FormatViewDefinitionStr -f ($ViewName, $ViewTypeName, $TableColumnHeaders, $TableColumnItems, $XmlHeaderComment)
 

PSSwagger/New-ArmServiceClient.ps1

@@ -0,0 +1,49 @@
+Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
+
+<#
+.DESCRIPTION
+   Creates Service Client object.
+
+.PARAMETER  FullClientTypeName
+    Client type full name.
+
+.PARAMETER  GlobalParameterHashtable
+    Global parameters to be set on client object.
+#>
+function New-ServiceClient {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]
+        $FullClientTypeName,
+
+        [Parameter(Mandatory = $false)]
+        [PSCustomObject]
+        $GlobalParameterHashtable
+    )
+
+    # Azure Powershell way    
+    [Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContext]$Context = Get-AzureRmContext
+    if (-not $Context -or -not $Context.Account) {
+        Write-Error -Message 'Run Login-AzureRmAccount to login.' -ErrorId 'AzureRmContextError'
+        return
+    }
+
+    $Factory = [Microsoft.Azure.Commands.Common.Authentication.AzureSession]::Instance.ClientFactory
+    [System.Type[]]$Types = [Microsoft.Azure.Commands.Common.Authentication.Abstractions.IAzureContext], [string]
+    $CreateArmClientMethod = [Microsoft.Azure.Commands.Common.Authentication.IClientFactory].GetMethod('CreateArmClient', $Types)
+    $ClientType = $FullClientTypeName -as [Type]
+    $ClosedMethod = $CreateArmClientMethod.MakeGenericMethod($ClientType)
+    $Arguments = $Context, [Microsoft.Azure.Commands.Common.Authentication.Abstractions.AzureEnvironment+Endpoint]::ResourceManager
+    $Client = $closedMethod.Invoke($Factory, $Arguments)
+
+    if ($GlobalParameterHashtable) {
+        $GlobalParameterHashtable.GetEnumerator() | ForEach-Object {
+            if ($_.Value -and (Get-Member -InputObject $Client -Name $_.Key -MemberType Property)) {
+                $Client."$($_.Key)" = $_.Value
+            }
+        }    
+    }
+
+    return $Client
+}

PSSwagger/New-ServiceClient.ps1

@@ -23,9 +23,6 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
     Command should return a custom hostname string.
     Overrides the default host in the specification.
 
-.PARAMETER  SubscriptionIdCommand
-    Custom command get SubscriptionId value.
-
 .PARAMETER  GlobalParameterHashtable
     Global parameters to be set on client object.
 #>
@@ -56,10 +53,6 @@ function New-ServiceClient {
         [string]
         $HostOverrideCommand,
 
-        [Parameter(Mandatory = $false)]
-        [string]
-        $SubscriptionIdCommand,
-
         [Parameter(Mandatory = $false)]
         [PSCustomObject]
         $GlobalParameterHashtable
@@ -75,7 +68,12 @@ function New-ServiceClient {
     $ClientArgumentList += Invoke-Command @InvokeCommand_parameters
 
     if ($AddHttpClientHandler) {
-        $httpClientHandler = New-HttpClientHandler -Credential $Credential
+        if(-not ('System.Net.Http.HttpClientHandler' -as [Type])) {
+            Add-Type -AssemblyName System.Net.Http
+        }
+        $httpClientHandler = New-Object -TypeName System.Net.Http.HttpClientHandler
+        $httpClientHandler.PreAuthenticate = $true
+        $httpClientHandler.Credentials = $Credential
         $ClientArgumentList += $httpClientHandler
     }
 
@@ -85,23 +83,14 @@ function New-ServiceClient {
     $Client = New-Object -TypeName $FullClientTypeName -ArgumentList $ClientArgumentList
 
     if ($HostOverrideCommand) {
-        $Client.BaseUri = Invoke-Command -ScriptBlock [scriptblock]::Create($HostOverrideCommand)
+        [scriptblock]$HostOverrideCommand = [scriptblock]::Create($HostOverrideCommand)
+        $Client.BaseUri = Invoke-Command -ScriptBlock $HostOverrideCommand
     }
 
     if ($GlobalParameterHashtable) {
         $GlobalParameterHashtable.GetEnumerator() | ForEach-Object {
-            if (Get-Member -InputObject $Client -Name $_.Key -MemberType Property) {
-                if ((-not $_.Value) -and ($_.Key -eq 'SubscriptionId')) {
-                    if($SubscriptionIdCommand) {
-                        $Client.SubscriptionId = Invoke-Command -ScriptBlock [scriptblock]::Create($SubscriptionIdCommand)
-                    }
-                    else {
-                        $Client.SubscriptionId = Get-AzSubscriptionId
-                    }
-                }
-                else {
-                    $Client."$($_.Key)" = $_.Value
-                }
+            if ($_.Value -and (Get-Member -InputObject $Client -Name $_.Key -MemberType Property)) {
+                $Client."$($_.Key)" = $_.Value
             }    
         }
     }

PSSwagger/PSCommandVerbMap.ps1

@@ -19,13 +19,15 @@ $script:PSCommandVerbMap = @{
     Acquire        = 'Get'
     Examine        = 'Get'
     Suggest        = 'Get'
+    Retrieve       = 'Get'
 
     Create         = 'New'
     Generate       = 'New'
     Allocate       = 'New'
     Provision      = 'New'
     Make           = 'New'
-
+    Regenerate     = 'New' # Alternatives: Redo, Update, Reset
+
     CreateOrUpdate = 'New,Set'
     Failover       = 'Set'
     Assign         = 'Set'
@@ -53,10 +55,10 @@ $script:PSCommandVerbMap = @{
 
     Patch          = 'Update'
     Refresh        = 'Update'
-    Regenerate     = 'Update' # Alternatives: Redo, New, Reset
     Reprocess      = "Update" # Alternatives: Redo
     Upgrade        = 'Update'
     Reimage        = 'Update' # Alternatives: Format, Reset
+    Retarget       = 'Update'
 
     Validate       = 'Test'
     Check          = 'Test'
@@ -103,12 +105,14 @@ $script:PSCommandVerbMap = @{
     Migrate        = 'Move' # Alternatives: Export
     Transfer       = 'Move'
     Name           = 'Move'
+    Reassociate    = 'Move'
 
     Change         = 'Rename'
 
     Swap           = 'Switch' # Alternatives: Move
 
     Execute        = 'Invoke'
+    Perform        = 'Invoke'
 
     Discover       = 'Find' # Alternatives: Search
     Locate         = 'Find'
@@ -140,4 +144,8 @@ $script:PSCommandVerbMap = @{
     Jump           = 'Skip'
 
     Separate       = 'Split'
+
+    Notify         = 'Send'
+
+    Authorize      = 'Grant'
 }

PSSwagger/PSSwagger.Constants.ps1

@@ -59,7 +59,6 @@ if (Test-Path -Path `$ClrPath -PathType Container) {
 }
 
 . (Join-Path -Path `$PSScriptRoot -ChildPath 'New-ServiceClient.ps1')
-. (Join-Path -Path `$PSScriptRoot -ChildPath 'GeneratedHelpers.ps1')
 
 `$allPs1FilesPath = Join-Path -Path `$PSScriptRoot -ChildPath '$GeneratedCommandsName' | Join-Path -ChildPath '*.ps1'
 Get-ChildItem -Path `$allPs1FilesPath -Recurse -File | ForEach-Object { . `$_.FullName}
@@ -491,7 +490,8 @@ $FormatViewDefinitionStr = @'
                 <TypeName>{1}</TypeName>
             </ViewSelectedBy>
             <TableControl>
-                <TableHeaders>{2}
+                <TableHeaders>
+{2}
                 </TableHeaders>
                 <TableRowEntries>
                     <TableRowEntry>
@@ -518,6 +518,10 @@ $TableColumnHeaderStr = @'
                     </TableColumnHeader>
 '@
 
+$LastTableColumnHeaderStr = @'
+                    <TableColumnHeader/>
+'@
+
 $DefaultGeneratedFileHeader = @'
 Code generated by Microsoft (R) PSSwagger {0}
 Changes may cause incorrect behavior and will be lost if the code is regenerated.