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 #373

Merged
merged 22 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fdde5ad
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 20, 2024
f251db7
fix(proxy): do not lock users out of Compass when using authenticated…
addaleax Oct 22, 2024
c78c97d
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 22, 2024
add5de6
chore(e2e): enable e2e tests to run directly against Atlas (#6381)
syn-zhu Oct 22, 2024
b1bc75e
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 22, 2024
911b180
chore(deps): update node-gyp to 10; remove workaround for windows; re…
gribnoysup Oct 23, 2024
c72a1df
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 23, 2024
ce0d66f
chore(e2e): restructure e2e test helpers to better separate shared st…
gribnoysup Oct 23, 2024
8884e7f
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 23, 2024
6b68561
chore(e2e): remove TEST_MULTIPLE_CONNECTIONS flag from e2e tests (#6393)
gribnoysup Oct 23, 2024
66db10e
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 23, 2024
2ec13eb
feat(compass-global-writes): zone table - add search and collapse/exp…
paula-stacho Oct 23, 2024
39f7ce5
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 23, 2024
11e54e5
chore(deps): update electron/rebuild dependency (#6394)
gribnoysup Oct 24, 2024
19941f5
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 24, 2024
5065cd3
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 27, 2024
ea27e27
chore(deps): bump kerberos in package-lock (#6402)
gribnoysup Oct 28, 2024
1d5f3e5
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 28, 2024
560ad43
chore(ci): Add a workflow to validate PR titles (#6400)
nirinchev Oct 28, 2024
953769b
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 28, 2024
8f1cd9f
chore(e2e): refactor context to use yargs parser (#6398)
gribnoysup Oct 28, 2024
fa94752
chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary (#6…
github-actions[bot] Oct 28, 2024
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
3 changes: 3 additions & 0 deletions .depalignrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
],
"js-yaml": [
"^3.13.1"
],
"yargs": [
"^4.8.1"
]
}
}
21 changes: 10 additions & 11 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ post:
target: src/all-e2e-logs.tgz
source_dir: src/packages/compass-e2e-tests/.log
include:
- "**"
- '**'
- command: s3.put
params:
<<: *save-artifact-params-private
Expand Down Expand Up @@ -303,7 +303,7 @@ functions:
echo "Running tests in Electron runtime"

# Preparing native addons for electron runtime
npm run --unsafe-perm electron-rebuild
DEBUG=electron-rebuild* npm run --unsafe-perm electron-rebuild

npm run --unsafe-perm test-ci-electron -- --stream

Expand Down Expand Up @@ -597,10 +597,9 @@ functions:
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
E2E_TEST_GROUPS: ${e2e_test_groups}
E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
ATLAS_LOCAL_VERSION: latest
HADRON_DISTRIBUTION: compass
script: |
set -e
# Load environment variables
Expand Down Expand Up @@ -629,8 +628,8 @@ functions:
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
E2E_TEST_GROUPS: ${e2e_test_groups}
E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
script: |
set -e
# Load environment variables
Expand Down Expand Up @@ -664,14 +663,14 @@ functions:
DEBUG: ${debug|}
MONGODB_VERSION: ${mongodb_version|}
MONGODB_RUNNER_VERSION: ${mongodb_version|}
BROWSER_NAME: ${browser_name}
E2E_TEST_GROUPS: ${e2e_test_groups}
E2E_TEST_GROUP: ${e2e_test_group}
COMPASS_E2E_BROWSER_NAME: ${browser_name}
COMPASS_E2E_TEST_GROUPS: ${e2e_test_groups}
COMPASS_E2E_TEST_GROUP: ${e2e_test_group}
script: |
set -e
# Load environment variables
eval $(.evergreen/print-compass-env.sh)
npm run --unsafe-perm --workspace compass-e2e-tests test-web
npm run --unsafe-perm --workspace compass-e2e-tests test-ci web

test-connectivity:
- command: shell.exec
Expand Down
53 changes: 0 additions & 53 deletions .evergreen/node-gyp-bug-workaround.sh

This file was deleted.

3 changes: 0 additions & 3 deletions .evergreen/preinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ if [ -n "$IS_WINDOWS" ]; then
./node.exe node_modules/npm2/bin/npm-cli.js i -g npm@$NPM_VERSION
rm -rf node_modules/npm2/
chmod +x npm.cmd npm

cd ..
.evergreen/node-gyp-bug-workaround.sh
else
if command -v ldd &> /dev/null && `ldd $(which bash) | grep 'libc.so' | awk '{print $3}'` | grep -Eq 'release version 2.(1|2[0-7])'; then
echo "Installing unofficial nodejs compiled for glibc 2.17 v${NODE_JS_VERSION} for ${PLATFORM} on ${ARCH}..."
Expand Down
17 changes: 10 additions & 7 deletions .evergreen/print-compass-env.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,10 @@ function printCompassEnv() {
}

if (process.env.PLATFORM === 'linux') {
// To build node modules on linux post electron 13 we need
// a newer c++ compiler version, this adds it.
// To build node modules on linux post electron 13 we need a newer c++
// compiler version and at least python v3.9, this adds it.
// https://jira.mongodb.org/browse/COMPASS-5150
pathsToPrepend.unshift('/opt/mongodbtoolchain/v3/bin');

// Make sure that linux is using python 3.6 (node-gyp requirement)
pathsToPrepend.unshift('/opt/python/3.6/bin');
}

PATH = maybePrependPaths(PATH, pathsToPrepend);
Expand Down Expand Up @@ -103,10 +100,16 @@ function printCompassEnv() {
printVar('IS_RHEL', process.env.IS_RHEL);
printVar('IS_UBUNTU', process.env.IS_UBUNTU);
printVar('DEBUG', process.env.DEBUG);
printVar('MONGODB_VERSION', process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION);
printVar(
'MONGODB_VERSION',
process.env.MONGODB_VERSION || process.env.MONGODB_DEFAULT_VERSION
);
printVar('DEV_VERSION_IDENTIFIER', process.env.DEV_VERSION_IDENTIFIER);
printVar('EVERGREEN_REVISION', process.env.EVERGREEN_REVISION);
printVar('EVERGREEN_REVISION_ORDER_ID', process.env.EVERGREEN_REVISION_ORDER_ID);
printVar(
'EVERGREEN_REVISION_ORDER_ID',
process.env.EVERGREEN_REVISION_ORDER_ID
);

if (process.platform === 'darwin') {
// Without this, kerberos 2.1.1 is broken on macOS, but this flag is only
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/check-pr-title.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: "Check PR Title"
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled, converted_to_draft, edited]

jobs:
check-pr-title:
name: Check PR Title
runs-on: ubuntu-latest
steps:
- name: Enforce conventional commit style
uses: realm/ci-actions/title-checker@main
with:
regex: '^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|ops){1}(\([\w\-\.]+\))?(!)?: .*'
error-hint: 'Invalid PR title. Make sure it follows the conventional commit specification (i.e. "<type>(<optional scope>): <description>") or add the no-title-validation label'
ignore-labels: 'no-title-validation'
- name: Enforce JIRA ticket in title
uses: realm/ci-actions/title-checker@main
# Skip the JIRA ticket check for PRs opened by bots
if: ${{ !contains(github.event.pull_request.user.login, '[bot]') }}
with:
regex: '[A-Z]{4,10}-[0-9]{1,5}$'
error-hint: 'Invalid PR title. Make sure it ends with a JIRA ticket - i.e. COMPASS-1234 or add the no-title-validation label'
ignore-labels: 'no-title-validation'
2 changes: 2 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ admin-token-bot <[email protected]>
Kræn Hansen <[email protected]>
Kræn Hansen <[email protected]>
Ruchitha Rajaghatta <[email protected]>
syn-zhu <[email protected]>
Nikola Irinchev <[email protected]>
8 changes: 4 additions & 4 deletions THIRD-PARTY-NOTICES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
The following third-party software is used by and included in **Mongodb Compass**.
This document was automatically generated on Fri Oct 18 2024.
This document was automatically generated on Mon Oct 28 2024.

## List of dependencies

Expand Down Expand Up @@ -364,7 +364,7 @@ Package|Version|License
**[json5](#16281c6ea25e0cec4bc0bb8c01d1759d66992776381bf9c5af6959bec47d2f77)**|2.2.3|MIT
**[jsondiffpatch](#2cc3b990f6692cd23f883319a727b42a76a3a9d6675d1ebd8a05241eb7edc4ac)**|0.5.0|MIT
**[jsonfile](#1504ddbe5031429f6d90bb02373b4629ff5da9ef4e869d5015ff42f685817e74)**|6.1.0|MIT
**[kerberos](#e9b8ef28e3d246d5071f34b07b67580523cda7bd0d7d74dc2e422d79d30c238d)**|2.1.1|Apache-2.0
**[kerberos](#ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b)**|2.2.0|Apache-2.0
**[key-tree-store](#63e3bcb8e06ac6b9f7c153030ce57fad6e985a0cc7f0109d3fc6073192a932f8)**|1.3.0|MIT
**[keytar](#752f1130bbd6c5dc941bdb20fb39579c1d350252a112c58f2558b7c5f536d6f7)**|7.9.0|MIT
**[leaflet-defaulticon-compatibility](#7fba582082c899d764d8e4214d2f6f06cd043b2dce51598ec24ce299f5640a6e)**|0.1.1|BSD-2-Clause
Expand Down Expand Up @@ -23138,8 +23138,8 @@ License files:



<a id="e9b8ef28e3d246d5071f34b07b67580523cda7bd0d7d74dc2e422d79d30c238d"></a>
### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.1.1)
<a id="ac70d4903c6441fd96843a6ecb73f258ee27ef26b25290257564a11c10ecd17b"></a>
### [kerberos](https://www.npmjs.com/package/kerberos) (version 2.2.0)
License tags: Apache-2.0

License files:
Expand Down
2 changes: 1 addition & 1 deletion docs/tracking-plan.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Compass Tracking Plan

Generated on Fri, Oct 18, 2024 at 04:41 PM
Generated on Mon, Oct 28, 2024 at 12:44 PM

## Table of Contents

Expand Down
Loading
Loading