New OIDC fields added, including the GitHub job name and run ID (jfro…

…g#231)
zendesk · Dec 1, 2024 · e7cc33a · e7cc33a
1 parent d788a32
commit e7cc33a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -125,13 +125,17 @@ class Utils {
             const exchangeUrl = jfrogCredentials.jfrogUrl.replace(/\/$/, '') + '/access/api/v1/oidc/token';
             core.debug('Exchanging GitHub JSON web token with a JFrog access token...');
             let projectKey = process.env.JF_PROJECT || '';
+            let jobId = process.env.GITHUB_JOB || '';
+            let runId = process.env.GITHUB_RUN_ID || '';
             const httpClient = new http_client_1.HttpClient();
             const data = `{
             "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
             "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
             "subject_token": "${jsonWebToken}",
             "provider_name": "${oidcProviderName}",
-            "project_key": "${projectKey}"
+            "project_key": "${projectKey}",
+            "gh_job_id": "${jobId}",
+            "gh_run_id": "${runId}"
         }`;
             const additionalHeaders = {
                 'Content-Type': 'application/json',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@jfrog/setup-jfrog-cli",
-    "version": "4.4.2",
+    "version": "4.4.3",
     "private": true,
     "description": "Setup JFrog CLI in GitHub Actions",
     "main": "lib/main.js",

diff --git a/src/utils.ts b/src/utils.ts
@@ -161,6 +161,8 @@ export class Utils {
             "subject_token": "${jsonWebToken}",
             "provider_name": "${oidcProviderName}",
             "project_key": "${projectKey}",
+            "gh_job_id": "${jobId}",
+            "gh_run_id": "${runId}"
         }`;
 
         const additionalHeaders: OutgoingHttpHeaders = {