From 676cb642c420d594a4bec3d341f974c059161fbc Mon Sep 17 00:00:00 2001 From: Marian Epure Date: Tue, 17 Dec 2024 20:29:05 +0200 Subject: [PATCH 1/3] fix oidc request url for PowerShell Module --- .../AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 b/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 index dcc1653d..c3167aed 100644 --- a/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 +++ b/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 @@ -116,7 +116,7 @@ try { } # Request an OIDC token for the service connection from the VSTS REST API - $url = "$Env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI$Env:SYSTEM_TEAMPROJECTID/_apis/distributedtask/hubs/build/plans/$Env:SYSTEM_PLANID/jobs/$Env:SYSTEM_JOBID/oidctoken?api-version=7.1-preview.1&serviceConnectionId=$awsEndpoint" + $url = $Env:SYSTEM_OIDCREQUESTURI + "?api-version=7.1-preview.1&serviceConnectionId=$awsEndpoint" $response = Invoke-WebRequest -Uri $url -Method POST -Headers $Headers -Body '{}' -ContentType "application/json" | ConvertFrom-Json $token = $response.oidcToken From b2fe1b4446f35f0dbe6f902bd2ebf98c9e2e03ad Mon Sep 17 00:00:00 2001 From: jedimanu-ux <55849095+jedimanu-ux@users.noreply.github.com> Date: Tue, 17 Dec 2024 20:33:42 +0200 Subject: [PATCH 2/3] use the correct OIDC request url --- .../AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 b/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 index dcc1653d..c3167aed 100644 --- a/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 +++ b/src/tasks/AWSPowerShellModuleScript/RunAWSPowerShellModuleScript.ps1 @@ -116,7 +116,7 @@ try { } # Request an OIDC token for the service connection from the VSTS REST API - $url = "$Env:SYSTEM_TEAMFOUNDATIONCOLLECTIONURI$Env:SYSTEM_TEAMPROJECTID/_apis/distributedtask/hubs/build/plans/$Env:SYSTEM_PLANID/jobs/$Env:SYSTEM_JOBID/oidctoken?api-version=7.1-preview.1&serviceConnectionId=$awsEndpoint" + $url = $Env:SYSTEM_OIDCREQUESTURI + "?api-version=7.1-preview.1&serviceConnectionId=$awsEndpoint" $response = Invoke-WebRequest -Uri $url -Method POST -Headers $Headers -Body '{}' -ContentType "application/json" | ConvertFrom-Json $token = $response.oidcToken From 2f3770792e414ac63eacfe49cd20870d9769fa3f Mon Sep 17 00:00:00 2001 From: Marian Epure Date: Tue, 17 Dec 2024 20:51:03 +0200 Subject: [PATCH 3/3] add changelog --- .../Bug Fix-4c8c9cea-b7f9-407b-b85e-36fdba5fc17b.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .changes/next-release/Bug Fix-4c8c9cea-b7f9-407b-b85e-36fdba5fc17b.json diff --git a/.changes/next-release/Bug Fix-4c8c9cea-b7f9-407b-b85e-36fdba5fc17b.json b/.changes/next-release/Bug Fix-4c8c9cea-b7f9-407b-b85e-36fdba5fc17b.json new file mode 100644 index 00000000..235f7a1e --- /dev/null +++ b/.changes/next-release/Bug Fix-4c8c9cea-b7f9-407b-b85e-36fdba5fc17b.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "use the correct OIDC request url for the PowerShell task" +} \ No newline at end of file