loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Fix powershell client Build.ps1 and *.psm1 error when there is a missing Model folder (#17025)

Browse Source 
* fix(powershell): make sure paths exists when building and importing module

* chore(powershell): update sample psm1 and build.ps1 with path check
This commit is contained in:
Elon Mallin 2023-11-12 17:29:49 +01:00 committed by GitHub
parent 372894dd1d
commit c377fdf62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache vendored
View File

@ -39,7 +39,9 @@ function Get-FunctionsToExport {
} }
$ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
$FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir\src\{{{packageName}}}\" $_} $FunctionPath = 'Api', 'Model', 'Client' | Where-Object {
Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ | Test-Path
} | ForEach-Object { Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ }
$Manifest = @{ $Manifest = @{
Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1" Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1"

4
modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache vendored
View File

@ -17,7 +17,9 @@ $Script:Configuration = [System.Collections.HashTable]@{}
$Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable') $Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
'Api', 'Model', 'Client', 'Private' | Get-ChildItem -Path { 'Api', 'Model', 'Client', 'Private' | Where-Object {
Join-Path $PSScriptRoot $_ | Test-Path
} | Get-ChildItem -Path {
Join-Path $PSScriptRoot $_ Join-Path $PSScriptRoot $_
} -Filter '*.ps1' | ForEach-Object { } -Filter '*.ps1' | ForEach-Object {
Write-Debug "Importing file: $($_.BaseName)" Write-Debug "Importing file: $($_.BaseName)"

4
samples/client/petstore/powershell/Build.ps1
View File

@ -45,7 +45,9 @@ function Get-FunctionsToExport {
} }
$ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
$FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir\src\PSPetstore\" $_} $FunctionPath = 'Api', 'Model', 'Client' | Where-Object {
Join-Path "$ScriptDir\src\PSPetstore\" $_ | Test-Path
} | ForEach-Object { Join-Path "$ScriptDir\src\PSPetstore\" $_ }
$Manifest = @{ $Manifest = @{
Path = "$ScriptDir\src\PSPetstore\PSPetstore.psd1" Path = "$ScriptDir\src\PSPetstore\PSPetstore.psd1"

4
samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psm1
View File

@ -23,7 +23,9 @@ $Script:Configuration = [System.Collections.HashTable]@{}
$Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable') $Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
'Api', 'Model', 'Client', 'Private' | Get-ChildItem -Path { 'Api', 'Model', 'Client', 'Private' | Where-Object {
Join-Path $PSScriptRoot $_ | Test-Path
} | Get-ChildItem -Path {
Join-Path $PSScriptRoot $_ Join-Path $PSScriptRoot $_
} -Filter '*.ps1' | ForEach-Object { } -Filter '*.ps1' | ForEach-Object {
Write-Debug "Importing file: $($_.BaseName)" Write-Debug "Importing file: $($_.BaseName)"