Skip to content

Commit

Permalink
fix(NODE-5489): set kerberos compatibility to ^1.0.0 || ^2.0.0 (#3803)
Browse files Browse the repository at this point in the history
  • Loading branch information
durran committed Aug 9, 2023
1 parent cc3069d commit c3b35b3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 26 deletions.
12 changes: 0 additions & 12 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1623,13 +1623,6 @@ tasks:
- func: start-load-balancer
- func: run-lb-tests
- func: stop-load-balancer
- name: test-auth-kerberos
tags:
- auth
- kerberos
commands:
- func: install dependencies
- func: run kerberos tests
- name: test-auth-ldap
tags:
- auth
Expand Down Expand Up @@ -3540,7 +3533,6 @@ buildvariants:
- test-5.0-load-balanced
- test-6.0-load-balanced
- test-latest-load-balanced
- test-auth-kerberos
- test-auth-ldap
- test-auth-oidc
- test-socks5
Expand Down Expand Up @@ -3593,7 +3585,6 @@ buildvariants:
- test-5.0-load-balanced
- test-6.0-load-balanced
- test-latest-load-balanced
- test-auth-kerberos
- test-auth-ldap
- test-auth-oidc
- test-socks5
Expand Down Expand Up @@ -3644,7 +3635,6 @@ buildvariants:
- test-5.0-load-balanced
- test-6.0-load-balanced
- test-latest-load-balanced
- test-auth-kerberos
- test-auth-ldap
- test-auth-oidc
- test-socks5
Expand Down Expand Up @@ -3695,7 +3685,6 @@ buildvariants:
- test-5.0-load-balanced
- test-6.0-load-balanced
- test-latest-load-balanced
- test-auth-kerberos
- test-auth-ldap
- test-auth-oidc
- test-socks5
Expand Down Expand Up @@ -3746,7 +3735,6 @@ buildvariants:
- test-5.0-load-balanced
- test-6.0-load-balanced
- test-latest-load-balanced
- test-auth-kerberos
- test-auth-ldap
- test-auth-oidc
- test-socks5
Expand Down
18 changes: 6 additions & 12 deletions .evergreen/generate_evergreen_tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,12 @@ TASKS.push(
{ func: 'stop-load-balancer' }
]
},
{
name: 'test-auth-kerberos',
tags: ['auth', 'kerberos'],
commands: [{ func: 'install dependencies' }, { func: 'run kerberos tests' }]
},
// TODO(NODE-5519): Kerberos kinit errors.
// {
// name: 'test-auth-kerberos',
// tags: ['auth', 'kerberos'],
// commands: [{ func: 'install dependencies' }, { func: 'run kerberos tests' }]
//},
{
name: 'test-auth-ldap',
tags: ['auth', 'ldap'],
Expand Down Expand Up @@ -795,13 +796,6 @@ for (const variant of BUILD_VARIANTS.filter(
);
}

// TODO(NODE-5021): Drop support for Kerberos 1.x on in 6.0.0
for (const variant of BUILD_VARIANTS.filter(
variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_VERSION)
)) {
variant.tasks = variant.tasks.filter(name => !['test-auth-kerberos'].includes(name));
}

// TODO(NODE-4897): Debug socks5 tests on node latest
for (const variant of BUILD_VARIANTS.filter(
variant => variant.expansions && ['latest'].includes(variant.expansions.NODE_LTS_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"peerDependencies": {
"@aws-sdk/credential-providers": "^3.201.0",
"@mongodb-js/zstd": "^1.1.0",
"kerberos": "^2.0.1",
"kerberos": "^1.0.0 || ^2.0.0",
"mongodb-client-encryption": ">=2.3.0 <3",
"snappy": "^7.2.2"
},
Expand Down

0 comments on commit c3b35b3

Please sign in to comment.