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

Author: github-actions[bot]

.evergreen/buildvariants.yml

@@ -150,8 +150,8 @@ buildvariants:
         depends_on: package-compass
 
   - name: rhel
-    display_name: RHEL 7.6 (Test and Package)
-    run_on: rhel76-large
+    display_name: RHEL 8.0 (Test and Package)
+    run_on: rhel80-large
     tasks:
       - name: check
 

.evergreen/config.json

@@ -3,7 +3,7 @@
     "run_on": [
       "ubuntu2004-large",
       "windows-vsCurrent-large",
-      "rhel76-large",
+      "rhel80-large",
       ["macos-1100", { "gui": "macos-1100-gui" }],
       ["macos-1100-arm64", { "gui": "macos-1100-arm64-gui" }]
     ],
@@ -136,7 +136,7 @@
           "vars": {
             "mongodb_version": "latest-alpha-enterprise"
           },
-          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
+          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large"]
         }
       ],
       "test-web-sandbox": [
@@ -146,15 +146,15 @@
             "mongodb_version": "latest-alpha-enterprise",
             "browser_name": "chrome"
           },
-          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
+          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large", "windows-vsCurrent-large"]
         },
         {
           "name": "firefox",
           "vars": {
             "mongodb_version": "latest-alpha-enterprise",
             "browser_name": "firefox"
           },
-          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
+          "skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large", "windows-vsCurrent-large"]
         }
       ]
     }
@@ -163,7 +163,7 @@
     "short": {
       "ubuntu2004-large": "ubuntu",
       "windows-vsCurrent-large": "windows",
-      "rhel76-large": "rhel",
+      "rhel80-large": "rhel",
       "macos-1100": "macos",
       "macos-1100-arm64": "macos-arm",
       "macos-1100-gui": "macos-gui",
@@ -172,7 +172,7 @@
     "long": {
       "ubuntu2004-large": "Ubuntu 20.04",
       "windows-vsCurrent-large": "Windows 10",
-      "rhel76-large": "RHEL 7.6",
+      "rhel80-large": "RHEL 8.0",
       "macos-1100": "MacOS x64 11.00",
       "macos-1100-arm64": "MacOS arm64 11.00",
       "macos-1100-gui": "MacOS x64 11.00 w/ GUI Session",

.evergreen/verify-artifacts.sh

@@ -6,7 +6,7 @@ ARTIFACTS_DIR="packages/compass/dist"
 echo "Verifying artifacts at $ARTIFACTS_DIR"
 ls -l $ARTIFACTS_DIR
 
-# Use tmp directory for all gpg operations
+# Use tmp directory for all gpg operations/the rpm database
 GPG_HOME=$(mktemp -d)
 TMP_FILE=$(mktemp)
 COMPASS_KEY="https://pgp.mongodb.com/compass.asc"
@@ -45,16 +45,14 @@ verify_using_rpm() {
   # RPM packages are signed using gpg and the signature is embedded in the package.
   # Here, we need to import the key in `rpm` and then verify the signature.
   echo "Importing key into rpm"
-  rpm --import $COMPASS_KEY > "$TMP_FILE" 2>&1
-  # Even if the file is not signed, the command below will exit with 0 and output something like: sha1 md5 OK
+  rpm --dbpath "$GPG_HOME" --import $COMPASS_KEY > "$TMP_FILE" 2>&1
+  # Even if the file is not signed, the command below will exit with 0 and output something like: digests OK
   # So we need to check the output of the command to see if the file is signed successfully.
   echo "Verifying $1 using rpm"
-  output=$(rpm -K $ARTIFACTS_DIR/$1)
-  # Remove the imported key from rpm
-  rpm -e $(rpm -q gpg-pubkey --qf '%{name}-%{version}-%{release}:%{summary}\n' | grep compass | awk -F: '{print $1}')
-  
+  output=$(rpm --dbpath "$GPG_HOME" -K $ARTIFACTS_DIR/$1)
+
   # Check if the output contains the string "pgp md5 OK"
-  if [[ $output != *"pgp md5 OK"* ]]; then
+  if [[ $output != *"digests signatures OK"* ]]; then
     echo "File $1 is not signed"
     exit 1
   fi
@@ -84,4 +82,4 @@ elif [ "$IS_OSX" = true ]; then
 else
   echo "Unknown OS, failed to verify file signing"
   exit 1
-fi
+fi

.github/workflows/codeql.yml

@@ -53,7 +53,7 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
 
         # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
+        queries: security-extended,security-and-quality
         config: |
           paths-ignore:
             - '**/*.test.js'

AUTHORS

@@ -82,3 +82,4 @@ Bailey Pearson <[email protected]>
 Hao <[email protected]>
 Paula Stachova <[email protected]>
 Basit <[email protected]>
+Luca <[email protected]>

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Sun Apr 14 2024.
+This document was automatically generated on Wed Apr 17 2024.
 
 ## List of dependencies
 

configs/webpack-config-compass/package.json

@@ -74,7 +74,7 @@
     "cli-progress": "^3.9.1",
     "core-js": "^3.17.3",
     "css-loader": "^4.3.0",
-    "electron": "^28.2.10",
+    "electron": "^29.3.0",
     "html-webpack-plugin": "^5.3.2",
     "less-loader": "^10.0.1",
     "mini-css-extract-plugin": "^2.3.0",