From 92a65d4e00de9e5107d1813ad35f2ad93330c097 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:31:03 +0200 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Add=20error=20han?= =?UTF-8?q?dling=20for=20non-NormalView=20ErrorView=20setting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/TestWorkflow.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/TestWorkflow.yml b/.github/workflows/TestWorkflow.yml index e49e735..805c36c 100644 --- a/.github/workflows/TestWorkflow.yml +++ b/.github/workflows/TestWorkflow.yml @@ -225,6 +225,12 @@ jobs: Get-Content $env:GITHUB_OUTPUT -Raw | Set-GitHubStepSummary } + LogGroup "ErrorView: $ErrorView" { + if ($errorView -ne 'NormalView') { + throw 'ErrorView is not NormalView' + } + } + - name: Run-test shell: pwsh env: From 85c99795a3b5c8b6c13b1880bb09f8b3514a7c90 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:35:57 +0200 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Add=20logging=20f?= =?UTF-8?q?or=20environment=20inputs=20in=20init=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/init.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/init.ps1 b/scripts/init.ps1 index 486802c..c7e59bc 100644 --- a/scripts/init.ps1 +++ b/scripts/init.ps1 @@ -7,6 +7,9 @@ begin { $PSStyle.OutputRendering = 'Ansi' # Configure ErrorView based on input parameter + LogGroup "Inputs:" { + Get-ChildItem env: | Where-Object { $_ -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String + } if (-not [string]::IsNullOrEmpty($env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView)) { $validViews = @('NormalView', 'CategoryView', 'ConciseView', 'DetailedView') $errorViewSetting = $env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView From 30631490cdd884efe4461e6dd306028fbdea3528 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:37:30 +0200 Subject: [PATCH 3/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Fix=20variable=20?= =?UTF-8?q?reference=20in=20environment=20input=20logging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/init.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/init.ps1 b/scripts/init.ps1 index c7e59bc..8e699ff 100644 --- a/scripts/init.ps1 +++ b/scripts/init.ps1 @@ -8,7 +8,7 @@ begin { # Configure ErrorView based on input parameter LogGroup "Inputs:" { - Get-ChildItem env: | Where-Object { $_ -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String + Get-ChildItem env: | Where-Object { $_.Name -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String } if (-not [string]::IsNullOrEmpty($env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView)) { $validViews = @('NormalView', 'CategoryView', 'ConciseView', 'DetailedView') From a5936c381846ebe8ac9965f542706915f4024d1d Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:39:05 +0200 Subject: [PATCH 4/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Remove=20unnecess?= =?UTF-8?q?ary=20logging=20group=20for=20environment=20inputs=20in=20init?= =?UTF-8?q?=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/init.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/init.ps1 b/scripts/init.ps1 index 8e699ff..183e0e3 100644 --- a/scripts/init.ps1 +++ b/scripts/init.ps1 @@ -7,9 +7,7 @@ begin { $PSStyle.OutputRendering = 'Ansi' # Configure ErrorView based on input parameter - LogGroup "Inputs:" { - Get-ChildItem env: | Where-Object { $_.Name -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String - } + Get-ChildItem env: | Where-Object { $_.Name -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String if (-not [string]::IsNullOrEmpty($env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView)) { $validViews = @('NormalView', 'CategoryView', 'ConciseView', 'DetailedView') $errorViewSetting = $env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView From d875fdb4a3554b621c40be45a20983f7f99d90e2 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:42:42 +0200 Subject: [PATCH 5/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Add=20ErrorView?= =?UTF-8?q?=20environment=20variable=20handling=20in=20init=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action.yml | 1 + scripts/init.ps1 | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index 054fb3d..431813c 100644 --- a/action.yml +++ b/action.yml @@ -91,6 +91,7 @@ runs: PSMODULE_GITHUB_SCRIPT_INPUT_PreserveCredentials: ${{ inputs.PreserveCredentials }} run: | # ${{ inputs.Name }} + $ErrorView = $env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView try { ${{ github.action_path }}/scripts/init.ps1 ${{ github.action_path }}/scripts/info.ps1 diff --git a/scripts/init.ps1 b/scripts/init.ps1 index 183e0e3..486802c 100644 --- a/scripts/init.ps1 +++ b/scripts/init.ps1 @@ -7,7 +7,6 @@ begin { $PSStyle.OutputRendering = 'Ansi' # Configure ErrorView based on input parameter - Get-ChildItem env: | Where-Object { $_.Name -like 'PSMODULE_GITHUB_SCRIPT_INPUT_*' } | Out-String if (-not [string]::IsNullOrEmpty($env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView)) { $validViews = @('NormalView', 'CategoryView', 'ConciseView', 'DetailedView') $errorViewSetting = $env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView From 869e7192b47838d284ff0e7c3e08e02cd5da36e0 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:43:11 +0200 Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Remove=20ErrorVie?= =?UTF-8?q?w=20configuration=20handling=20from=20init=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/init.ps1 | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/scripts/init.ps1 b/scripts/init.ps1 index 486802c..2cd7566 100644 --- a/scripts/init.ps1 +++ b/scripts/init.ps1 @@ -4,23 +4,6 @@ param() begin { $scriptName = $MyInvocation.MyCommand.Name Write-Debug "[$scriptName] - Start" - $PSStyle.OutputRendering = 'Ansi' - - # Configure ErrorView based on input parameter - if (-not [string]::IsNullOrEmpty($env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView)) { - $validViews = @('NormalView', 'CategoryView', 'ConciseView', 'DetailedView') - $errorViewSetting = $env:PSMODULE_GITHUB_SCRIPT_INPUT_ErrorView - - # Simply find the first validView that matches the input using wildcards - $matchedView = $validViews | Where-Object { $_ -like "*$errorViewSetting*" } | Select-Object -First 1 - - if ($matchedView) { - Write-Debug "[$scriptName] - Input [$errorViewSetting] matched with [$matchedView]" - $ErrorView = $matchedView - } else { - Write-Warning "[$scriptName] - Invalid ErrorView value: [$errorViewSetting]. Using default." - } - } } process { From 07aad2c9e7c5e2e42f9d4ed4dc09de4f605a3374 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 16 Jun 2025 23:46:16 +0200 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=A9=B9=20[Patch]:=20Update=20ErrorVie?= =?UTF-8?q?w=20logging=20message=20for=20clarity=20in=20TestWorkflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/TestWorkflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/TestWorkflow.yml b/.github/workflows/TestWorkflow.yml index 805c36c..28d7292 100644 --- a/.github/workflows/TestWorkflow.yml +++ b/.github/workflows/TestWorkflow.yml @@ -225,8 +225,8 @@ jobs: Get-Content $env:GITHUB_OUTPUT -Raw | Set-GitHubStepSummary } - LogGroup "ErrorView: $ErrorView" { - if ($errorView -ne 'NormalView') { + LogGroup "ErrorView should be 'NormalView' - [$ErrorView]" { + if ($ErrorView -ne 'NormalView') { throw 'ErrorView is not NormalView' } }