🐛 Add system token to Azure git commands and fix action tests (#526)

AndreiIurko · AndreiIurko · commit 92b1ccd75b84 · 2025-10-24T17:24:49.000+03:00
* 🐛 QD-12128 add system token to git * 🐛 Add Go SDK to tests * 🐛 Changes after review * 🐛 Fix git errors
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -366,6 +366,14 @@ jobs:
           git commit -m "Add new feature"
         working-directory: '${{ matrix.directory }}'
         shell: bash
+      - uses: actions/setup-go@v6
+        if: ${{ matrix.arguments == '--ide,QDGO'}}
+        with:
+          go-version: '>=1.25.1'
+      - name: Export GOROOT for subsequent steps
+        if: ${{ matrix.arguments == '--ide,QDGO'}}
+        shell: bash
+        run: echo "GOROOT=$(go env GOROOT)" >> $GITHUB_ENV
       - name: Qodana
         uses: ./
         with:
diff --git a/vsts/QodanaScan/index.js b/vsts/QodanaScan/index.js
@@ -79613,8 +79613,8 @@ var require_utils4 = __commonJS({
         const { sourceBranch, targetBranch } = getSourceAndTargetBranches();
         if (sourceBranch && targetBranch) {
           try {
-            yield git(["fetch", "origin"]);
-            const output = yield gitOutput(["merge-base", "origin/" + sourceBranch, "origin/" + targetBranch], {
+            yield git(["fetch", "origin"], true);
+            const output = yield gitOutput(["merge-base", "origin/" + sourceBranch, "origin/" + targetBranch], false, {
               ignoreReturnCode: true
             });
             if (output.exitCode === 0) {
@@ -79635,13 +79635,13 @@ To enable prMode, consider adding "fetchDepth: 0".`;
         return "";
       });
     }
-    function git(args_1) {
-      return __awaiter2(this, arguments, void 0, function* (args, options = {}) {
-        return (yield gitOutput(args, options)).exitCode;
+    function git(args_1, withCredentials_1) {
+      return __awaiter2(this, arguments, void 0, function* (args, withCredentials, options = {}) {
+        return (yield gitOutput(args, withCredentials, options)).exitCode;
       });
     }
-    function gitOutput(args_1) {
-      return __awaiter2(this, arguments, void 0, function* (args, options = {}) {
+    function gitOutput(args_1, withCredentials_1) {
+      return __awaiter2(this, arguments, void 0, function* (args, withCredentials, options = {}) {
         const result2 = {
           exitCode: 0,
           stdout: "",
@@ -79661,8 +79661,16 @@ To enable prMode, consider adding "fetchDepth: 0".`;
         });
         options.outStream = outStream;
         options.errStream = errStream;
+        if (withCredentials && process.env.SYSTEM_ACCESSTOKEN !== void 0) {
+          args = [
+            "-c",
+            `http.extraheader="AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"`,
+            ...args
+          ];
+        }
         result2.exitCode = yield tl2.execAsync("git", args, options).catch((error) => {
-          tl2.warning(`Failed to run git command with arguments: ${args.join(" ")}`);
+          tl2.warning(`Failed to run git command with arguments: ${args.join(" ")}.
+Error: ${error.message}`);
           throw error;
         });
         if (result2.stdout.startsWith("[command]")) {
@@ -79765,29 +79773,29 @@ ${comment_tag_pattern}`;
           }
           currentBranch = currentBranch.replace("refs/heads/", "");
           currentBranch = (0, qodana_12.validateBranchName)(currentBranch);
-          const currentCommit = (yield gitOutput(["rev-parse", "HEAD"])).stdout.trim();
-          yield git(["config", "user.name", output_12.COMMIT_USER]);
-          yield git(["config", "user.email", output_12.COMMIT_EMAIL]);
-          yield git(["add", "."]);
-          let exitCode = yield git(["commit", "-m", commitMessage], {
+          const currentCommit = (yield gitOutput(["rev-parse", "HEAD"], false)).stdout.trim();
+          yield git(["config", "user.name", output_12.COMMIT_USER], false);
+          yield git(["config", "user.email", output_12.COMMIT_EMAIL], false);
+          yield git(["add", "."], false);
+          let exitCode = yield git(["commit", "-m", commitMessage], false, {
             ignoreReturnCode: true
           });
           if (exitCode !== 0) {
             return;
           }
-          exitCode = yield git(["pull", "--rebase", "origin", currentBranch]);
+          exitCode = yield git(["pull", "--rebase", "origin", currentBranch], true);
           if (exitCode !== 0) {
             return;
           }
           if (mode === qodana_12.BRANCH) {
-            const commitToCherryPick = (yield gitOutput(["rev-parse", "HEAD"])).stdout.trim();
-            yield git(["checkout", currentBranch]);
-            yield git(["cherry-pick", commitToCherryPick]);
+            const commitToCherryPick = (yield gitOutput(["rev-parse", "HEAD"], false)).stdout.trim();
+            yield git(["checkout", currentBranch], false);
+            yield git(["cherry-pick", commitToCherryPick], false);
             yield gitPush(currentBranch);
             console.log(`Pushed quick-fixes to branch ${currentBranch}`);
           } else if (mode === qodana_12.PULL_REQUEST) {
             const newBranch = `qodana/quick-fixes-${currentCommit.slice(0, 7)}`;
-            yield git(["checkout", "-b", newBranch]);
+            yield git(["checkout", "-b", newBranch], false);
             yield gitPush(newBranch);
             yield createPr(commitMessage, currentBranch, newBranch);
             console.log(`Pushed quick-fixes to branch ${newBranch} and created pull request`);
@@ -79799,11 +79807,13 @@ ${comment_tag_pattern}`;
     }
     function gitPush(branch) {
       return __awaiter2(this, void 0, void 0, function* () {
-        const output = yield gitOutput(["push", "origin", branch], {
+        const output = yield gitOutput(["push", "origin", branch], true, {
           ignoreReturnCode: true
         });
         if (output.exitCode !== 0) {
-          tl2.warning(`Failed to push branch ${branch}: ${output.stderr}`);
+          tl2.warning(`Failed to push branch ${branch}.
+Stdout: ${output.stdout}
+Stderr: ${output.stderr}`);
         }
       });
     }
diff --git a/vsts/src/utils.ts b/vsts/src/utils.ts
@@ -215,9 +215,10 @@ async function getPrSha(): Promise<string> {
 
   if (sourceBranch && targetBranch) {
     try {
-      await git(['fetch', 'origin'])
+      await git(['fetch', 'origin'], true)
       const output = await gitOutput(
         ['merge-base', 'origin/' + sourceBranch, 'origin/' + targetBranch],
+        false,
         {
           ignoreReturnCode: true
         }
@@ -243,19 +244,22 @@ To enable prMode, consider adding "fetchDepth: 0".`
 
 async function git(
   args: string[],
+  withCredentials: boolean,
   options: IExecOptions = {}
 ): Promise<number> {
-  return (await gitOutput(args, options)).exitCode
+  return (await gitOutput(args, withCredentials, options)).exitCode
 }
 
 /**
  * Returns trimmed output of git command omitting the command itself
  * i.e., if gitOutput(['status']) is called the "/usr/bin/git status" will be omitted
+ * @param withCredentials pass oauth token as extra header. Could be needed for fetch, push commands
  * @param args git arguments
  * @param options options for azure-pipelines-task-lib/task exec
  */
 async function gitOutput(
   args: string[],
+  withCredentials: boolean,
   options: IExecOptions = {}
 ): Promise<{exitCode: number; stderr: string; stdout: string}> {
   const result = {
@@ -282,8 +286,18 @@ async function gitOutput(
   options.outStream = outStream
   options.errStream = errStream
 
+  if (withCredentials && process.env.SYSTEM_ACCESSTOKEN !== undefined) {
+    args = [
+      '-c',
+      `http.extraheader="AUTHORIZATION: bearer $SYSTEM_ACCESSTOKEN"`,
+      ...args
+    ]
+  }
+
   result.exitCode = await tl.execAsync('git', args, options).catch(error => {
-    tl.warning(`Failed to run git command with arguments: ${args.join(' ')}`)
+    tl.warning(
+      `Failed to run git command with arguments: ${args.join(' ')}.\nError: ${(error as Error).message}`
+    )
     throw error
   })
   if (result.stdout.startsWith('[command]')) {
@@ -443,31 +457,33 @@ export async function pushQuickFixes(
     currentBranch = currentBranch.replace('refs/heads/', '')
     currentBranch = validateBranchName(currentBranch)
 
-    const currentCommit = (await gitOutput(['rev-parse', 'HEAD'])).stdout.trim()
-    await git(['config', 'user.name', COMMIT_USER])
-    await git(['config', 'user.email', COMMIT_EMAIL])
-    await git(['add', '.'])
-    let exitCode = await git(['commit', '-m', commitMessage], {
+    const currentCommit = (
+      await gitOutput(['rev-parse', 'HEAD'], false)
+    ).stdout.trim()
+    await git(['config', 'user.name', COMMIT_USER], false)
+    await git(['config', 'user.email', COMMIT_EMAIL], false)
+    await git(['add', '.'], false)
+    let exitCode = await git(['commit', '-m', commitMessage], false, {
       ignoreReturnCode: true
     })
     if (exitCode !== 0) {
       return
     }
-    exitCode = await git(['pull', '--rebase', 'origin', currentBranch])
+    exitCode = await git(['pull', '--rebase', 'origin', currentBranch], true)
     if (exitCode !== 0) {
       return
     }
     if (mode === BRANCH) {
       const commitToCherryPick = (
-        await gitOutput(['rev-parse', 'HEAD'])
+        await gitOutput(['rev-parse', 'HEAD'], false)
       ).stdout.trim()
-      await git(['checkout', currentBranch])
-      await git(['cherry-pick', commitToCherryPick])
+      await git(['checkout', currentBranch], false)
+      await git(['cherry-pick', commitToCherryPick], false)
       await gitPush(currentBranch)
       console.log(`Pushed quick-fixes to branch ${currentBranch}`)
     } else if (mode === PULL_REQUEST) {
       const newBranch = `qodana/quick-fixes-${currentCommit.slice(0, 7)}`
-      await git(['checkout', '-b', newBranch])
+      await git(['checkout', '-b', newBranch], false)
       await gitPush(newBranch)
       await createPr(commitMessage, currentBranch, newBranch)
       console.log(
@@ -480,11 +496,13 @@ export async function pushQuickFixes(
 }
 
 async function gitPush(branch: string): Promise<void> {
-  const output = await gitOutput(['push', 'origin', branch], {
+  const output = await gitOutput(['push', 'origin', branch], true, {
     ignoreReturnCode: true
   })
   if (output.exitCode !== 0) {
-    tl.warning(`Failed to push branch ${branch}: ${output.stderr}`)
+    tl.warning(
+      `Failed to push branch ${branch}.\nStdout: ${output.stdout}\nStderr: ${output.stderr}`
+    )
   }
 }
 
diff --git a/vsts/vss-extension.dev.json b/vsts/vss-extension.dev.json
@@ -2,7 +2,7 @@
   "manifestVersion": 1,
   "id": "qodana-dev",
   "name": "Qodana (Dev)",
-  "version": "2025.1.216",
+  "version": "2025.2.227",
   "publisher": "JetBrains",
   "targets": [
     {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"manifestVersion": 1,`
`3`	`3`	`"id": "qodana-dev",`
`4`	`4`	`"name": "Qodana (Dev)",`
`5`		`- "version": "2025.1.216",`
	`5`	`+ "version": "2025.2.227",`
`6`	`6`	`"publisher": "JetBrains",`
`7`	`7`	`"targets": [`
`8`	`8`	`{`