Merge branch 'main' of github.com:mongodb-js/vscode into gagik/fix-tests

gagik · gagik · commit b8f4a8038aee · 2025-12-03T12:13:08.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,10 @@ updates:
     directory: /
     schedule:
       interval: daily
+    cooldown:
+      default-days: 7
+      include:
+        - "*"
     allow:
       - dependency-name: mongodb
       - dependency-name: bson
diff --git a/.github/workflows/actions/test-and-build/action.yaml b/.github/workflows/actions/test-and-build/action.yaml
@@ -68,6 +68,7 @@ runs:
     - name: Run Tests
       env:
         NODE_OPTIONS: "--max_old_space_size=4096"
+        MDB_IS_TEST: "true"
       run: |
         npm run test
       shell: bash
diff --git a/.github/workflows/dependabot-pr.yml b/.github/workflows/dependabot-pr.yml
@@ -0,0 +1,22 @@
+---
+name: Dependabot PR
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+      - main
+
+permissions:
+  pull-requests: write
+
+jobs:
+  enable-auto-merge-on-dependabot-pr:
+    name: Enable auto-merge for Dependabot PRs
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/draft-release.yaml b/.github/workflows/draft-release.yaml
@@ -96,6 +96,7 @@ jobs:
           GARASIGN_USERNAME: ${{ secrets.GARASIGN_USERNAME }}
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+          MDB_IS_TEST: "true"
 
       - name: Create Draft Release
         run: |
diff --git a/.github/workflows/test-and-build-from-fork.yaml b/.github/workflows/test-and-build-from-fork.yaml
@@ -1,11 +1,10 @@
 name: Test and Build (from fork)
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - main
 permissions:
-  contents: write
-  pull-requests: write
+  contents: read
 
 jobs:
   test-and-build:
@@ -22,10 +21,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Setup Node.js Environment
         uses: actions/setup-node@v4
@@ -44,18 +39,6 @@ jobs:
       - name: Run Tests
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
-          SEGMENT_KEY: ${{ secrets.SEGMENT_KEY_DEV }}
+          SEGMENT_KEY: "test-segment-key"
+          MDB_IS_TEST: "true"
         run: npm run test
-
-  merge-dependabot-pr:
-    name: Merge Dependabot PR
-    runs-on: ubuntu-latest
-    needs:
-      - test-and-build
-    if: github.event.pull_request.user.login == 'dependabot[bot]'
-    steps:
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/test-and-build.yaml b/.github/workflows/test-and-build.yaml
@@ -56,3 +56,4 @@ jobs:
           GARASIGN_USERNAME: ${{ secrets.GARASIGN_USERNAME }}
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
+          MDB_IS_TEST: "true"
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -53,10 +53,11 @@
         "--extensionTestsPath=${workspaceFolder}/out/test/suite"
       ],
       "env": {
-        "MOCHA_GREP": "${input:mochaGrep}"
+        "MOCHA_GREP": "${input:mochaGrep}",
+        "MDB_IS_TEST": "true"
       },
       "outFiles": ["${workspaceFolder}/out/**/*.js"],
