Skip to content

Commit a880336

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 510c8c0 + f5f5104 commit a880336

File tree

99 files changed

+3093
-2442
lines changed

Some content is hidden

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

99 files changed

+3093
-2442
lines changed

‎.evergreen/start-docker-envs.sh‎

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,69 @@
22

33
set -e
44

5-
if ! command -v docker &>/dev/null; then
6-
echo "docker could not be found"
7-
elif ! command -v docker-compose &>/dev/null; then
8-
echo "docker-compose could not be found"
9-
else
10-
echo "Starting test environments"
11-
12-
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
5+
DOCKER_COMPOSE="env MONGODB_VERSION= docker compose"
6+
7+
echo "Checking if docker is available ..."
8+
9+
if ! docker version &>/dev/null; then
10+
echo " docker could not be found"
11+
exit
12+
elif ! docker compose version &>/dev/null; then
13+
echo " docker compose could not be found, trying standalone docker-compose as a fallback"
14+
if ! docker-compose version &>/dev/null; then
15+
echo " docker-compose could not be found"
16+
exit
17+
fi
18+
# TODO(COMPASS-7687): This is only here because of rhel76 that is old enough
19+
# that the docker version installed there doesn't include compose. DevProd
20+
# team suggests that we should switch to Podman on RHEL
1321
DOCKER_COMPOSE="env MONGODB_VERSION= docker-compose"
14-
LOGS_DIR="$SCRIPT_DIR/logs"
15-
mkdir -p "$LOGS_DIR"
16-
17-
git clone -b v1.2.5 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
18-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
19-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
20-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d
21-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml up -d
22-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml up -d
23-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml up -d
24-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml up -d
25-
26-
__stop_all_docker_containers() {
27-
echo "Stopping test environments"
28-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml ps > $LOGS_DIR/docker-enterprise.ps || true;
29-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml ps > $LOGS_DIR/docker-ldap.ps || true;
30-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml ps > $LOGS_DIR/docker-scram.ps || true;
31-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml ps > $LOGS_DIR/docker-sharded.ps || true;
32-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml ps > $LOGS_DIR/docker-ssh.ps || true;
33-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml ps > $LOGS_DIR/docker-tls.ps || true;
34-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml ps > $LOGS_DIR/docker-kerberos.ps || true;
35-
36-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml logs > $LOGS_DIR/docker-enterprise.log || true;
37-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml logs > $LOGS_DIR/docker-ldap.log || true;
38-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml logs > $LOGS_DIR/docker-scram.log || true;
39-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml logs > $LOGS_DIR/docker-sharded.log || true;
40-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml logs > $LOGS_DIR/docker-ssh.log || true;
41-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml logs > $LOGS_DIR/docker-tls.log || true;
42-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml logs > $LOGS_DIR/docker-kerberos.log || true;
43-
44-
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
45-
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
46-
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
47-
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
48-
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
49-
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
50-
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
51-
}
52-
53-
trap "__stop_all_docker_containers" EXIT
5422
fi
23+
24+
echo "Found docker:"
25+
docker version
26+
$DOCKER_COMPOSE version
27+
28+
echo "Starting test environments"
29+
30+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
31+
LOGS_DIR="$SCRIPT_DIR/logs"
32+
mkdir -p "$LOGS_DIR"
33+
34+
git clone -b v1.2.5 --single-branch https://github.com/mongodb-js/devtools-docker-test-envs.git test-envs
35+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml up -d
36+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml up -d
37+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml up -d
38+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml up -d
39+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml up -d
40+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml up -d
41+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml up -d
42+
43+
__stop_all_docker_containers() {
44+
echo "Stopping test environments"
45+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml ps >$LOGS_DIR/docker-enterprise.ps || true
46+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml ps >$LOGS_DIR/docker-ldap.ps || true
47+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml ps >$LOGS_DIR/docker-scram.ps || true
48+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml ps >$LOGS_DIR/docker-sharded.ps || true
49+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml ps >$LOGS_DIR/docker-ssh.ps || true
50+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml ps >$LOGS_DIR/docker-tls.ps || true
51+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml ps >$LOGS_DIR/docker-kerberos.ps || true
52+
53+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml logs >$LOGS_DIR/docker-enterprise.log || true
54+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml logs >$LOGS_DIR/docker-ldap.log || true
55+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml logs >$LOGS_DIR/docker-scram.log || true
56+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml logs >$LOGS_DIR/docker-sharded.log || true
57+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml logs >$LOGS_DIR/docker-ssh.log || true
58+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml logs >$LOGS_DIR/docker-tls.log || true
59+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml logs >$LOGS_DIR/docker-kerberos.log || true
60+
61+
$DOCKER_COMPOSE -f test-envs/docker/enterprise/docker-compose.yaml down -v --remove-orphans
62+
$DOCKER_COMPOSE -f test-envs/docker/ldap/docker-compose.yaml down -v --remove-orphans
63+
$DOCKER_COMPOSE -f test-envs/docker/scram/docker-compose.yaml down -v --remove-orphans
64+
$DOCKER_COMPOSE -f test-envs/docker/sharded/docker-compose.yaml down -v --remove-orphans
65+
$DOCKER_COMPOSE -f test-envs/docker/ssh/docker-compose.yaml down -v --remove-orphans
66+
$DOCKER_COMPOSE -f test-envs/docker/tls/docker-compose.yaml down -v --remove-orphans
67+
$DOCKER_COMPOSE -f test-envs/docker/kerberos/docker-compose.yaml down -v --remove-orphans
68+
}
69+
70+
trap "__stop_all_docker_containers" EXIT

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 7 additions & 7 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 Tue Feb 27 2024.
2+
This document was automatically generated on Thu Feb 29 2024.
33

