Skip to content

Commit c377fdf

Browse files
authored
Fix powershell client Build.ps1 and *.psm1 error when there is a missing Model folder (#17025)
* fix(powershell): make sure paths exists when building and importing module * chore(powershell): update sample psm1 and build.ps1 with path check
1 parent 372894d commit c377fdf

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ function Get-FunctionsToExport {
3939
}
4040

4141
$ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
42-
$FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir\src\{{{packageName}}}\" $_}
42+
$FunctionPath = 'Api', 'Model', 'Client' | Where-Object {
43+
Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ | Test-Path
44+
} | ForEach-Object { Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ }
4345

4446
$Manifest = @{
4547
Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1"

modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ $Script:Configuration = [System.Collections.HashTable]@{}
1717

1818
$Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
1919

20-
'Api', 'Model', 'Client', 'Private' | Get-ChildItem -Path {
20+
'Api', 'Model', 'Client', 'Private' | Where-Object {
21+
Join-Path $PSScriptRoot $_ | Test-Path
22+
} | Get-ChildItem -Path {
2123
Join-Path $PSScriptRoot $_
2224
} -Filter '*.ps1' | ForEach-Object {
2325
Write-Debug "Importing file: $($_.BaseName)"

samples/client/petstore/powershell/Build.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ function Get-FunctionsToExport {
4545
}
4646

4747
$ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path
48-
$FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir\src\PSPetstore\" $_}
48+
$FunctionPath = 'Api', 'Model', 'Client' | Where-Object {
49+
Join-Path "$ScriptDir\src\PSPetstore\" $_ | Test-Path
50+
} | ForEach-Object { Join-Path "$ScriptDir\src\PSPetstore\" $_ }
4951

5052
$Manifest = @{
5153
Path = "$ScriptDir\src\PSPetstore\PSPetstore.psd1"

samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psm1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ $Script:Configuration = [System.Collections.HashTable]@{}
2323

2424
$Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable')
2525

26-
'Api', 'Model', 'Client', 'Private' | Get-ChildItem -Path {
26+
'Api', 'Model', 'Client', 'Private' | Where-Object {
27+
Join-Path $PSScriptRoot $_ | Test-Path
28+
} | Get-ChildItem -Path {
2729
Join-Path $PSScriptRoot $_
2830
} -Filter '*.ps1' | ForEach-Object {
2931
Write-Debug "Importing file: $($_.BaseName)"

0 commit comments

Comments
 (0)