-      "preLaunchTask": "npm: compile:extension",
+      "preLaunchTask": "npm: compile:extension"
     }
   ],
   "inputs": [
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,9 +52,9 @@
     "watch:extension-bundles": "webpack --mode development --watch",
     "pretest": "npm run compile",
     "test": "npm run test-webview && npm run test-extension",
-    "test-extension": "cross-env NODE_OPTIONS=--no-force-async-hooks-checks xvfb-maybe node ./out/test/runTest.js",
-    "test-webview": "cross-env NODE_OPTIONS='--no-experimental-strip-types' mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/setup-webview.ts src/test/suite/views/webview-app/**/*.test.tsx",
-    "ai-accuracy-tests": "cross-env NODE_OPTIONS='--no-experimental-strip-types' mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/ai-accuracy-tests/test-setup.ts ./src/test/ai-accuracy-tests/ai-accuracy-tests.ts",
+    "test-extension": "cross-env MDB_IS_TEST=true NODE_OPTIONS=--no-force-async-hooks-checks xvfb-maybe node ./out/test/runTest.js",
+    "test-webview": "mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/setup-webview.ts src/test/suite/views/webview-app/**/*.test.tsx",
+    "ai-accuracy-tests": "env TS_NODE_FILES=true mocha -r ts-node/register --grep=\"${MOCHA_GREP}\" --file ./src/test/ai-accuracy-tests/test-setup.ts ./src/test/ai-accuracy-tests/ai-accuracy-tests.ts",
     "analyze-bundle": "webpack --mode production --analyze",
     "vscode:prepublish": "npm run clean && npm run compile:constants && npm run compile:resources && webpack --mode production",
     "check": "npm run lint && npm run depcheck",
diff --git a/src/connectionController.ts b/src/connectionController.ts
@@ -738,6 +738,7 @@ export default class ConnectionController {
 
     if (!this._activeDataService) {
       log.error('Unable to disconnect: no active connection');
+      this._disconnecting = false;
       return false;
     }
 
diff --git a/src/editors/playgroundController.ts b/src/editors/playgroundController.ts
@@ -375,10 +375,12 @@ export default class PlaygroundController {
     },
     token: vscode.CancellationToken,
   ): Promise<ShellEvaluateResult> {
-    const connectionId = this._connectionController.getActiveConnectionId();
+    let connectionId = this._connectionController.getActiveConnectionId();
 
     if (!connectionId) {
-      throw new Error(connectBeforeRunningMessage);
+      await this._ensureConnection();
+      connectionId = this._connectionController.getActiveConnectionId();
+      if (!connectionId) throw new Error(connectBeforeRunningMessage);
     }
 
     this._statusView.showMessage('Getting results...');
@@ -420,10 +422,9 @@ export default class PlaygroundController {
     codeToEvaluate: string;
     filePath?: string;
   }): Promise<ShellEvaluateResult> {
-    if (!this._connectionController.isCurrentlyConnected()) {
+    if (!(await this._ensureConnection())) {
       throw new Error(connectBeforeRunningMessage);
     }
-
     return await vscode.window.withProgress(
       {
         location: ProgressLocation.Notification,
@@ -493,14 +494,8 @@ export default class PlaygroundController {
       .getConfiguration('mdb')
       .get('confirmRunCopilotCode');
 
-    if (!this._connectionController.isCurrentlyConnected()) {
-      const successfullyConnected =
-        await this._connectionController.changeActiveConnection();
-
-      if (!successfullyConnected) {
-        void vscode.window.showErrorMessage(connectBeforeRunningMessage);
-        return false;
-      }
+    if (!(await this._ensureConnection())) {
+      return false;
     }
 
     if (shouldConfirmRunCopilotCode === true) {
@@ -537,6 +532,26 @@ export default class PlaygroundController {
     return true;
   }
 
+  async _ensureConnection(): Promise<boolean> {
+    if (this._connectionController.isCurrentlyConnected()) {
+      return true;
+    }
+    const action = await vscode.window.showInformationMessage(
+      'Please connect to a database before running a playground.',
+      { modal: true },
+      'Connect now',
+    );
+    if (action === 'Connect now') {
+      const successfullyConnected =
+        await this._connectionController.changeActiveConnection();
+      if (!successfullyConnected) {
+        void vscode.window.showErrorMessage(connectBeforeRunningMessage);
+      }
+      return successfullyConnected;
+    }
+    return false;
+  }
+
   async _evaluatePlayground({
     codeToEvaluate,
     filePath,
@@ -548,9 +563,7 @@ export default class PlaygroundController {
       .getConfiguration('mdb')
       .get('confirmRunAll');
 
-    if (!this._connectionController.isCurrentlyConnected()) {
-      void vscode.window.showErrorMessage(connectBeforeRunningMessage);
-
+    if (!(await this._ensureConnection())) {
       return false;
     }
 
diff --git a/src/extension.ts b/src/extension.ts
@@ -21,7 +21,9 @@ debug.log = log.debug.bind(log);
 
 import MDBExtensionController from './mdbExtensionController';
 
-let mdbExtension: MDBExtensionController;
+let mdbExtension: MDBExtensionController | undefined;
+
+const isUnderTest = process.env.MDB_IS_TEST === 'true';
 
 // Called when our extension is activated.
 // See "activationEvents" in `package.json` for the events that cause activation.
@@ -51,13 +53,24 @@ export async function activate(
     },
   });
 
-  mdbExtension = new MDBExtensionController(context, {
-    shouldTrackTelemetry: true,
-  });
-  await mdbExtension.activate();
+  // Solution to VSCODE-700. If we are running tests, don't activate the extension.
+  // This avoids registering multiple providers when running the tests, which causes errors in recent versions of vscode.
+  if (isUnderTest) {
+    log.info(
+      'Skipping MDBExtensionController activation because MDB_IS_TEST is set.',
+    );
+    return;
+  }
 
-  // Add our extension to a list of disposables for when we are deactivated.
-  context.subscriptions.push(mdbExtension);
+  if (!mdbExtension) {
+    mdbExtension = new MDBExtensionController(context, {
+      shouldTrackTelemetry: true,
+    });
+    await mdbExtension.activate();
+
+    // Add our extension to a list of disposables for when we are deactivated.
+    context.subscriptions.push(mdbExtension);
+  }
 }
 
 // Called when our extension is deactivated.
diff --git a/src/telemetry/telemetryService.ts b/src/telemetry/telemetryService.ts
@@ -65,7 +65,11 @@ export class TelemetryService {
   }
 
   public getCommonProperties(): Record<string, string | undefined> {
-    return { extension_version: `${version}`, device_id: this.deviceId };
+    return {
+      extension_version: `${version}`,
+      device_id: this.deviceId,
+      app_name: vscode.env.appName || 'Visual Studio Code - Unknown', // e.g., "VS Code" or "Azure Data Studio"
+    };
   }
 
   private async readSegmentKey(): Promise<string | undefined> {
@@ -108,6 +112,7 @@ export class TelemetryService {
       anonymousId: this.anonymousId,
       traits: {
         device_id: this.deviceId,
+        app_name: vscode.env.appName || 'Visual Studio Code - Unknown', // e.g., "VS Code" or "Azure Data Studio"
       },
     };
 
diff --git a/src/test/runTest.ts b/src/test/runTest.ts
@@ -39,7 +39,7 @@ async function main(): Promise<any> {
 
   // Download VS Code, unzip it and run the integration test
   await runTests({
-    version: '1.103.2', // TODO(VSCODE-700) Once we fix the test setup issues, we should revert this to 'insiders'
+    version: 'insiders',
     extensionDevelopmentPath,
     extensionTestsPath,
     launchArgs: [testWorkspace, '--disable-extensions'],
diff --git a/src/test/suite/connectionController.test.ts b/src/test/suite/connectionController.test.ts
@@ -45,7 +45,7 @@ const sleep = (ms: number): Promise<void> => {
 };
 
 suite('Connection Controller Test Suite', function () {
-  this.timeout(5000);
+  this.timeout(10000);
 
   const extensionContextStub = new ExtensionContextStub();
   const testStorageController = new StorageController(extensionContextStub);
@@ -76,6 +76,8 @@ suite('Connection Controller Test Suite', function () {
     extensionContextStub._workspaceState = {};
     extensionContextStub._globalState = {};
 
+    testConnectionController.cancelConnectionAttempt();
+
     await testConnectionController.disconnect();
     testConnectionController.clearAllConnections();
 
diff --git a/src/test/suite/editors/playgroundController.test.ts b/src/test/suite/editors/playgroundController.test.ts
diff --git a/src/test/suite/editors/playgroundSelectionCodeActionProvider.test.ts b/src/test/suite/editors/playgroundSelectionCodeActionProvider.test.ts
diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts
diff --git a/src/test/suite/language/languageServerController.test.ts b/src/test/suite/language/languageServerController.test.ts
diff --git a/src/test/suite/telemetry/telemetryService.test.ts b/src/test/suite/telemetry/telemetryService.test.ts
diff --git a/src/test/suite/views/webviewController.test.ts b/src/test/suite/views/webviewController.test.ts

Original file line number	Diff line number	Diff line change
`@@ -738,6 +738,7 @@ export default class ConnectionController {`
`738`	`738`
`739`	`739`	`if (!this._activeDataService) {`
`740`	`740`	`log.error('Unable to disconnect: no active connection');`
	`741`	`+ this._disconnecting = false;`
`741`	`742`	`return false;`
`742`	`743`	`}`
`743`	`744`