Merge remote-tracking branch 'origin/beta-releases' into ga-releases

Author: github-actions[bot]

.evergreen/buildvariants.yml

@@ -81,6 +81,12 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         depends_on: package-compass
 
+      - name: test-packaged-app-70x-community
+        depends_on: package-compass
+
+      - name: test-packaged-app-70x-enterprise
+        depends_on: package-compass
+
       - name: test-packaged-app-latest
         depends_on: package-compass
 
@@ -130,6 +136,12 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         depends_on: package-compass
 
+      - name: test-packaged-app-70x-community
+        depends_on: package-compass
+
+      - name: test-packaged-app-70x-enterprise
+        depends_on: package-compass
+
       - name: test-packaged-app-latest
         depends_on: package-compass
 
@@ -179,6 +191,12 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         depends_on: package-compass
 
+      - name: test-packaged-app-70x-community
+        depends_on: package-compass
+
+      - name: test-packaged-app-70x-enterprise
+        depends_on: package-compass
+
   - name: macos
     display_name: MacOS x64 11.00 (Test and Package)
     run_on: macos-1100
@@ -204,6 +222,14 @@ buildvariants:
         run_on: macos-1100-gui
         depends_on: package-compass
 
+      - name: test-packaged-app-70x-community
+        run_on: macos-1100-gui
+        depends_on: package-compass
+
+      - name: test-packaged-app-70x-enterprise
+        run_on: macos-1100-gui
+        depends_on: package-compass
+
   - name: macos-arm
     display_name: MacOS arm64 11.00 (Test and Package)
     run_on: macos-1100-arm64
@@ -228,3 +254,11 @@ buildvariants:
       - name: test-packaged-app-60x-enterprise
         run_on: macos-1100-arm64-gui
         depends_on: package-compass
+
+      - name: test-packaged-app-70x-community
+        run_on: macos-1100-arm64-gui
+        depends_on: package-compass
+
+      - name: test-packaged-app-70x-enterprise
+        run_on: macos-1100-arm64-gui
+        depends_on: package-compass

.evergreen/config.json

@@ -118,6 +118,18 @@
             "mongodb_version": "6.0.x-enterprise"
           }
         },
+        {
+          "name": "70x-community",
+          "vars": {
+            "mongodb_version": "7.0.x"
+          }
+        },
+        {
+          "name": "70x-enterprise",
+          "vars": {
+            "mongodb_version": "7.0.x-enterprise"
+          }
+        },
         {
           "name": "latest",
           "vars": {

.evergreen/functions.yml

@@ -23,6 +23,7 @@ variables:
   - &compass-env
     WORKDIR: ${workdir}
     CI: '1'
+    MONGODB_COMPASS_TEST_USE_PLAIN_SAFE_STORAGE: 'true'
     EVERGREEN: '1'
     EVERGREEN_AUTHOR: ${author}
     EVERGREEN_BRANCH_NAME: ${branch_name}
@@ -438,8 +439,6 @@ functions:
           echo "Running tests against packaged app at $COMPASS_APP_PATH for MongoDB $MONGODB_VERSION..."
 
           if [[ "$IS_OSX" == "true" ]]; then
-            echo "Disabling keychain usage in Compass (TODO: https://jira.mongodb.org/browse/COMPASS-7102)"
-            export COMPASS_E2E_DISABLE_KEYCHAIN_USAGE="true"
             echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
             export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
           fi
@@ -642,3 +641,28 @@ functions:
           if [[ "$EVERGREEN_IS_PATCH" != "true" ]]; then
             exit $return_code
           fi
+
+  generative-ai-accuracy-tests:
+    - command: shell.exec
+      # Fail the task if it's idle for 10 mins
+      timeout_secs: 600
+      params:
+        working_dir: src
+        shell: bash
+        env:
+          <<: *compass-env
+          ATLAS_PUBLIC_KEY: ${atlas_public_key}
+          ATLAS_PRIVATE_KEY: ${atlas_private_key}
+          AI_ACCURACY_RESULTS_MONGODB_CONNECTION_STRING: ${accuracy_results_mdb_connection_string}
+        script: |
+          set -e
+          # Load environment variables
+          eval $(.evergreen/print-compass-env.sh)
+
+          set +e
+          npm run --workspace @mongodb-js/compass-generative-ai ai-accuracy-tests
+          return_code=$?
+          set -e
+
+          # Fail when the accuracy tests fail:
+          exit $return_code

.evergreen/generative-ai-accuracy-test.yml

@@ -0,0 +1,31 @@
+# This evergreen .yml is only used in periodic builds.
+# We don't want it to run on every patch as that would be too many
+# requests to our ai model (expensive).
+
+unset_function_vars: true
+stepback: false
+exec_timeout_secs: 5400
+ignore:
+  - AUTHORS
+  - THIRD-PARTY-NOTICES.md
+include:
+  # Referenced from project root.
+  - filename: .evergreen/functions.yml
+
+tasks:
+  - name: test-generative-ai-accuracy
+    tags: []
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+      - func: generative-ai-accuracy-tests
+        vars:
+          debug: 'compass*,electron*,hadron*,mongo*'
+
+buildvariants:
+  - name: test-generative-ai-accuracy
+    display_name: Generative AI accuracy tests run against cloud-dev mms
+    run_on: ubuntu2004-large
+    tasks:
+      - name: test-generative-ai-accuracy

.evergreen/tasks.yml

@@ -351,6 +351,46 @@ tasks:
           compass_distribution: compass
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 
+  - name: test-packaged-app-70x-community
+    tags: ['required-for-publish', 'run-on-pr']
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars: 
+          mongodb_version: '7.0.x'
+          compass_distribution: compass
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+
+  - name: test-packaged-app-70x-enterprise
+    tags: ['required-for-publish', 'run-on-pr']
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars: 
+          mongodb_version: '7.0.x-enterprise'
+          compass_distribution: compass
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+
   - name: test-packaged-app-latest
     tags: ['required-for-publish', 'run-on-pr']
     commands:

.gitattributes

@@ -1 +1,3 @@
-* text=auto eol=lf
+* text=auto eol=lf
+/packages/bson-transpilers/lib/**/* linguist-generated=true
+packages/compass-crud/test/fixture-results/* linguist-generated=true

.github/workflows/codeql.yml

@@ -62,6 +62,7 @@ jobs:
             - '**/*.spec.ts'
             - '**/*.test.tsx'
             - '**/*.spec.tsx'
+            - 'scripts/**'
 
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)

.snyk

@@ -15,6 +15,11 @@ ignore:
         reason: None Given
         expires: 2024-01-10T00:00:00.000Z
         created: 2023-08-23T16:17:24.728Z
+  SNYK-JS-AXIOS-6032459:
+    - '*':
+        reason: Not applicable to axios usage inside node-analytics package
+        expires: 2024-10-30T10:18:43.435Z
+        created: 2023-10-30T10:18:43.435Z
 # patches apply the minimum changes required to fix a vulnerability
 patch:
   'npm:ms:20170412':

AUTHORS

@@ -77,3 +77,5 @@ Prashant Thakur <[email protected]>
 Kevin Mas Ruiz <[email protected]>
 Taveesh Anand <[email protected]>
 Hinson Chan <[email protected]>
+Gokul Raam <[email protected]>
+Bailey Pearson <[email protected]>