Skip to content
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.

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

[pull] main from mongodb-js:main #353

Merged
merged 34 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
810bd30
chore: push expiration date of SNYK-JS-AGGRIDCOMMUNITY-1932011 (#6146)
kmruiz Aug 21, 2024
0616adf
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Aug 21, 2024
9a9b2bb
fix(hadron-build, compass): restore Isolated and Readonly special beh…
gribnoysup Aug 21, 2024
48c875a
chore(generative-ai): remove accuracy tests (#6149)
Anemy Aug 22, 2024
7c34845
fix(compass-import-export): stream import errors to the log file with…
lerouxb Aug 23, 2024
885dafd
feat: release multiple connections COMPASS-7905 (#6138)
lerouxb Aug 23, 2024
7b348a7
chore: upgrade mongodb-runner COMPASS-8181 (#6150)
kmruiz Aug 23, 2024
dbedce1
fix(e2e): three lines for three errors, not four (#6152)
lerouxb Aug 23, 2024
c3480f8
fix(e2e): deal with the fact that the modal might already be closed (…
lerouxb Aug 26, 2024
31d597d
chore: update electron (#6145)
svc-devtoolsbot Aug 26, 2024
d29d513
chore(preferences): rename multiple connections option to work around…
gribnoysup Aug 26, 2024
d73838c
chore(data-service): enable debug logging for connectivity tests (#6154)
addaleax Aug 26, 2024
bf6a9bf
fix(e2e-tests): re-enable OIDC tests on 8.0.x COMPASS-7966 (#6156)
addaleax Aug 27, 2024
86a9451
feat: add per-connection proxy settings COMPASS-8142 (#6133)
addaleax Aug 27, 2024
36ab985
chore(release): bump package versions (#6111)
svc-devtoolsbot Aug 27, 2024
afa901b
fix(connection-storage): store `useApplicationLevelProxy` flag to dis…
addaleax Aug 27, 2024
63c3e19
fix(compass-e2e-tests): skip failing search index test COMPASS-8220 (…
addaleax Aug 27, 2024
4eaf037
feat: release feature flag for proxy support COMPASS-8167 (#6157)
addaleax Aug 27, 2024
eddd080
chore(connections): refactor compass-connections to a plugin with a r…
gribnoysup Aug 28, 2024
fc7d817
chore(connections): make sure that getThemeOf method gets updated whe…
gribnoysup Aug 28, 2024
cf49c7f
fix(compass-crud): in the bulk update preview, convert array indexes …
lerouxb Aug 28, 2024
5f7a36a
chore(ci): set `HADRON_DISTRIBUTION` for generated file update GH act…
addaleax Aug 28, 2024
03dfb33
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Aug 28, 2024
3aed795
chore(connections): autosave favorite info on connect for existing co…
gribnoysup Aug 28, 2024
d281a87
chore: extract event types COMPASS-8058 (#6132)
mcasimir Aug 29, 2024
e84f576
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Aug 29, 2024
874cf52
fix(deps): bump shell-bson-parser to 1.1.2 MONGOSH-1859 (#6169)
addaleax Aug 29, 2024
bad2282
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Aug 29, 2024
7e3e53b
chore(web): enable multiple connections by default CLOUDP-260445 (#6167)
gribnoysup Aug 29, 2024
7d3fc80
ci: use foliage tags on ci-tasks COMPASS-7956 (#6168)
mabaasit Aug 30, 2024
560ba32
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Aug 30, 2024
7b7ca4e
chore(data-service): remove dependency on compass-preferences-model C…
addaleax Aug 30, 2024
7f83eae
chore(release): bump package versions (#6159)
svc-devtoolsbot Aug 30, 2024
4de382e
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Sep 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 14 additions & 27 deletions .evergreen/buildvariants-and-tasks.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,14 +246,6 @@ buildvariants:
- name: e2e-coverage-<%= group.number %>
<% } %>

- name: e2e-multiple-connections
display_name: E2E Multiple Connections
run_on: ubuntu2004-large
tasks:
<% for(const group of E2E_TEST_GROUPS) { %>
- name: e2e-multiple-connections-<%= group.number %>
<% } %>

- name: csfle-tests
display_name: CSFLE Tests
run_on: ubuntu2004-large
Expand Down Expand Up @@ -289,7 +281,11 @@ tasks:
- func: check

- name: test
tags: ['required-for-publish', 'run-on-pr']
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_creates_breaking_commit
commands:
- func: prepare
- func: install
Expand Down Expand Up @@ -340,21 +336,6 @@ tasks:
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
<% } %>

<% for(const group of E2E_TEST_GROUPS) { %>
- name: e2e-multiple-connections-<%= group.number %>
tags: ['required-for-publish', 'run-on-pr']
commands:
- func: prepare
- func: install
- func: bootstrap
- func: test-multiple-connections
vars:
e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
e2e_test_group: <%= group.number %>
debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
mongodb_version: latest-enterprise
<% } %>

- name: generate-vulnerability-report
tags: ['required-for-publish', 'run-on-pr']
commands:
Expand Down Expand Up @@ -457,8 +438,10 @@ tasks:
<% for(const group of E2E_TEST_GROUPS) { %>
- name: test-packaged-app-<%= group.number %>
tags:
- required-for-publish
- run-on-pr
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -483,7 +466,11 @@ tasks:
<% for (const browser of BROWSERS) { %>
<% for(const group of E2E_TEST_GROUPS) { %>
- name: test-web-sandbox-<%= browser %>-<%= group.number %>
tags: ['required-for-publish', 'run-on-pr']
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand Down
69 changes: 20 additions & 49 deletions .evergreen/buildvariants-and-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,6 @@ buildvariants:
- name: e2e-coverage-1
- name: e2e-coverage-2
- name: e2e-coverage-3
- name: e2e-multiple-connections
display_name: E2E Multiple Connections
run_on: ubuntu2004-large
tasks:
- name: e2e-multiple-connections-1
- name: e2e-multiple-connections-2
- name: e2e-multiple-connections-3
- name: csfle-tests
display_name: CSFLE Tests
run_on: ubuntu2004-large
Expand Down Expand Up @@ -261,6 +254,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_creates_breaking_commit
commands:
- func: prepare
- func: install
Expand Down Expand Up @@ -338,48 +333,6 @@ tasks:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
- name: e2e-multiple-connections-1
tags:
- required-for-publish
- run-on-pr
commands:
- func: prepare
- func: install
- func: bootstrap
- func: test-multiple-connections
vars:
e2e_test_groups: 3
e2e_test_group: 1
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: e2e-multiple-connections-2
tags:
- required-for-publish
- run-on-pr
commands:
- func: prepare
- func: install
- func: bootstrap
- func: test-multiple-connections
vars:
e2e_test_groups: 3
e2e_test_group: 2
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: e2e-multiple-connections-3
tags:
- required-for-publish
- run-on-pr
commands:
- func: prepare
- func: install
- func: bootstrap
- func: test-multiple-connections
vars:
e2e_test_groups: 3
e2e_test_group: 3
debug: compass-e2e-tests*,electron*,hadron*,mongo*
mongodb_version: latest-enterprise
- name: generate-vulnerability-report
tags:
- required-for-publish
Expand Down Expand Up @@ -1531,6 +1484,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1554,6 +1509,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1577,6 +1534,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1600,6 +1559,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1621,6 +1582,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1642,6 +1605,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1663,6 +1628,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1684,6 +1651,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand All @@ -1705,6 +1674,8 @@ tasks:
tags:
- required-for-publish
- run-on-pr
- assigned_to_jira_team_compass_compass
- foliage_check_task_only
commands:
- func: prepare
- func: install
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/compass_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
fi

echo "Creating signed release build..."
npm run package-compass-nocompile $COMPASS_DISTRIBUTION
npm run package-compass-nocompile
npm run generate-first-party-deps-json

ls -la packages/compass/dist
Expand Down
58 changes: 6 additions & 52 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,13 @@ functions:
shell: bash
env:
<<: *compass-env
HADRON_DISTRIBUTION: ${compass_distribution}
script: |
set -e
# Load environment variables
eval $(.evergreen/print-compass-env.sh)
# Generates and expansion file with build target metadata in packages/compass/expansions.yml
npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten ${compass_distribution} --out expansions.raw.yml
npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten --out expansions.raw.yml
# the 'author' key conflicts with evergreen's own expansion
grep -v '^author:' < packages/compass/expansions.raw.yml > packages/compass/expansions.yml
- command: expansions.update
Expand Down Expand Up @@ -405,7 +406,7 @@ functions:
<<: *compass-env
DEBUG: ${debug}
npm_config_loglevel: ${npm_loglevel}
COMPASS_DISTRIBUTION: ${compass_distribution}
HADRON_DISTRIBUTION: ${compass_distribution}
script: |
set -e

Expand Down Expand Up @@ -443,7 +444,7 @@ functions:
<<: *compass-env
DEBUG: ${debug}
npm_config_loglevel: ${npm_loglevel}
COMPASS_DISTRIBUTION: ${compass_distribution}
HADRON_DISTRIBUTION: ${compass_distribution}
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
Expand Down Expand Up @@ -586,6 +587,7 @@ functions:
E2E_TEST_GROUPS: ${e2e_test_groups}
E2E_TEST_GROUP: ${e2e_test_group}
ATLAS_LOCAL_VERSION: latest
HADRON_DISTRIBUTION: compass
script: |
set -e
# Load environment variables
Expand All @@ -600,30 +602,6 @@ functions:

tar czf coverage.tgz packages/compass-e2e-tests/coverage

test-multiple-connections:
- command: shell.exec
# Fail the task if it's idle for 10 mins
timeout_secs: 600
params:
working_dir: src
shell: bash
env:
<<: *compass-env
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
E2E_TEST_GROUPS: ${e2e_test_groups}
E2E_TEST_GROUP: ${e2e_test_group}
script: |
set -e
# Load environment variables
eval $(.evergreen/print-compass-env.sh)

echo "Running E2E tests for multiple connections"

npm run --unsafe-perm --workspace compass-e2e-tests test-ci -- -- --test-multiple-connections


test-packaged-app:
- command: shell.exec
# Fail the task if it's idle for 10 mins
Expand Down Expand Up @@ -946,6 +924,7 @@ functions:
DEBUG: ${debug}
SNYK_TOKEN: ${snyk_token}
JIRA_API_TOKEN: ${jira_api_token}
HADRON_DISTRIBUTION: compass
script: |
set -e
# Load environment variables
Expand Down Expand Up @@ -977,28 +956,3 @@ functions:
# Fails if the report failed and is not a patch, including release branches:
exit $return_code
fi

generative-ai-accuracy-tests:
- command: shell.exec
# Fail the task if it's idle for 10 mins
timeout_secs: 600
params:
working_dir: src
shell: bash
env:
<<: *compass-env
ATLAS_PUBLIC_KEY: ${atlas_public_key}
ATLAS_PRIVATE_KEY: ${atlas_private_key}
AI_ACCURACY_RESULTS_MONGODB_CONNECTION_STRING: ${accuracy_results_mdb_connection_string}
script: |
set -e
# Load environment variables
eval $(.evergreen/print-compass-env.sh)

set +e
npm run --workspace @mongodb-js/compass-generative-ai ai-accuracy-tests
return_code=$?
set -e

# Fail when the accuracy tests fail:
exit $return_code
9 changes: 0 additions & 9 deletions .evergreen/generative-ai-accuracy-test-empty.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .evergreen/generative-ai-accuracy-test.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/authors-and-third-party-notices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
update_generated_files:
name: Update automatically generated files
runs-on: ubuntu-latest
env:
HADRON_DISTRIBUTION: compass
steps:
- uses: actions/checkout@v3
with:
Expand Down
Loading
Loading