Skip to content

Commit b2db457

Browse files
github-actions[bot]github-actions[bot]
committed
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 8c8e61e + f22a0d8 commit b2db457

File tree

156 files changed

+3909
-3584
lines changed

Some content is hidden

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

156 files changed

+3909
-3584
lines changed

‎.evergreen/buildvariants-and-tasks.in.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ const PACKAGE_BUILD_VARIANTS = [
6161
];
6262
6363
const SMOKETEST_BUILD_VARIANTS = [
64-
{
65-
name: 'smoketest-ubuntu',
66-
display_name: 'Smoketest Ubuntu',
67-
run_on: 'ubuntu2004-large',
68-
depends_on: 'package-ubuntu',
69-
},
64+
// {
65+
// name: 'smoketest-ubuntu',
66+
// display_name: 'Smoketest Ubuntu',
67+
// run_on: 'ubuntu2004-large',
68+
// depends_on: 'package-ubuntu',
69+
// },
7070
7171
// {
7272
// name: 'smoketest-windows',

‎.evergreen/buildvariants-and-tasks.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ buildvariants:
7676
- name: package-compass
7777
- name: package-compass-isolated
7878
- name: package-compass-readonly
79-
- name: smoketest-ubuntu-compass
80-
display_name: Smoketest Ubuntu (compass)
81-
run_on: ubuntu2004-large
82-
depends_on:
83-
- name: package-compass
84-
variant: package-ubuntu
85-
tasks:
86-
- name: smoketest-compass
8779
- name: smoketest-macos-x64-compass
8880
display_name: Smoketest MacOS Intel (compass)
8981
run_on: macos-14-gui

‎.evergreen/create-sbom.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ trap_handler() {
1818
}
1919
trap trap_handler ERR EXIT
2020

21-
scp -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" .sbom/dependencies.json /tmp/silkbomb.env /tmp/artifactory_password "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
22-
ssh -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME" \
21+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" .sbom/dependencies.json /tmp/silkbomb.env /tmp/artifactory_password "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/
22+
ssh -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME" \
2323
"(cat /tmp/dependencies.json | jq -r '.[] | "'"pkg:npm/" + .name + "@" + .version'"' > /tmp/purls.txt) && \
2424
echo "pkg:generic/mongo_crypt_shared@${CRYPT_SHARED_VERSION}" >> /tmp/purls.txt && \
2525
(cat /tmp/artifactory_password | docker login artifactory.corp.mongodb.com --username '${ARTIFACTORY_USERNAME}' --password-stdin ; rm -f /tmp/artifactor_password ) && \
@@ -30,4 +30,4 @@ ssh -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -p "$SIGNING_SERVER_PORT" "$SIGNING
3030
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-in /tmp/sbom-lite.json && \
3131
docker run --env-file /tmp/silkbomb.env --rm -v /tmp:/tmp artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0 download \
3232
--silk-asset-group "${SILK_ASSET_GROUP}" --sbom-out /tmp/sbom.json"
33-
scp -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/
33+
scp -v -i "$SIGNING_SERVER_PRIVATE_KEY_CYGPATH" -P "$SIGNING_SERVER_PORT" "$SIGNING_SERVER_USERNAME"@"$SIGNING_SERVER_HOSTNAME":/tmp/{sbom-lite.json,sbom.json,purls.txt} .sbom/

‎.evergreen/functions.yml‎

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,15 @@ variables:
4545
# secrets
4646
HADRON_METRICS_INTERCOM_APP_ID: ${metrics_intercom_app_id}
4747
HADRON_METRICS_SEGMENT_API_KEY: ${metrics_segment_api_key}
48+
GITHUB_TOKEN: ${devtoolsbot_github_token}
49+
DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID: ${aws_key_evergreen_integrations}
50+
DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${aws_secret_evergreen_integrations}
51+
EVERGREEN_BUCKET_NAME: mciuploads
52+
EVERGREEN_BUCKET_KEY_PREFIX: ${project}/${revision}_${revision_order_id}
53+
MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
54+
DOCKERHUB_USERNAME: ${dockerhub_username}
55+
DOCKERHUB_PASSWORD: ${dockerhub_password}
56+
- &compass-e2e-secrets
4857
E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string}
4958
E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host}
5059
E2E_TESTS_DATA_LAKE_HOST: ${e2e_tests_data_lake_host}
@@ -62,24 +71,8 @@ variables:
6271
E2E_TESTS_ATLAS_READANYDATABASE_STRING: ${e2e_tests_atlas_readanydatabase_string}
6372
E2E_TESTS_ATLAS_CUSTOMROLE_STRING: ${e2e_tests_atlas_customrole_string}
6473
E2E_TESTS_ATLAS_SPECIFICPERMISSION_STRING: ${e2e_tests_atlas_specificpermission_string}
65-
MACOS_NOTARY_KEY: ${macos_notary_key}
66-
MACOS_NOTARY_SECRET: ${macos_notary_secret}
67-
MACOS_NOTARY_CLIENT_URL: 'https://macos-notary-1628249594.s3.amazonaws.com/releases/client/latest/darwin_amd64.zip'
68-
MACOS_NOTARY_API_URL: 'https://dev.macos-notary.build.10gen.cc/api'
69-
GITHUB_TOKEN: ${devtoolsbot_github_token}
70-
DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID: ${aws_key_evergreen_integrations}
71-
DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY: ${aws_secret_evergreen_integrations}
72-
EVERGREEN_BUCKET_NAME: mciuploads
73-
EVERGREEN_BUCKET_KEY_PREFIX: ${project}/${revision}_${revision_order_id}
74-
MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
7574
E2E_TESTS_ATLAS_CS_WITHOUT_SEARCH: ${e2e_tests_atlas_cs_without_search}
7675
E2E_TESTS_ATLAS_CS_WITH_SEARCH: ${e2e_tests_atlas_cs_with_search}
77-
GARASIGN_USERNAME: ${garasign_username}
78-
GARASIGN_PASSWORD: ${garasign_password}
79-
ARTIFACTORY_USERNAME: ${artifactory_username}
80-
ARTIFACTORY_PASSWORD: ${artifactory_password}
81-
DOCKERHUB_USERNAME: ${dockerhub_username}
82-
DOCKERHUB_PASSWORD: ${dockerhub_password}
8376

