Skip to content

Commit 8c1e220

Browse files
committed
fix: strip unknown preferences when loading COMPASS-7026 (#4654)
strip unknown preferences when loading
2 parents e652548 + 385fafd commit 8c1e220

File tree

434 files changed

+71334
-76328
lines changed

Some content is hidden

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

434 files changed

+71334
-76328
lines changed

.depalignrc.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@
4848
"numeral": [
4949
"^1.5.6"
5050
],
51-
"mongodb-query-util": [
52-
"^0.2.1",
53-
"^0.0.3"
54-
],
5551
"babel-loader": [
5652
"^7.1.5"
5753
],

.evergreen/functions.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@ functions:
169169
set -e
170170
eval $(.evergreen/print-compass-env.sh)
171171
172+
# Pre-built binaries for keytar do not support older RHEL versions.
173+
# Since we have started importing keytar from top-level scripts in packages,
174+
# re-built keytar before the bootstrap process so that it is always usable.
175+
if [[ "$IS_RHEL" == "true" ]]; then
176+
echo "Rebuilding packages for rhel"
177+
npm run node-rebuild
178+
fi
179+
172180
# Prepare workspaces in provided scope
173181
npx lerna run bootstrap \
174182
--stream \
@@ -549,7 +557,7 @@ functions:
549557
npm config list
550558
echo "Publishing packages as $(npm whoami)"
551559
git update-index --assume-unchanged .npmrc
552-
npm run publish-packages-next
560+
bash ".evergreen/retry-with-backoff.sh" npm run publish-packages-next
553561
fi
554562
555563
generate-vulnerability-report:

.snyk

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ version: v1.25.0
44
ignore:
55
SNYK-JS-SEMVER-3247795:
66
- '*':
7-
reason: "Security patches released for semver 5.x (5.7.2) and 6.x (6.3.1) are not yet known to Snyk which is why we would like to ignore this vulnerability until the mentioned expiry."
7+
reason: >-
8+
Security patches released for semver 5.x (5.7.2) and 6.x (6.3.1) are
9+
not yet known to Snyk which is why we would like to ignore this
10+
vulnerability until the mentioned expiry.
811
expires: 2023-08-11T09:00:55.553Z
912
created: 2023-07-12T09:00:55.557Z
13+
SNYK-JS-AGGRIDCOMMUNITY-1932011:
14+
- '*':
15+
reason: None Given
16+
expires: 2023-08-18T09:51:32.172Z
17+
created: 2023-07-19T09:51:32.175Z
1018
# patches apply the minimum changes required to fix a vulnerability
1119
patch:
1220
'npm:ms:20170412':

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,5 @@ Cem Asma <[email protected]>
7474
Ewan Higgs <[email protected]>
7575
7676
Prashant Thakur <[email protected]>
77+
Kevin Mas Ruiz <[email protected]>
78+
Taveesh Anand <[email protected]>

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,6 @@ The root cause is native modules compiled for a different version of the runtime
138138
1. Modules have to be recompiled for the runtime they will be used in
139139
1. Due to npm workspaces hoisting all shared dependencies to the very root of the monorepo, all packages use the same modules imported from the same location
140140

141-
This means that if you e.g., start Compass application locally it will recompile all native modules to work in Electron runtime, if you would try to run tests for `mongodb-connection-model` library right after that, tests would fail due to `keytar` library not being compatible with Node.js environment that the tests are running in.
141+
This means that if you e.g., start Compass application locally it will recompile all native modules to work in Electron runtime, if you would try to run tests for `@mongodb-js/connection-storage` library right after that, tests would fail due to `keytar` library not being compatible with Node.js environment that the tests are running in.
142142

143143
If you run into this issue, make sure that native modules are rebuilt for whatever runtime you are planning to use at the moment. To help with that we provide two npm scripts: `npm run electron-rebuild` will recompile native modules to work with Electron and `npm run node-rebuild` will recompile them to work with Node.js.

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
6363
- [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
6464
- [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
6565
- [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model
66-
- [**compass-user-model**](packages/compass-user-model): MongoDB user model
6766
- [**electron-license**](packages/electron-license): Tools for electron apps to work with licenses
6867
- [**hadron-app**](packages/hadron-app): Hadron Application Singleton
6968
- [**hadron-app-registry**](packages/hadron-app-registry): Hadron App Registry
@@ -73,12 +72,10 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
7372
- [**hadron-reflux-store**](packages/reflux-store): Hadron Reflux Stores
7473
- [**hadron-type-checker**](packages/hadron-type-checker): Hadron Type Checker
7574
- [**mongodb-collection-model**](packages/collection-model): MongoDB collection model
76-
- [**mongodb-connection-model**](packages/connection-model): MongoDB connection model
7775
- [**mongodb-data-service**](packages/data-service): MongoDB Data Service
7876
- [**mongodb-database-model**](packages/database-model): MongoDB database model
7977
- [**mongodb-explain-compat**](packages/mongodb-explain-compat): Convert mongodb SBE explain output to 4.4 explain output
8078
- [**mongodb-instance-model**](packages/instance-model): MongoDB instance model
81-
- [**storage-mixin**](packages/storage-mixin): Ampersand model mixin to persist data via various storage backends
8279

8380
### Shared Configuration Files
8481

0 commit comments

Comments
 (0)