Skip to content

Commit d0dbf35

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 3094654 + 0719486 commit d0dbf35

File tree

91 files changed

+6369
-3881
lines changed

Some content is hidden

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

91 files changed

+6369
-3881
lines changed

.evergreen/functions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,16 @@ functions:
331331
wait: true
332332
# copy ssh key (this key will be used to connect to ssh server)
333333
- command: shell.exec
334+
silent: true
334335
params:
336+
working_dir: src
335337
shell: bash
338+
env:
339+
__project_aws_ssh_key_value: ${__project_aws_ssh_key_value}
336340
script: |
337341
set -e
338-
{
339-
set +x
340-
echo '${__project_aws_ssh_key_value}' > ~/.ssh/mcipacker.pem
341-
chmod 0600 ~/.ssh/mcipacker.pem
342-
set -x
343-
}
342+
.evergreen/setup-ssh-key.sh
343+
344344
# wait for host to be ready
345345
- command: shell.exec
346346
params:

.evergreen/setup-ssh-key.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#! /usr/bin/env bash
2+
3+
set -e
4+
set +x
5+
echo "${__project_aws_ssh_key_value}" > ~/.ssh/mcipacker.pem
6+
chmod 0600 ~/.ssh/mcipacker.pem

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,4 @@ Hinson Chan <[email protected]>
8080
Gokul Raam <[email protected]>
8181
Bailey Pearson <[email protected]>
8282
83+
Paula Stachova <[email protected]>

THIRD-PARTY-NOTICES.md

Lines changed: 475 additions & 293 deletions
Large diffs are not rendered by default.

package-lock.json

Lines changed: 5401 additions & 3106 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/atlas-service/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"@mongodb-js/compass-logging": "^1.2.12",
7979
"@mongodb-js/compass-utils": "^0.5.11",
8080
"@mongodb-js/devtools-connect": "^2.4.2",
81-
"@mongodb-js/oidc-plugin": "^0.3.0",
81+
"@mongodb-js/oidc-plugin": "^0.3.1",
8282
"compass-preferences-model": "^2.17.4",
8383
"electron": "^28.2.1",
8484
"hadron-ipc": "^3.2.10",

packages/atlas-service/src/main.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ describe('AtlasServiceMain', function () {
495495
preferences,
496496
getUserId: AtlasService['getUserId'],
497497
});
498-
expect(getListenerCount(logger)).to.eq(25);
498+
expect(getListenerCount(logger)).to.eq(26);
499499
// We did all preparations, reset sinon history for easier assertions
500500
sandbox.resetHistory();
501501

packages/compass-aggregations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@mongodb-js/explain-plan-helper": "^1.1.8",
5252
"@mongodb-js/mongodb-constants": "^0.9.0",
5353
"@mongodb-js/my-queries-storage": "^0.4.3",
54-
"bson": "^6.2.0",
54+
"bson": "^6.3.0",
5555
"compass-preferences-model": "^2.17.4",
5656
"hadron-app-registry": "^9.1.6",
5757
"hadron-document": "^8.4.7",
@@ -118,7 +118,7 @@
118118
"@mongodb-js/explain-plan-helper": "^1.1.8",
119119
"@mongodb-js/mongodb-constants": "^0.9.0",
120120
"@mongodb-js/my-queries-storage": "^0.4.3",
121-
"bson": "^6.2.0",
121+
"bson": "^6.3.0",
122122
"compass-preferences-model": "^2.17.4",
123123
"hadron-app-registry": "^9.1.6",
124124
"hadron-document": "^8.4.7",

packages/compass-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"@react-aria/utils": "^3.13.1",
7979
"@react-aria/visually-hidden": "^3.3.1",
8080
"@react-stately/tooltip": "^3.0.5",
81-
"bson": "^6.2.0",
81+
"bson": "^6.3.0",
8282
"focus-trap-react": "^8.4.2",
8383
"hadron-document": "^8.4.7",
8484
"hadron-type-checker": "^7.1.1",

packages/compass-crud/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@mongodb-js/compass-workspaces": "^0.4.4",
6666
"@mongodb-js/explain-plan-helper": "^1.1.8",
6767
"@mongodb-js/my-queries-storage": "^0.4.3",
68-
"bson": "^6.2.0",
68+
"bson": "^6.3.0",
6969
"compass-preferences-model": "^2.17.4",
7070
"hadron-app-registry": "^9.1.6",
7171
"hadron-document": "^8.4.7",
@@ -120,7 +120,7 @@
120120
"@mongodb-js/compass-workspaces": "^0.4.4",
121121
"@mongodb-js/explain-plan-helper": "^1.1.8",
122122
"@mongodb-js/my-queries-storage": "^0.4.3",
123-
"bson": "^6.2.0",
123+
"bson": "^6.3.0",
124124
"compass-preferences-model": "^2.17.4",
125125
"hadron-app-registry": "^9.1.6",
126126
"hadron-document": "^8.4.7",

0 commit comments

Comments
 (0)