@socketsecurity/cli-with-sentry 0.15.1 → 0.15.3

package/dist/cli.js

@@ -3494,6 +3494,8 @@ const cmdDiffScan = {
   }
 }
 
+const GITHUB_ACTIONS_BOT_USERNAME = 'github-actions[bot]'
+const GITHUB_ACTIONS_BOT_EMAIL = `${GITHUB_ACTIONS_BOT_USERNAME}@users.noreply.github.com`
 function formatBranchName(str) {
   return str
     .replace(/[-_.\\/]+/g, '-')
@@ -3571,6 +3573,7 @@ async function gitCreateAndPushBranchIfNeeded(
     logger.logger.warn('Nothing to commit, skipping push.')
     return false
   }
+  await gitEnsureIdentity(cwd)
   await spawn.spawn('git', ['checkout', '-b', branch], {
     cwd
   })
@@ -3600,6 +3603,48 @@ async function gitCreateAndPushBranchIfNeeded(
   logger.logger.warn(`Force-push failed for "${branch}"`)
   return false
 }
+async function gitEnsureIdentity(cwd = process.cwd()) {
+  let hasUserName = false
+  try {
+    const { stdout } = await spawn.spawn(
+      'git',
+      ['config', '--get', 'user.name'],
+      {
+        cwd
+      }
+    )
+    hasUserName = !!stdout.trim()
+  } catch {}
+  if (!hasUserName) {
+    await spawn.spawn(
+      'git',
+      ['config', 'user.name', GITHUB_ACTIONS_BOT_USERNAME],
+      {
+        cwd
+      }
+    )
+  }
+  let hasUserEmail = false
+  try {
+    const { stdout } = await spawn.spawn(
+      'git',
+      ['config', '--get', 'user.email'],
+      {
+        cwd
+      }
+    )
+    hasUserEmail = !!stdout.trim()
+  } catch {}
+  if (!hasUserEmail) {
+    await spawn.spawn(
+      'git',
+      ['config', 'user.email', GITHUB_ACTIONS_BOT_EMAIL],
+      {
+        cwd
+      }
+    )
+  }
+}
 async function gitResetAndClean(branch = 'HEAD', cwd = process.cwd()) {
   // Discards tracked changes.
   await gitResetHard(branch, cwd)
@@ -3642,8 +3687,9 @@ let _octokit
 function getOctokit() {
   if (_octokit === undefined) {
     _octokit = new vendor.Octokit({
-      // Lazily access constants.ENV.SOCKET_SECURITY_GITHUB_PAT.
-      auth: constants.ENV.SOCKET_SECURITY_GITHUB_PAT
+      // Lazily access constants.ENV properties.
+      auth:
+        constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN
     })
   }
   return _octokit
@@ -3653,8 +3699,8 @@ function getOctokitGraphql() {
   if (!_octokitGraphql) {
     _octokitGraphql = vendor.graphql2.defaults({
       headers: {
-        // Lazily access constants.ENV.SOCKET_SECURITY_GITHUB_PAT.
-        authorization: `token ${constants.ENV.SOCKET_SECURITY_GITHUB_PAT}`
+        // Lazily access constants.ENV properties.
+        authorization: `token ${constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN}`
       }
     })
   }
@@ -3921,12 +3967,10 @@ async function openPr(owner, repo, branch, purl, newVersion, options) {
   }
   // Lazily access constants.ENV.GITHUB_ACTIONS.
   if (constants.ENV.GITHUB_ACTIONS) {
-    // Lazily access constants.ENV.SOCKET_SECURITY_GITHUB_PAT.
-    const pat = constants.ENV.SOCKET_SECURITY_GITHUB_PAT
-    if (!pat) {
-      throw new Error('Missing SOCKET_SECURITY_GITHUB_PAT environment variable')
-    }
-    const url = `https://x-access-token:${pat}@github.com/${owner}/${repo}`
+    // Lazily access constants.ENV properties.
+    const token =
+      constants.ENV.SOCKET_SECURITY_GITHUB_PAT || constants.ENV.GITHUB_TOKEN
+    const url = `https://x-access-token:${token}@github.com/${owner}/${repo}`
     await spawn.spawn('git', ['remote', 'set-url', 'origin', url], {
       cwd
     })
@@ -12253,5 +12297,5 @@ void (async () => {
     await utils.captureException(e)
   }
 })()
-//# debugId=abfabeab-23a3-4c14-b82b-b4de769ddb01
+//# debugId=87f7bc74-4cec-42a0-bcfb-577373e143fd
 //# sourceMappingURL=cli.js.map