Skip to content

chore: bump mongodb to 5.7.0 #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 25, 2023
Merged

chore: bump mongodb to 5.7.0 #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29b6513
bump mongodb to 5.7.0
lerouxb Jul 20, 2023
5c4e6a4
Merge branch 'main' into bump-mongodb-5.7.0
lerouxb Jul 20, 2023
157e8f5
remove export error
lerouxb Jul 20, 2023
3e5aadb
Merge branch 'bump-mongodb-5.7.0' of https://github.com/mongodb-js/mo…
lerouxb Jul 20, 2023
801bfb9
these overloads are so awkward
lerouxb Jul 20, 2023
40d46d3
w is readonly
lerouxb Jul 20, 2023
c213172
Merge remote-tracking branch 'origin/main' into bump-mongodb-5.7.0
addaleax Jul 24, 2023
5bdca4d
fixup: regen package-lock, typesafe solution for readonly w
addaleax Jul 24, 2023
0cf2777
fixup: fix tests
addaleax Jul 24, 2023
d8ad8b8
fixup: remove trace around nvm, explicitly pass through node_js_versi…
addaleax Jul 24, 2023
cd12fb2
Merge remote-tracking branch 'origin/main' into bump-mongodb-5.7.0
addaleax Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .evergreen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9097,6 +9097,8 @@ tasks:
node_js_version: "16.20.1"
npm_deps_mode: all
- func: test_connectivity
vars:
node_js_version: "16.20.1"
- name: test_apistrict
tags: ["extra-integration-test"]
depends_on:
Expand Down
2 changes: 2 additions & 0 deletions .evergreen/evergreen.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,8 @@ tasks:
node_js_version: "<% out(NODE_JS_VERSION_16) %>"
npm_deps_mode: all
- func: test_connectivity
vars:
node_js_version: "<% out(NODE_JS_VERSION_16) %>"
- name: test_apistrict
tags: ["extra-integration-test"]
depends_on:
Expand Down
3 changes: 3 additions & 0 deletions .evergreen/install-node.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ else
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"

set +x # nvm is very verbose
echo nvm install --no-progress $NODE_JS_VERSION && nvm alias default $NODE_JS_VERSION
nvm install --no-progress $NODE_JS_VERSION
nvm alias default $NODE_JS_VERSION
set -x

if env PATH="/opt/chefdk/gitbin:$PATH" git --version | grep -q 'git version 1.'; then
(cd "$BASEDIR" &&
Expand Down
3 changes: 3 additions & 0 deletions .evergreen/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ if [ "$OS" != "Windows_NT" ]; then
export NVM_DIR="$HOME/.nvm"
echo "Setting NVM environment home: $NVM_DIR"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
set +x # nvm is very verbose
echo nvm use $NODE_JS_VERSION
nvm use $NODE_JS_VERSION
set -x
export PATH="$NVM_BIN:$PATH"

export CC=gcc
Expand Down
68 changes: 38 additions & 30 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"husky": "^8.0.3",
"lerna": "^4.0.0",
"mocha": "^10.2.0",
"mongodb": "^5.6.0",
"mongodb": "^5.7.0",
"node-gyp": "^9.0.0",
"nyc": "^15.1.0",
"pkg-up": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/arg-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@mongodb-js/tsconfig-mongosh": "^1.0.0",
"depcheck": "^1.4.3",
"eslint": "^7.25.0",
"mongodb": "^5.6.0",
"mongodb": "^5.7.0",
"prettier": "^2.8.8"
}
}
2 changes: 1 addition & 1 deletion packages/cli-repl/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"eslint": "^7.25.0",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"mongodb": "^5.6.0",
"mongodb": "^5.7.0",
"mongodb-crypt-library-dummy": "^1.0.2",
"node-fetch": "^2.6.1",
"prettier": "^2.8.8",
Expand Down
2 changes: 1 addition & 1 deletion packages/service-provider-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@aws-sdk/credential-providers": "^3.347.1",
"@mongosh/errors": "0.0.0-dev.0",
"bson": "^5.3.0",
"mongodb": "^5.6.0",
"mongodb": "^5.7.0",
"mongodb-build-info": "^1.6.2"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/service-provider-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@mongosh/types": "0.0.0-dev.0",
"@types/sinon-chai": "^3.2.4",
"aws4": "^1.11.0",
"mongodb": "^5.6.0",
"mongodb": "^5.7.0",
"mongodb-connection-string-url": "^2.6.0",
"saslprep": "mongodb-js/saslprep#v1.0.4"
},
Expand Down
9 changes: 0 additions & 9 deletions packages/service-provider-server/src/cli-service-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,6 @@ describe('CliServiceProvider', function () {
getSearchIndexesOptions = { allowDiskUse: true };

collectionStub = stubInterface<Collection>();
// @ts-expect-error still @internal
collectionStub.listSearchIndexes.returns(nativeMethodResult);
serviceProvider = new CliServiceProvider(
createClientStub(collectionStub),
Expand All @@ -1123,7 +1122,6 @@ describe('CliServiceProvider', function () {
getSearchIndexesOptions
);
expect(result).to.deep.equal(descriptions);
// @ts-expect-error still @internal
expect(collectionStub.listSearchIndexes).to.have.been.calledWith(
null,
getSearchIndexesOptions
Expand All @@ -1140,7 +1138,6 @@ describe('CliServiceProvider', function () {
getSearchIndexesOptions
);
expect(result).to.deep.equal(descriptions);
// @ts-expect-error still @internal
expect(collectionStub.listSearchIndexes).to.have.been.calledWith(
'my-index',
getSearchIndexesOptions
Expand All @@ -1162,7 +1159,6 @@ describe('CliServiceProvider', function () {
nativeMethodResult = ['index_1'];

collectionStub = stubInterface<Collection>();
// @ts-expect-error still @internal
collectionStub.createSearchIndexes.resolves(nativeMethodResult);
serviceProvider = new CliServiceProvider(
createClientStub(collectionStub),
Expand All @@ -1178,7 +1174,6 @@ describe('CliServiceProvider', function () {
descriptions
);
expect(result).to.deep.equal(nativeMethodResult);
// @ts-expect-error still @internal
expect(collectionStub.createSearchIndexes).to.have.been.calledWith(
descriptions
);
Expand All @@ -1192,7 +1187,6 @@ describe('CliServiceProvider', function () {
indexName = 'foo';

collectionStub = stubInterface<Collection>();
// @ts-expect-error still @internal
collectionStub.dropSearchIndex.resolves();
serviceProvider = new CliServiceProvider(
createClientStub(collectionStub),
Expand All @@ -1208,7 +1202,6 @@ describe('CliServiceProvider', function () {
indexName
);
expect(result).to.deep.equal(undefined);
// @ts-expect-error still @internal
expect(collectionStub.dropSearchIndex).to.have.been.calledWith(indexName);
});
});
Expand All @@ -1223,7 +1216,6 @@ describe('CliServiceProvider', function () {

collectionStub = stubInterface<Collection>();

// @ts-expect-error still @internal
collectionStub.updateSearchIndex.resolves();
serviceProvider = new CliServiceProvider(
createClientStub(collectionStub),
Expand All @@ -1240,7 +1232,6 @@ describe('CliServiceProvider', function () {
description
);
expect(result).to.deep.equal(undefined);
// @ts-expect-error still @internal
expect(collectionStub.updateSearchIndex).to.have.been.calledWith(
indexName,
description
Expand Down
Loading