Skip to content

Commit ff31fb6

Browse files
authored
Merge branch 'main' into NODE-6751
2 parents e0e5c00 + b8bf5c8 commit ff31fb6

File tree

7 files changed

+1349
-957
lines changed

7 files changed

+1349
-957
lines changed

.evergreen/config.in.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ tasks:
971971
working_dir: src
972972
binary: bash
973973
add_expansions_to_env: true
974-
env:
974+
env:
975975
LAMBDA_STACK_NAME: dbx-node-lambda
976976
TEST_LAMBDA_DIRECTORY: ${PROJECT_DIRECTORY}/test/lambda
977977
AWS_REGION: us-east-1

.evergreen/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4854,7 +4854,6 @@ buildvariants:
48544854
batchtime: 20160
48554855
tasks:
48564856
- testtestoidc_task_group
4857-
- testazureoidc_task_group
48584857
- testgcpoidc_task_group
48594858
- testk8soidc_task_group_eks
48604859
- testk8soidc_task_group_gke

.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ BUILD_VARIANTS.push({
818818
batchtime: 20160,
819819
tasks: [
820820
'testtestoidc_task_group',
821-
'testazureoidc_task_group',
821+
// 'testazureoidc_task_group', TODO(NODE-6750): Unskip failed azure failed login
822822
'testgcpoidc_task_group',
823823
'testk8soidc_task_group_eks',
824824
'testk8soidc_task_group_gke',

.evergreen/run-kerberos-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ USER=$(node -p "encodeURIComponent(process.env.PRINCIPAL)")
2727
export MONGODB_URI="mongodb://${USER}@${SASL_HOST}/${GSSAPI_DB}?authMechanism=GSSAPI"
2828

2929
set -o xtrace
30-
npm install [email protected]
30+
3131
npm run check:kerberos
3232

3333
set +o xtrace

package-lock.json

Lines changed: 1340 additions & 951 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
"express": "^4.21.2",
9595
"gcp-metadata": "^5.3.0",
9696
"js-yaml": "^4.1.0",
97+
"kerberos": "^2.2.1",
9798
"mocha": "^10.8.2",
9899
"mocha-sinon": "^2.1.2",
99100
"mongodb-client-encryption": "^6.1.1",
@@ -175,4 +176,4 @@
175176
"moduleResolution": "node"
176177
}
177178
}
178-
}
179+
}

test/manual/x509_auth.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ describe('x509 Authentication', function () {
5959
function () {
6060
it('fails to authenticate', async function () {
6161
client = new MongoClient(connectionString.toString(), validOptions);
62-
const error = await client.connect().catch(e => e);
62+
const error = await client.connect().then(
63+
() => null,
64+
e => e
65+
);
6366

6467
expect(error).to.be.instanceOf(MongoServerError);
6568
expect(error.codeName).to.match(/UserNotFound/i);

0 commit comments

Comments
 (0)