Skip to content

Commit 0b72cdb

Browse files
Merge remote-tracking branch 'origin/beta-releases' into ga-releases
2 parents 9d6f71e + 728ca28 commit 0b72cdb

File tree

658 files changed

+18037
-10607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

658 files changed

+18037
-10607
lines changed

.evergreen/buildvariants.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ buildvariants:
150150
depends_on: package-compass
151151

152152
- name: rhel
153-
display_name: RHEL 7.6 (Test and Package)
154-
run_on: rhel76-large
153+
display_name: RHEL 8.0 (Test and Package)
154+
run_on: rhel80-large
155155
tasks:
156156
- name: check
157157

.evergreen/config.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"run_on": [
44
"ubuntu2004-large",
55
"windows-vsCurrent-large",
6-
"rhel76-large",
6+
"rhel80-large",
77
["macos-1100", { "gui": "macos-1100-gui" }],
88
["macos-1100-arm64", { "gui": "macos-1100-arm64-gui" }]
99
],
@@ -136,7 +136,7 @@
136136
"vars": {
137137
"mongodb_version": "latest-alpha-enterprise"
138138
},
139-
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large"]
139+
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large"]
140140
}
141141
],
142142
"test-web-sandbox": [
@@ -146,15 +146,15 @@
146146
"mongodb_version": "latest-alpha-enterprise",
147147
"browser_name": "chrome"
148148
},
149-
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
149+
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large", "windows-vsCurrent-large"]
150150
},
151151
{
152152
"name": "firefox",
153153
"vars": {
154154
"mongodb_version": "latest-alpha-enterprise",
155155
"browser_name": "firefox"
156156
},
157-
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel76-large", "windows-vsCurrent-large"]
157+
"skip_on": ["macos-1100", "macos-1100-arm64", "rhel80-large", "windows-vsCurrent-large"]
158158
}
159159
]
160160
}
@@ -163,7 +163,7 @@
163163
"short": {
164164
"ubuntu2004-large": "ubuntu",
165165
"windows-vsCurrent-large": "windows",
166-
"rhel76-large": "rhel",
166+
"rhel80-large": "rhel",
167167
"macos-1100": "macos",
168168
"macos-1100-arm64": "macos-arm",
169169
"macos-1100-gui": "macos-gui",
@@ -172,7 +172,7 @@
172172
"long": {
173173
"ubuntu2004-large": "Ubuntu 20.04",
174174
"windows-vsCurrent-large": "Windows 10",
175-
"rhel76-large": "RHEL 7.6",
175+
"rhel80-large": "RHEL 8.0",
176176
"macos-1100": "MacOS x64 11.00",
177177
"macos-1100-arm64": "MacOS arm64 11.00",
178178
"macos-1100-gui": "MacOS x64 11.00 w/ GUI Session",

.evergreen/verify-artifacts.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARTIFACTS_DIR="packages/compass/dist"
66
echo "Verifying artifacts at $ARTIFACTS_DIR"
77
ls -l $ARTIFACTS_DIR
88

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

.evergreen/xvfb-service.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
XVFB=/usr/bin/Xvfb
6-
XVFBARGS=":1 -screen 0 1024x768x24 -ac +extension GLX +render -noreset"
6+
XVFBARGS=":1 -screen 0 1432x840x24 -ac +extension GLX +render -noreset"
77
PIDFILE=/var/run/xvfb.pid
88
case "$1" in
99
start)

.github/workflows/codeql.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ name: "CodeQL"
1414
on:
1515
push:
1616
branches: [ "main", '*-releases' ]
17+
tags: [ 'v*' ]
1718
pull_request:
1819
# The branches below must be a subset of the branches above
1920
branches: [ "main" ]
@@ -53,7 +54,7 @@ jobs:
5354
# Prefix the list here with "+" to use these queries and those in the config file.
5455

5556
# 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
56-
# queries: security-extended,security-and-quality
57+
queries: security-extended
5758
config: |
5859
paths-ignore:
5960
- '**/*.test.js'

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,5 @@ Bailey Pearson <[email protected]>
8282
8383
Paula Stachova <[email protected]>
8484
85+
86+
Alena Khineika <[email protected]>

CONTRIBUTING.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ This repository includes a few recommended plugins for your convenience:
3737

3838
### Working on Plugins
3939

40-
Most of the plugins have their own development environment so you can work on them in isolation. If you want to work on a plugin without running the whole Compass application, you can run `npm run start` in the plugin directory (such as at the top of the `compass/packages/compass-aggregations` directory), either with the help of `lerna` or `npm workspaces`. For example, to start `compass-aggregations` plugin locally, you can either run `npm run start --workspace @mongodb-js/compass-aggregations` from the top of `compass` directory, run `npx lerna run start --scope @mongodb-js/compass-aggregations --stream` from anywhere in the `compass` directory, or run `npm run start` from the top of the `compass/packages/compass-aggregations` directory. Same approaches will work for any other workspace-specific script. If you want to run commands like `test` or `check` only for one specific workspace in the repository, you can use any of the methods described above. As an example, to run all tests in one plugin that you are working on such as the `compass-aggregations` plugin, you can run `npm run test` from the top of the `compass/packages/compass-aggregations` directory.
40+
> [!NOTE]
41+
> For documentation regarding how to write plugin packages, check out the
42+
> [hadron-app-registry](./packages/hadron-app-registry/README.md) documentation.
4143
42-
If you want to see your changes applied in Compass, you might need to rebuild plugins that you changed with the `compile` command. Instead of manually writing out the `scope` you might want to use `lerna --since` filter to rebuild everything since your local or origin `HEAD` of the git history: `npx lerna run compile --stream --since origin/HEAD`. Restarting or hard-reloading (Shift+CMD+R) Compass after compilation is finished should apply your changes.
44+
To run npm scripts inside specific workspaces in the monorepo you can use either `lerna --scope` or `npm --workspace` command line arguments. As an example, to run all tests in one plugin that you are working on such as the `compass-aggregations` plugin, you can run `npm run test --workspace packages/compass-aggregation` or `lerna run test --scope @mongodb-js/compass-aggregations` commands
45+
46+
When running the application locally and changing any code in the monorepo, webpack will take care of automatically rebuilding the modules. In some cases, like changing styles or React component code, webpack might be able to hot-reload the code, but in most cases a page refresh is required to see the changes.
4347

4448
In addition to running lerna commands directly, there are a few convenient npm scripts for working with packages:
4549

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
4444
- [**@mongodb-js/compass-components**](packages/compass-components): React Components used in Compass
4545
- [**@mongodb-js/compass-connection-import-export**](packages/compass-connection-import-export): UI for Compass connection import/export
4646
- [**@mongodb-js/compass-connections**](packages/compass-connections): Manage your MongoDB connections and connect in Compass
47-
- [**@mongodb-js/compass-databases-navigation**](packages/compass-databases-navigation): Databases and collections sidebar navigation tree
47+
- [**@mongodb-js/compass-connections-navigation**](packages/compass-connections-navigation): Databases and collections sidebar navigation tree
4848
- [**@mongodb-js/compass-editor**](packages/compass-editor): Reusable Compass editor component based on ace-editor with MongoDB-specific ace modes, themes, and autocompleters
4949
- [**@mongodb-js/compass-generative-ai**](packages/compass-generative-ai): Shared components and helpers for the generative ai aspects of Compass
5050
- [**@mongodb-js/compass-logging**](packages/compass-logging): Shared helpers for logging in Compass packages

THIRD-PARTY-NOTICES.md

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **Mongodb Compass**.
2-
This document was automatically generated on Thu Apr 04 2024.
2+
This document was automatically generated on Tue Apr 30 2024.
33

44
## List of dependencies
55

@@ -249,7 +249,7 @@ This document was automatically generated on Thu Apr 04 2024.
249249
| **[ejson-shell-parser](#88e1a447c02d9ef3274034c023a5ebcec8188381b1bd951de7c57c140f7f3d4b)** | 2.0.1 | MIT |
250250
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
251251
| **[electron-squirrel-startup](#dcda22e402581a033ec2a017d6d05c094bf3173c1b03ae0471b2ce9078d3f601)** | 1.0.0 | Apache-2.0 |
252-
| **[electron](#ad35eed0d5dc019b2a1b78fbd7a5cc660fa2de2ca7810045df9fdc1866366e7a)** | 28.2.10 | MIT |
252+
| **[electron](#4e183d4b327e0da0de21843054b6fb7903970cc998c3b84a5ef79d7692e563c7)** | 29.3.1 | MIT |
253253
| **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)** | 1.0.2 | MIT |
254254
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
255255
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -449,7 +449,7 @@ This document was automatically generated on Thu Apr 04 2024.
449449
| **[ms](#2083576c5af8054927640b4788059806d07e250a26066c9ccb2d928394fb9226)** | 2.1.3 | MIT |
450450
| **[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)** | 1.0.2 | MIT |
451451
| **[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)** | 0.6.3 | MIT |
452-
| **[node-abi](#20fad7d445931097574f4af1495e728fb65673f1571f4d81ae4f01e6ede407c4)** | 3.57.0 | MIT |
452+
| **[node-abi](#6decee1d1b9007201af4806e0ecb5bf1e8bc345d58c7bdf99c4c2a07f88e2f6e)** | 3.59.0 | MIT |
453453
| **[node-addon-api](#af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8)** | 4.3.0 | MIT |
454454
| **[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)** | 2.6.7 | MIT |
455455
| **[node-fetch](#23d7d5a419e9a25e6384dee4aa24f7162544418f0cdc2d92e94e2cf924507b8c)** | 2.7.0 | MIT |
@@ -582,7 +582,6 @@ This document was automatically generated on Thu Apr 04 2024.
582582
| **[use-sync-external-store](#f7d4a0ea4ee9d814fb264db8103d6ad3a831aa79bf7f3ea70bfa182f8a930f0a)** | 1.2.0 | MIT |
583583
| **[util-deprecate](#a1bd80d6a50b36e34032c402c5204d6276747d8212b68b164a9e3f895b90c2d6)** | 1.0.2 | MIT |
584584
| **[utils-merge](#daf17cb7acc6dd4694e84d0920d7b32dba2be0fcf114309bfce8538812e7c458)** | 1.0.1 | MIT |
585-
| **[uuid](#a34e7819c122fe308fef4f0c9e534d305065097a743da82251b903f2761b2d26)** | 8.3.2 | MIT |
586585
| **[uuid](#8e5d6b0bb24ea0188cd3a88b1f790f104e774bb8ed04c0dac0db7cfe2911227e)** | 9.0.1 | MIT |
587586
| **[vary](#d308bd3935a6f29310b20de016cdb7b3de3aa40a7d4c3365b96e35d2c248d74a)** | 1.1.2 | MIT |
588587
| **[w3c-keyname](#160316b2bf7a19e2cc0418d5ef94b5a999f9092fee3023ac9b2c7d76d2934f5b)** | 2.2.6 | MIT |
@@ -20880,9 +20879,9 @@ License files:
2088020879
See the License for the specific language governing permissions and
2088120880
limitations under the License.
2088220881

20883-
<a id="ad35eed0d5dc019b2a1b78fbd7a5cc660fa2de2ca7810045df9fdc1866366e7a"></a>
20882+
<a id="4e183d4b327e0da0de21843054b6fb7903970cc998c3b84a5ef79d7692e563c7"></a>
2088420883

20885-
### [electron](https://www.npmjs.com/package/electron) (version 28.2.10)
20884+
### [electron](https://www.npmjs.com/package/electron) (version 29.3.1)
2088620885

2088720886
License tags: MIT
2088820887

@@ -29884,9 +29883,9 @@ License files:
2988429883
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2988529884
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2988629885

29887-
<a id="20fad7d445931097574f4af1495e728fb65673f1571f4d81ae4f01e6ede407c4"></a>
29886+
<a id="6decee1d1b9007201af4806e0ecb5bf1e8bc345d58c7bdf99c4c2a07f88e2f6e"></a>
2988829887

29889-
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.57.0)
29888+
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.59.0)
2989029889

2989129890
License tags: MIT
2989229891

@@ -40659,26 +40658,6 @@ License files:
4065940658
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
4066040659
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4066140660

40662-
<a id="a34e7819c122fe308fef4f0c9e534d305065097a743da82251b903f2761b2d26"></a>
40663-
40664-
### [uuid](https://www.npmjs.com/package/uuid) (version 8.3.2)
40665-
40666-
License tags: MIT
40667-
40668-
License files:
40669-
40670-
- LICENSE.md:
40671-
40672-
The MIT License (MIT)
40673-
40674-
Copyright (c) 2010-2020 Robert Kieffer and other contributors
40675-
40676-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
40677-
40678-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
40679-
40680-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
40681-
4068240661
<a id="8e5d6b0bb24ea0188cd3a88b1f790f104e774bb8ed04c0dac0db7cfe2911227e"></a>
4068340662

4068440663
### [uuid](https://www.npmjs.com/package/uuid) (version 9.0.1)

configs/eslint-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.0.17",
3+
"version": "1.1.1",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",
@@ -16,7 +16,7 @@
1616
"@babel/core": "^7.21.4",
1717
"@babel/eslint-parser": "^7.14.3",
1818
"@mongodb-js/eslint-config-devtools": "^0.9.9",
19-
"@mongodb-js/eslint-plugin-compass": "^1.0.15",
19+
"@mongodb-js/eslint-plugin-compass": "^1.0.17",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

0 commit comments

Comments
 (0)