8477
# This is here with the variables because anchors aren't supported across includes
8578
post:
@@ -450,7 +443,7 @@ functions:
450443
script: |
451444
set -e
452445
453-
.evergreen/create-sbom.sh
446+
bash ".evergreen/retry-with-backoff.sh" .evergreen/create-sbom.sh
454447
- command: shell.exec
455448
params:
456449
working_dir: src
@@ -459,12 +452,25 @@ functions:
459452
<<: *compass-env
460453
DEBUG: ${debug}
461454
npm_config_loglevel: ${npm_loglevel}
462-
HADRON_DISTRIBUTION: ${compass_distribution}
455+
456+
# macOS signing secrets
457+
MACOS_NOTARY_KEY: ${macos_notary_key}
458+
MACOS_NOTARY_SECRET: ${macos_notary_secret}
459+
MACOS_NOTARY_CLIENT_URL: 'https://macos-notary-1628249594.s3.amazonaws.com/releases/client/latest/darwin_amd64.zip'
460+
MACOS_NOTARY_API_URL: 'https://dev.macos-notary.build.10gen.cc/api'
461+
462+
# linux / windows signing secrets
463+
GARASIGN_USERNAME: ${garasign_username}
464+
GARASIGN_PASSWORD: ${garasign_password}
465+
ARTIFACTORY_USERNAME: ${artifactory_username}
466+
ARTIFACTORY_PASSWORD: ${artifactory_password}
463467
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
464468
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
465469
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
466470
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
467471
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
472+
473+
HADRON_DISTRIBUTION: ${compass_distribution}
468474
GITHUB_PR_NUMBER: ${github_pr_number}
469475
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
470476
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
@@ -596,6 +602,7 @@ functions:
596602
shell: bash
597603
env:
598604
<<: *compass-env
605+
<<: *compass-e2e-secrets
599606
DEBUG: ${debug|}
600607
MONGODB_VERSION: ${mongodb_version|}
601608
MONGODB_RUNNER_VERSION: ${mongodb_version|}
@@ -625,6 +632,7 @@ functions:
625632
shell: bash
626633
env:
627634
<<: *compass-env
635+
<<: *compass-e2e-secrets
628636
COMPASS_APP_PATH_ORIGINAL: ${appPath}
629637
COMPASS_APP_NAME: ${packagerOptions.name}
630638
DEBUG: ${debug|}
@@ -660,6 +668,7 @@ functions:
660668
shell: bash
661669
env:
662670
<<: *compass-env
671+
<<: *compass-e2e-secrets
663672
DEBUG: ${debug|}
664673
MONGODB_VERSION: ${mongodb_version|}
665674
MONGODB_RUNNER_VERSION: ${mongodb_version|}
@@ -669,12 +678,28 @@ functions:
669678
# Load environment variables
670679
eval $(.evergreen/print-compass-env.sh)
671680
681+
#if [[ "$IS_WINDOWS" == "true" ]]; then
682+
# TODO: windows_setup
683+
# TODO: windows_msi
684+
# TODO: windows_zip
685+
#fi
686+
672687
if [[ "$IS_OSX" == "true" ]]; then
673688
echo "Disabling clipboard usage in e2e tests (TODO: https://jira.mongodb.org/browse/BUILD-14780)"
674689
export COMPASS_E2E_DISABLE_CLIPBOARD_USAGE="true"
690+
npm run --unsafe-perm --workspace @mongodb-js/compass-smoke-tests start -- --package=osx_dmg
691+
# TODO: osx_zip
675692
fi
676693
677-
npm run --unsafe-perm --workspace compass-e2e-tests smoketest
694+
#if [[ "$IS_UBUNTU" == "true" ]]; then
695+
# TODO: linux_deb
696+
# TODO: linux_tar
697+
#fi
698+
699+
#if [[ "$IS_RHEL" == "true" ]]; then
700+
# TODO: linux_rpm
701+
# TODO: rhel_tar
702+
#fi
678703
679704
test-web-sandbox:
680705
- command: shell.exec
@@ -685,6 +710,7 @@ functions:
685710
shell: bash
686711
env:
687712
<<: *compass-env
713+
<<: *compass-e2e-secrets
688714
COMPASS_APP_PATH_ORIGINAL: ${appPath}
689715
COMPASS_APP_NAME: ${packagerOptions.name}
690716
DEBUG: ${debug|}
@@ -699,7 +725,6 @@ functions:
699725
eval $(.evergreen/print-compass-env.sh)
700726
npm run --unsafe-perm --workspace compass-e2e-tests test-ci web
701727
702-
703728
test-web-sandbox-atlas-cloud:
704729
- command: shell.exec
705730
# It can take a very long time for Atlas cluster to get deployed
@@ -709,6 +734,7 @@ functions:
709734
shell: bash
710735
env:
711736
<<: *compass-env
737+
<<: *compass-e2e-secrets
712738
DEBUG: ${debug|}
713739
COMPASS_E2E_ATLAS_CLOUD_SANDBOX_USERNAME: ${e2e_tests_compass_web_atlas_username}
714740
COMPASS_E2E_ATLAS_CLOUD_SANDBOX_PASSWORD: ${e2e_tests_compass_web_atlas_password}
@@ -741,6 +767,7 @@ functions:
741767
shell: bash
742768
env:
743769
<<: *compass-env
770+
<<: *compass-e2e-secrets
744771
COMPASS_SKIP_KERBEROS_TESTS: 'true'
745772
COMPASS_RUN_DOCKER_TESTS: 'true'
746773
DEBUG: ${debug}

