Merge branch 'main' into AXON-1383-rovo-dev-is-disabled

Author: sspanchenko

.github/workflows/build.yaml

@@ -2,6 +2,7 @@ name: Build
 permissions:
   contents: read
   packages: read
+  actions: write
 
 on:
   pull_request:
@@ -14,18 +15,55 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
+  setup-dependencies:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
+        
+      - name: Cache npm dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.npm
+            node_modules
+          key: npm-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            npm-${{ runner.os }}-
 
       - name: Install dependencies
-        run: |
-          npm ci --no-audit
+        run: npm ci
+
+      - name: Compress node_modules
+        run: tar -czf node_modules.tar.gz node_modules
+
+      - name: Upload node_modules for reuse
+        uses: actions/upload-artifact@v4
+        with:
+          name: node-modules
+          path: node_modules.tar.gz
+          retention-days: 1
+
+  lint:
+    needs: [setup-dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      
+      - name: Download node_modules
+        uses: actions/download-artifact@v4
+        with:
+          name: node-modules
+
+      - name: Extract node_modules
+        run: tar -xzf node_modules.tar.gz
 
       - name: Run vulnerability audit
         # "There is no Vulnerability in Media Viewer after 48.5.4. since it was fixed by patching, but npm audit still reports it.",
@@ -35,22 +73,66 @@ jobs:
       - name: Run linter
         run: npm run lint
 
-  ci-matrix:
-    needs: [lint]
+  test-unit:
+    needs: [setup-dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      
+      - name: Download node_modules
+        uses: actions/download-artifact@v4
+        with:
+          name: node-modules
+
+      - name: Extract node_modules
+        run: tar -xzf node_modules.tar.gz
+
+      - name: Run unit tests
+        run: npm test
+
+  build-extension:
+    needs: [setup-dependencies]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      
+      - name: Download node_modules
+        uses: actions/download-artifact@v4
+        with:
+          name: node-modules
+
+      - name: Extract node_modules
+        run: tar -xzf node_modules.tar.gz
+
+      - name: Package the extension
+        run: npm run extension:package
+
+      - name: Upload extension package
+        uses: actions/upload-artifact@v4
+        with:
+          name: extension-package
+          path: atlascode-*.vsix
+          retention-days: 1
+
+  test-e2e:
+    needs: [build-extension]
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        include:
-          - kind: unit
-          - kind: e2e
-            target: jira-cloud
-          - kind: e2e
-            target: jira-dc
-          - kind: e2e
-            target: bitbucket-cloud
-          - kind: e2e
-            target: bitbucket-dc
+        target:
+          - jira-cloud
+          - jira-dc
+          - bitbucket-cloud
+          - bitbucket-dc
 
     env:
       ATLASCODE_FX3_API_KEY: ${{ secrets.ATLASCODE_FX3_API_KEY }}
@@ -60,40 +142,39 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
-
-      - name: Install dependencies
-        run: npm ci --no-audit
+      
+      - name: Download node_modules
+        uses: actions/download-artifact@v4
+        with:
+          name: node-modules
 
-      - name: Run unit tests
-        if: matrix.kind == 'unit'
-        run: npm run test
+      - name: Extract node_modules
+        run: tar -xzf node_modules.tar.gz
 
-      - name: Build and package the extension
-        if: matrix.kind == 'e2e'
-        run: npm run extension:package
+      - name: Download extension package
+        uses: actions/download-artifact@v4
+        with:
+          name: extension-package
 
       - name: Generate SSL certs for E2E test
-        if: matrix.kind == 'e2e'
         run: npm run test:e2e:sslcerts
 
       - name: Fetch E2E image
-        if: matrix.kind == 'e2e'
         run: |
           docker pull ghcr.io/atlassian/atlascode-e2e:latest
           docker tag ghcr.io/atlassian/atlascode-e2e:latest atlascode-e2e
 
       - name: Run E2E (${{ matrix.target }})
-        if: matrix.kind == 'e2e'
         run: npm run test:e2e:docker
         env:
           TARGET: ${{ matrix.target }}
 
       - name: Upload E2E artifacts (${{ matrix.target }})
-        if: matrix.kind == 'e2e' && failure()
+        if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: e2e-test-results-${{ matrix.target }}
@@ -102,14 +183,35 @@ jobs:
           if-no-files-found: ignore
 
   finalize:
-    needs: [ci-matrix]
+    needs: [setup-dependencies, lint, test-unit, build-extension, test-e2e]
     runs-on: ubuntu-latest
     if: always()
     steps:
+      - name: Delete node_modules artifact
+        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: node-modules
+          failOnError: false
+
+      - name: Delete extension package artifact
+        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: extension-package
+          failOnError: false
+
       - name: Check if all jobs succeeded
         run: |
-          if [[ "${{ needs.ci-matrix.result }}" != "success" ]]; then
-            echo "One of the ci-matrix jobs failed"
+          results='${{ toJSON(needs.*.result) }}'
+          if echo "$results" | jq -e 'any(. != "success")' > /dev/null; then
+            echo "One or more jobs failed:"
+            echo "  setup-dependencies: ${{ needs.setup-dependencies.result }}"
+            echo "  lint: ${{ needs.lint.result }}"
+            echo "  test-unit: ${{ needs.test-unit.result }}"
+            echo "  build-extension: ${{ needs.build-extension.result }}"
+            echo "  test-e2e: ${{ needs.test-e2e.result }}"
+            echo "Artifacts are retained for 1 day to allow rerunning failed jobs"
             exit 1
           fi
-          echo "All steps completed successfully"
+          echo "All steps completed successfully"

package.json

@@ -46,7 +46,7 @@
     ],
     "main": "./build/extension/extension",
     "rovoDev": {
-        "version": "0.12.14"
+        "version": "0.12.16"
     },
     "scripts": {
         "vscode:uninstall": "node ./build/extension/uninstall.js",
@@ -517,6 +517,11 @@
                 "command": "atlascode.debug.quickLogout",
                 "title": "[DEBUG] Atlassian: Quick logout",
                 "enablement": "atlascode:debugMode"
+            },
+            {
+                "command": "atlascode.addRecommendedExtension",
+                "title": "Add as Recommended Extension",
+                "category": "Atlassian"
             }
         ],
         "viewsContainers": {

src/analytics.test.ts

@@ -264,7 +264,7 @@ describe('analytics', () => {
             expect(event.trackEvent.attributes.additionalParams).toEqual(additionalParams);
         });
 
-        it('should sanitize stack traces in errorEvent', async () => {
+        it('should sanitize stack traces in errorEvent (/Users)', async () => {
             const errorMessage = 'Test error message';
             const error = new Error('Test error');
             error.stack = 'Error: Test error\n    at TestFunction (/Users/realuser/test.js:10:15)';
@@ -276,6 +276,30 @@ describe('analytics', () => {
             expect(event.trackEvent.attributes.stack).not.toContain('/Users/realuser/');
         });
 
+        it('should sanitize stack traces in errorEvent (/home)', async () => {
+            const errorMessage = 'Test error message';
+            const error = new Error('Test error');
+            error.stack = 'Error: Test error\n    at TestFunction (/home/realuser/test.js:10:15)';
+
+            const event = await analytics.errorEvent(undefined, errorMessage, error);
+
+            // Check if the username was sanitized
+            expect(event.trackEvent.attributes.stack).toContain('/home/<user>/');
+            expect(event.trackEvent.attributes.stack).not.toContain('/home/realuser/');
+        });
+
+        it('should sanitize stack traces in errorEvent (c:\\Users)', async () => {
+            const errorMessage = 'Test error message';
+            const error = new Error('Test error');
+            error.stack = 'Error: Test error\n    at TestFunction (c:\\Users\\realuser\\test.js:10:15)';
+
+            const event = await analytics.errorEvent(undefined, errorMessage, error);
+
+            // Check if the username was sanitized
+            expect(event.trackEvent.attributes.stack).toContain('c:\\Users\\<user>\\');
+            expect(event.trackEvent.attributes.stack).not.toContain('c:\\Users\\realuser\\');
+        });
+
         it('should create uiErrorEvent with UI error information', async () => {
             const errorInfo: UIErrorInfo = {
                 view: 'test-view',

src/analytics.ts

@@ -145,6 +145,7 @@ function sanitazeErrorMessage(message?: string): string | undefined {
 function sanitizeStackTrace(stack?: string): string | undefined {
     if (stack) {
         stack = stack.replace(/\/Users\/[^/]+\//gi, '/Users/<user>/'); // *nix Users folder
+        stack = stack.replace(/\/home\/[^/]+\//gi, '/home/<user>/'); // *nix home folder
         stack = stack.replace(/\\Users\\[^\\]+\\/gi, '\\Users\\<user>\\'); // windows Users folder
     }
     return stack || undefined;
@@ -521,6 +522,12 @@ export async function pmfClosed(): Promise<TrackEvent> {
     return trackEvent('closed', 'atlascodePmf');
 }
 
+export async function addRecommendedExtensionTriggeredEvent(source: string): Promise<TrackEvent> {
+    return trackEvent('triggered', 'addRecommendedExtension', {
+        attributes: { source: source },
+    });
+}
+
 export type DeepLinkEventErrorType = 'Success' | 'NotFound' | 'Exception';
 
 export async function deepLinkEvent(

src/commands.ts

@@ -10,6 +10,7 @@ import {
 } from './analytics';
 import { BasicAuthInfo, DetailedSiteInfo, ProductBitbucket, ProductJira } from './atlclients/authInfo';
 import { showBitbucketDebugInfo } from './bitbucket/bbDebug';
+import { addAtlascodeAsRecommendedExtension } from './commands/addRecommendedExtension';
 import { rerunPipeline } from './commands/bitbucket/rerunPipeline';
 import { runPipeline } from './commands/bitbucket/runPipeline';
 import { assignIssue } from './commands/jira/assignIssue';
@@ -237,6 +238,7 @@ export function registerCommands(vscodeContext: ExtensionContext) {
                     });
                 }
             }),
+            commands.registerCommand(Commands.AddRecommendedExtension, addAtlascodeAsRecommendedExtension),
         );
     } else {
         vscodeContext.subscriptions.push(
@@ -449,6 +451,7 @@ export function registerCommands(vscodeContext: ExtensionContext) {
                     });
                 }
             }),
+            commands.registerCommand(Commands.AddRecommendedExtension, addAtlascodeAsRecommendedExtension),
         );
     }
 }