Skip to content
This repository was archived by the owner on Sep 27, 2019. It is now read-only.

Update the taskresult handling logic to give priority to the $taskResult.Result.Body #326

Merged
merged 1 commit into from
Sep 15, 2017
Merged

Update the taskresult handling logic to give priority to the $taskResult.Result.Body #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions PSSwagger/PSSwagger.Constants.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,18 @@ $getTaskResultBlock = @'

Write-Debug -Message "`$(`$taskResult | Out-String)"

if(`$taskResult.IsFaulted)

if((Get-Member -InputObject `$taskResult -Name 'Result') -and
`$taskResult.Result -and
(Get-Member -InputObject `$taskResult.Result -Name 'Body') -and
`$taskResult.Result.Body)
{
Write-Verbose -Message 'Operation completed successfully.'
`$result = `$taskResult.Result.Body
Write-Debug -Message "`$(`$result | Out-String)"
$resultBlockStr
}
elseif(`$taskResult.IsFaulted)
{
Write-Verbose -Message 'Operation failed.'
if (`$taskResult.Exception)
Expand All @@ -273,15 +284,6 @@ $getTaskResultBlock = @'
else
{
Write-Verbose -Message 'Operation completed successfully.'

if(`$taskResult.Result -and
(Get-Member -InputObject `$taskResult.Result -Name 'Body') -and
`$taskResult.Result.Body)
{
`$result = `$taskResult.Result.Body
Write-Debug -Message "`$(`$result | Out-String)"
$resultBlockStr
}
}
'@

Expand Down Expand Up @@ -382,19 +384,19 @@ $PagingBlockStrFunctionCallWithTop = @'

Write-Verbose -Message 'Flattening paged results.'
# Get the next page iff 1) there is a next page and 2) any result in the next page would be returned
while (`$result -and (Get-Member -InputObject `$result -Name $NextLinkName) -and `$result.$NextLinkName -and ((`$Top -eq -1) -or (`$returnedCount -lt `$Top))) {
Write-Debug -Message "Retrieving next page: `$(`$result.$NextLinkName)"
`$taskResult = $clientName$pagingOperations.$pagingOperationName(`$result.$NextLinkName)
while (`$result -and (Get-Member -InputObject `$result -Name '$NextLinkName') -and `$result.'$NextLinkName' -and ((`$Top -eq -1) -or (`$returnedCount -lt `$Top))) {
Write-Debug -Message "Retrieving next page: `$(`$result.'$NextLinkName')"
`$taskResult = $clientName$pagingOperations.$pagingOperationName(`$result.'$NextLinkName')
$getTaskResult
}
'@

$PagingBlockStrFunctionCall = @'

Write-Verbose -Message 'Flattening paged results.'
while (`$result -and (Get-Member -InputObject `$result -Name $NextLinkName) -and `$result.$NextLinkName) {
Write-Debug -Message "Retrieving next page: `$(`$result.$NextLinkName)"
`$taskResult = $clientName$pagingOperations.$pagingOperationName(`$result.$NextLinkName)
while (`$result -and (Get-Member -InputObject `$result -Name '$NextLinkName') -and `$result.'$NextLinkName') {
Write-Debug -Message "Retrieving next page: `$(`$result.'$NextLinkName')"
`$taskResult = $clientName$pagingOperations.$pagingOperationName(`$result.'$NextLinkName')
$getTaskResult
}
'@
Expand All @@ -404,17 +406,17 @@ $PagingBlockStrCmdletCallWithTop = @'

Write-Verbose -Message 'Flattening paged results.'
# Get the next page iff 1) there is a next page and 2) any result in the next page would be returned
while (`$result -and (Get-Member -InputObject `$result -Name $NextLinkName) -and `$result.$NextLinkName -and ((`$Top -eq -1) -or (`$returnedCount -lt `$Top))) {
Write-Debug -Message "Retrieving next page: `$(`$result.$NextLinkName)"
while (`$result -and (Get-Member -InputObject `$result -Name '$NextLinkName') -and `$result.'$NextLinkName' -and ((`$Top -eq -1) -or (`$returnedCount -lt `$Top))) {
Write-Debug -Message "Retrieving next page: `$(`$result.'$NextLinkName')"
$Cmdlet $CmdletArgs
}
'@

$PagingBlockStrCmdletCall = @'

Write-Verbose -Message 'Flattening paged results.'
while (`$result -and (Get-Member -InputObject `$result -Name $NextLinkName) -and `$result.$NextLinkName) {
Write-Debug -Message "Retrieving next page: `$(`$result.$NextLinkName)"
while (`$result -and (Get-Member -InputObject `$result -Name '$NextLinkName') -and `$result.'$NextLinkName') {
Write-Debug -Message "Retrieving next page: `$(`$result.'$NextLinkName')"
$Cmdlet $CmdletArgs
}
'@
Expand Down
26 changes: 14 additions & 12 deletions PSSwagger/SwaggerUtils.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,18 +630,20 @@ function Get-PathParamInfo
$operationId = $JsonPathItemObject.operationId
}

$JsonPathItemObject.parameters | ForEach-Object {
$AllParameterDetails = Get-ParameterDetails -ParameterJsonObject $_ `
-SwaggerDict $SwaggerDict `
-DefinitionFunctionsDetails $DefinitionFunctionsDetails `
-OperationId $operationId `
-ParameterGroupCache $ParameterGroupCache `
-PSMetaParametersJsonObject $PSMetaParametersJsonObject
foreach ($ParameterDetails in $AllParameterDetails) {
if($ParameterDetails -and ($ParameterDetails.ContainsKey('x_ms_parameter_grouping_group') -or $ParameterDetails.Type))
{
$ParametersTable[$index] = $ParameterDetails
$index = $index + 1
if(Get-Member -InputObject $JsonPathItemObject -Name 'Parameters'){
$JsonPathItemObject.parameters | ForEach-Object {
$AllParameterDetails = Get-ParameterDetails -ParameterJsonObject $_ `
-SwaggerDict $SwaggerDict `
-DefinitionFunctionsDetails $DefinitionFunctionsDetails `
-OperationId $operationId `
-ParameterGroupCache $ParameterGroupCache `
-PSMetaParametersJsonObject $PSMetaParametersJsonObject
foreach ($ParameterDetails in $AllParameterDetails) {
if($ParameterDetails -and ($ParameterDetails.ContainsKey('x_ms_parameter_grouping_group') -or $ParameterDetails.Type))
{
$ParametersTable[$index] = $ParameterDetails
$index = $index + 1
}
}
}
}
Expand Down