‎.github/workflows/authors-and-third-party-notices.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ jobs:
6868
6969
- name: Commit and push
7070
run: |
71-
git commit --no-allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary [skip actions]" || true
71+
git commit --no-allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary" || true
7272
git push

‎.npmrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
engine-strict=true
22
registry=https://registry.npmjs.org/
3-
legacy-peer-deps=true
43
napi-build-version=7
54
foreground-scripts=true

‎THIRD-PARTY-NOTICES.md‎

Lines changed: 1 addition & 1 deletion
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 Sun Jan 12 2025.
2+
This document was automatically generated on Sun Jan 19 2025.
33

44
## List of dependencies
55

‎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.2.0",
3+
"version": "1.2.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.1.0",
19+
"@mongodb-js/eslint-plugin-compass": "^1.1.1",
2020
"@typescript-eslint/eslint-plugin": "^5.59.0",
2121
"@typescript-eslint/parser": "^5.59.0",
2222
"eslint-config-prettier": "^8.3.0",

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

Lines changed: 3 additions & 3 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.1.0",
16+
"version": "1.1.1",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"
@@ -37,8 +37,8 @@
3737
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
3838
},
3939
"devDependencies": {
40-
"@mongodb-js/mocha-config-compass": "^1.5.0",
41-
"@mongodb-js/prettier-config-compass": "^1.1.0",
40+
"@mongodb-js/mocha-config-compass": "^1.5.1",
41+
"@mongodb-js/prettier-config-compass": "^1.1.1",
4242
"depcheck": "^1.4.1",
4343
"eslint": "^7.25.0",
4444
"mocha": "^10.2.0",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "@mongodb-js/mocha-config-compass",
3-
"version": "1.5.0",
3+
"version": "1.5.1",
44
"description": "Shared mocha mocha configuration for Compass packages",
55
"license": "SSPL",
66
"main": "index.js",
77
"devDependencies": {
8-
"@mongodb-js/prettier-config-compass": "^1.1.0",
8+
"@mongodb-js/prettier-config-compass": "^1.1.1",
99
"prettier": "^2.7.1"
1010
},
1111
"scripts": {

0 commit comments

Comments
 (0)