From 49c8ce48c940423098e1f7d17eccb5143ea8edf4 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 18 Aug 2024 00:08:29 +0200 Subject: [PATCH 1/4] Fix an issue where the Connect-GitHubAccount would get object instead of value --- src/private/Commands/Initialize-RunnerEnvironment.ps1 | 2 +- src/public/Auth/Connect-GitHubAccount.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/private/Commands/Initialize-RunnerEnvironment.ps1 b/src/private/Commands/Initialize-RunnerEnvironment.ps1 index 67e02bae6..6f62fe550 100644 --- a/src/private/Commands/Initialize-RunnerEnvironment.ps1 +++ b/src/private/Commands/Initialize-RunnerEnvironment.ps1 @@ -19,7 +19,7 @@ Set-GitHubEnv -Name 'GITHUB_REPOSITORY_NAME' -Value $env:GITHUB_REPOSITORY_NAME # Autologon if a token is present in environment variables - $tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 + $tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value $tokenVarPresent = $tokenVar.count -gt 0 -and -not [string]::IsNullOrEmpty($tokenVar) if ($tokenVarPresent) { Connect-GitHubAccount -Repo $env:GITHUB_REPOSITORY_NAME -Owner $env:GITHUB_REPOSITORY_OWNER diff --git a/src/public/Auth/Connect-GitHubAccount.ps1 b/src/public/Auth/Connect-GitHubAccount.ps1 index 7a2a3d59f..f5e2a4802 100644 --- a/src/public/Auth/Connect-GitHubAccount.ps1 +++ b/src/public/Auth/Connect-GitHubAccount.ps1 @@ -98,7 +98,7 @@ $envVars = Get-ChildItem -Path 'Env:' Write-Debug 'Environment variables:' Write-Debug ($envVars | Format-Table -AutoSize | Out-String) - $gitHubToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 + $gitHubToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value Write-Debug "GitHub token: [$gitHubToken]" $gitHubTokenPresent = $gitHubToken.count -gt 0 -and -not [string]::IsNullOrEmpty($gitHubToken) Write-Debug "GitHub token present: [$gitHubTokenPresent]" From 32ce105f744a1eb83bb3709cef9bcf02d694837c Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 18 Aug 2024 00:27:33 +0200 Subject: [PATCH 2/4] test --- src/private/Commands/Initialize-RunnerEnvironment.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/src/private/Commands/Initialize-RunnerEnvironment.ps1 b/src/private/Commands/Initialize-RunnerEnvironment.ps1 index 6f62fe550..c98528ef6 100644 --- a/src/private/Commands/Initialize-RunnerEnvironment.ps1 +++ b/src/private/Commands/Initialize-RunnerEnvironment.ps1 @@ -19,6 +19,7 @@ Set-GitHubEnv -Name 'GITHUB_REPOSITORY_NAME' -Value $env:GITHUB_REPOSITORY_NAME # Autologon if a token is present in environment variables + Write-Verbose (Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Out-String) -Verbose $tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value $tokenVarPresent = $tokenVar.count -gt 0 -and -not [string]::IsNullOrEmpty($tokenVar) if ($tokenVarPresent) { From 4bd73d4a21f5a6df5bb4dcba3d9453141cd4d3e6 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 18 Aug 2024 00:29:17 +0200 Subject: [PATCH 3/4] Fix --- src/private/Commands/Initialize-RunnerEnvironment.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/private/Commands/Initialize-RunnerEnvironment.ps1 b/src/private/Commands/Initialize-RunnerEnvironment.ps1 index c98528ef6..a384fd55b 100644 --- a/src/private/Commands/Initialize-RunnerEnvironment.ps1 +++ b/src/private/Commands/Initialize-RunnerEnvironment.ps1 @@ -19,7 +19,7 @@ Set-GitHubEnv -Name 'GITHUB_REPOSITORY_NAME' -Value $env:GITHUB_REPOSITORY_NAME # Autologon if a token is present in environment variables - Write-Verbose (Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Out-String) -Verbose + Write-Verbose (Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Out-String) $tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value $tokenVarPresent = $tokenVar.count -gt 0 -and -not [string]::IsNullOrEmpty($tokenVar) if ($tokenVarPresent) { From 556a749ead329f032653f91f80f4bfe22505fe79 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Sun, 18 Aug 2024 00:33:20 +0200 Subject: [PATCH 4/4] test --- src/public/Auth/Connect-GitHubAccount.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/Auth/Connect-GitHubAccount.ps1 b/src/public/Auth/Connect-GitHubAccount.ps1 index f5e2a4802..5c448f926 100644 --- a/src/public/Auth/Connect-GitHubAccount.ps1 +++ b/src/public/Auth/Connect-GitHubAccount.ps1 @@ -202,9 +202,9 @@ 'sPAT' { Write-Verbose 'Logging in using GitHub access token...' Reset-GitHubConfig -Scope 'Auth' - $prefix = $gitHubToken.Value -replace '_.*$', '_*' + $prefix = $gitHubToken -replace '_.*$', '_*' $settings = @{ - AccessToken = ConvertTo-SecureString -AsPlainText $gitHubToken.Value + AccessToken = ConvertTo-SecureString -AsPlainText $gitHubToken AccessTokenType = $prefix ApiBaseUri = 'https://api.github.com' ApiVersion = '2022-11-28'