44
## List of dependencies
55

@@ -246,7 +246,7 @@ This document was automatically generated on Tue Feb 27 2024.
246246
| **[ejson-shell-parser](#88e1a447c02d9ef3274034c023a5ebcec8188381b1bd951de7c57c140f7f3d4b)** | 2.0.1 | MIT |
247247
| **[electron-dl](#e97e034c7b93c63e7a433d75f6f1de3e0668764225ebbd61dbde8d1b55d6f3b7)** | 3.5.0 | MIT |
248248
| **[electron-squirrel-startup](#dcda22e402581a033ec2a017d6d05c094bf3173c1b03ae0471b2ce9078d3f601)** | 1.0.0 | Apache-2.0 |
249-
| **[electron](#fbe31ba116fedfb4c83039ff76fc6f1f617048e031e4b0f3bf2bf6a9102389f1)** | 28.2.1 | MIT |
249+
| **[electron](#57679565310025c14cb661f0144f4d7a546a13b033a51522ca20a3fe4c3d9c43)** | 28.2.5 | MIT |
250250
| **[encodeurl](#b89152db475e86531e570f87b45d8a51aa5e5d87d4cc3b960cee7b8febf1d26a)** | 1.0.2 | MIT |
251251
| **[end-of-stream](#fadc10994f5fa767d06fb25cfff35fb17a895daf3bc3477c782907668ed16563)** | 1.4.4 | MIT |
252252
| **[ensure-error](#3b1eba5276d89414cef21a1007e85c4f1d6749bf57b300e082ab23975a41dbc9)** | 3.0.1 | MIT |
@@ -446,7 +446,7 @@ This document was automatically generated on Tue Feb 27 2024.
446446
| **[mustache](#9e574ae3fa6282e512b5f57e7b1b1e9463c95d0301c65e2684cb120df415c5ee)** | 4.2.0 | MIT |
447447
| **[napi-build-utils](#26912b5ff7632f262d64273f99cd1a869376c5c378960e24501585e35b31054a)** | 1.0.2 | MIT |
448448
| **[negotiator](#e3856213d8f0a7d28cd4166e53ec7e2c019cb7becf4a8535097bac28d21e8579)** | 0.6.3 | MIT |
449-
| **[node-abi](#27522d9e57504f18dd474099cf0d47b02d2bfe9b1b8622687cf42f8d215ccd34)** | 3.54.0 | MIT |
449+
| **[node-abi](#b592391c5d004993445187a4a54be1c7166b2196d4b31afd2480c608dfcceec6)** | 3.56.0 | MIT |
450450
| **[node-addon-api](#af9f7588524ca4e68f4efe7b24aea46d9c8004263b1d7cf3b558f86d87a163e8)** | 4.3.0 | MIT |
451451
| **[node-fetch](#ae6aab546df323cd6f4923b0c8f2d5d7119e13c5d5715a9a4983dccb054acf30)** | 2.6.11 | MIT |
452452
| **[node-fetch](#364527ef1b51cc6ac34872b931049c9e25b5014f9b40e3898c84e1a830e21720)** | 2.6.7 | MIT |
@@ -20784,9 +20784,9 @@ License files:
2078420784
See the License for the specific language governing permissions and
2078520785
limitations under the License.
2078620786

20787-
<a id="fbe31ba116fedfb4c83039ff76fc6f1f617048e031e4b0f3bf2bf6a9102389f1"></a>
20787+
<a id="57679565310025c14cb661f0144f4d7a546a13b033a51522ca20a3fe4c3d9c43"></a>
2078820788

20789-
### [electron](https://www.npmjs.com/package/electron) (version 28.2.1)
20789+
### [electron](https://www.npmjs.com/package/electron) (version 28.2.5)
2079020790

2079120791
License tags: MIT
2079220792

@@ -29804,9 +29804,9 @@ License files:
2980429804
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
2980529805
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2980629806

29807-
<a id="27522d9e57504f18dd474099cf0d47b02d2bfe9b1b8622687cf42f8d215ccd34"></a>
29807+
<a id="b592391c5d004993445187a4a54be1c7166b2196d4b31afd2480c608dfcceec6"></a>
2980829808

29809-
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.54.0)
29809+
### [node-abi](https://www.npmjs.com/package/node-abi) (version 3.56.0)
2981029810

2981129811
License tags: MIT
2981229812

‎configs/eslint-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mongodb-js/eslint-config-compass",
3-
"version": "1.0.15",
3+
"version": "1.0.16",
44
"description": "Shared Compass eslint configuration",
55
"license": "SSPL",
66
"main": "index.js",

‎configs/mocha-config-compass/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"dependencies": {
2727
"@mongodb-js/mocha-config-devtools": "^1.0.0",
28-
"@electron/remote": "^2.1.1",
28+
"@electron/remote": "^2.1.2",
2929
"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
3030
"chai": "^4.3.4",
3131
"chai-dom": "^1.9.0",

‎configs/webpack-config-compass/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.3.3",
16+
"version": "1.3.4",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
4545
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
4646
},
4747
"devDependencies": {
48-
"@mongodb-js/eslint-config-compass": "^1.0.15",
48+
"@mongodb-js/eslint-config-compass": "^1.0.16",
4949
"@mongodb-js/prettier-config-compass": "^1.0.1",
5050
"@mongodb-js/tsconfig-compass": "^1.0.3",
5151
"@types/cli-progress": "^3.9.2",
@@ -69,12 +69,12 @@
6969
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
7070
"babel-loader": "^8.2.5",
7171
"babel-plugin-istanbul": "^5.2.0",
72-
"browserslist": "^4.22.3",
72+
"browserslist": "^4.23.0",
7373
"chalk": "^4.1.2",
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^28.2.1",
77+
"electron": "^28.2.5",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",

‎configs/webpack-config-compass/src/args.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function webpackArgsWithDefaults(
5858

5959
return merge<ConfigArgs>(
6060
{
61-
entry: path.join(cwd, 'src', 'index.js'),
61+
entry: args.entry ?? path.join(cwd, 'src', 'index.js'),
6262
env: {},
6363
nodeEnv: process.env.NODE_ENV ?? args.mode ?? 'production',
6464
outputPath: path.join(cwd, 'dist'),

0 commit comments

Comments
 (0)