Skip to content

Commit 4535a52

Browse files
baileympearsonbaileympearson
authored
Merge branch 'main' into NODE-7076 
2 parents 8564ef4 + 81a7951 commit 4535a52

File tree

10 files changed

+224
-321
lines changed

10 files changed

+224
-321
lines changed

‎.evergreen/config.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,19 +1398,6 @@ tasks:
13981398
- func: start-load-balancer
13991399
- func: run-lb-tests
14001400
- func: stop-load-balancer
1401-
- name: test-auth-kerberos
1402-
tags:
1403-
- auth
1404-
- kerberos
1405-
commands:
1406-
- command: expansions.update
1407-
type: setup
1408-
params:
1409-
updates:
1410-
- {key: NATIVE, value: 'true'}
1411-
- func: install dependencies
1412-
- func: assume secrets manager role
1413-
- func: run kerberos tests
14141401
- name: test-auth-ldap
14151402
tags:
14161403
- auth
@@ -2961,7 +2948,6 @@ buildvariants:
29612948
- test-8.0-load-balanced
29622949
- test-rapid-load-balanced
29632950
- test-latest-load-balanced
2964-
- test-auth-kerberos
29652951
- test-auth-ldap
29662952
- test-socks5
29672953
- test-socks5-csfle
@@ -3018,7 +3004,6 @@ buildvariants:
30183004
- test-8.0-load-balanced
30193005
- test-rapid-load-balanced
30203006
- test-latest-load-balanced
3021-
- test-auth-kerberos
30223007
- test-auth-ldap
30233008
- test-socks5
30243009
- test-socks5-csfle
@@ -3075,7 +3060,6 @@ buildvariants:
30753060
- test-8.0-load-balanced
30763061
- test-rapid-load-balanced
30773062
- test-latest-load-balanced
3078-
- test-auth-kerberos
30793063
- test-auth-ldap
30803064
- test-socks5
30813065
- test-socks5-csfle
@@ -3132,7 +3116,6 @@ buildvariants:
31323116
- test-8.0-load-balanced
31333117
- test-rapid-load-balanced
31343118
- test-latest-load-balanced
3135-
- test-auth-kerberos
31363119
- test-auth-ldap
31373120
- test-socks5
31383121
- test-socks5-csfle
@@ -3187,7 +3170,6 @@ buildvariants:
31873170
- test-8.0-load-balanced
31883171
- test-rapid-load-balanced
31893172
- test-latest-load-balanced
3190-
- test-auth-kerberos
31913173
- test-auth-ldap
31923174
- test-socks5-csfle
31933175
- test-socks5-tls

‎.evergreen/generate_evergreen_tasks.js‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,18 +151,19 @@ TASKS.push(
151151
{ func: 'stop-load-balancer' }
152152
]
153153
})),
154-
{
155-
name: 'test-auth-kerberos',
156-
tags: ['auth', 'kerberos'],
157-
commands: [
158-
updateExpansions({
159-
NATIVE: 'true'
160-
}),
161-
{ func: 'install dependencies' },
162-
{ func: 'assume secrets manager role' },
163-
{ func: 'run kerberos tests' }
164-
]
165-
},
154+
// TODO(NODE-7178): Unskip kerberos tests.
155+
// {
156+
// name: 'test-auth-kerberos',
157+
// tags: ['auth', 'kerberos'],
158+
// commands: [
159+
// updateExpansions({
160+
// NATIVE: 'true'
161+
// }),
162+
// { func: 'install dependencies' },
163+
// { func: 'assume secrets manager role' },
164+
// { func: 'run kerberos tests' }
165+
// ]
166+
// },
166167
{
167168
name: 'test-auth-ldap',
168169
tags: ['auth', 'ldap'],

‎drivers-evergreen-tools‎

‎etc/docs/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ necessary to backport a feature).
1414

1515
`build.ts` requires the following in addition to dependencies installed with `npm i`:
1616

17-
* Hugo static web generator `v0.30.2`
18-
* You can download the right version [here](https://github.com/gohugoio/hugo/releases/tag/v0.30.2)
17+
* Hugo static web generator `v0.150.0`
18+
* You can download the right version [here](https://github.com/gohugoio/hugo/releases/tag/v0.150.0)
1919
* ts-node
2020

2121
Note: `typedoc` is also a dependency but it is downloaded by the docs generation script automatically.
@@ -32,6 +32,8 @@ To generate API documentation for a new major or minor version:
3232

3333
`npm run build:docs -- --tag <version>`
3434

35+
`<version>` should be formatted MAJOR.MINOR (ex. `--tag=6.8`)
36+
3537
You can optionally specify the following options:
3638

3739
- `--yes` if set, this will silence any prompts in the script. useful for running in CI

‎etc/docs/build.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ async function updateSiteTemplateForNewVersion(
6767

6868
await writeFile(RELEASES_TOML_FILE, stringify(tomlData as any));
6969
await writeFile(RELEASES_JSON_FILE, JSON.stringify(jsonVersions, null, 4));
70-
7170
// generate the site from the template
7271
await exec(`hugo -s template -d ../temp -b "/node-mongodb-native"`);
7372
}
@@ -80,6 +79,9 @@ async function main() {
8079
process.exit(1);
8180
}
8281

82+
const { stdout } = await exec('hugo version', { encoding: 'utf8' });
83+
if (!stdout.includes('0.150.0')) throw new Error('`hugo` version must be 0.150.0.');
84+
8385
chdir(__dirname);
8486

8587
const { tag, status, skipPrompts } = getCommandLineArguments();

‎test/integration/bson-decimal128/decimal128.test.js‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎test/integration/bson-decimal128/decimal128.test.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { expect } from 'chai';
2+
3+
import { type Collection, Decimal128, type MongoClient } from '../../../src';
4+
5+
describe('Decimal128', function () {
6+
let client: MongoClient;
7+
let collection: Collection;
8+
9+
beforeEach(async function () {
10+
client = this.configuration.newClient();
11+
collection = client.db('decimal128').collection('decimal128');
12+
});
13+
14+
afterEach(async function () {
15+
await client.close();
16+
});
17+
18+
it('should correctly insert decimal128 value', async function () {
19+
const object = {
20+
id: 1,
21+
value: Decimal128.fromString('1.28')
22+
};
23+
await collection.insertOne(object);
24+
const doc = await collection.findOne({
25+
id: 1
26+
});
27+
28+
expect(doc.value).to.be.instanceof(Decimal128);
29+
expect(doc.value.toString()).to.equal('1.28');
30+
});
31+
});

‎test/integration/client-side-encryption/client_side_encryption.prose.test.ts‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,6 +1516,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
15161516
const masterKeyInvalidHostname = { ...masterKey, endpoint: '127.0.0.1:9001' };
15171517

15181518
it('should fail with no TLS', metadata, async function () {
1519+
// NODE-6861: flakiness is caused by mock KMS servers
1520+
this.retries(2);
1521+
15191522
try {
15201523
await clientEncryptionNoTls.createDataKey('aws', { masterKey });
15211524
expect.fail('it must fail with no tls');
@@ -1568,15 +1571,18 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
15681571
keyName: 'foo'
15691572
};
15701573

1571-
it.skip('should fail with no TLS', metadata, async function () {
1574+
it('should fail with no TLS', metadata, async function () {
1575+
// NODE-6861: flakiness is caused by mock KMS servers
1576+
this.retries(2);
1577+
15721578
try {
15731579
await clientEncryptionNoTls.createDataKey('azure', { masterKey });
15741580
expect.fail('it must fail with no tls');
15751581
} catch (e) {
15761582
//Expect an error indicating TLS handshake failed.
15771583
expect(e.cause.message).to.include('certificate required');
15781584
}
1579-
}).skipReason = 'TODO(NODE-6861): fix flaky test';
1585+
});
15801586

15811587
it('should succeed with valid TLS options', metadata, async function () {
15821588
try {
@@ -1620,6 +1626,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
16201626
};
16211627

16221628
it('should fail with no TLS', metadata, async function () {
1629+
// NODE-6861: flakiness is caused by mock KMS servers
1630+
this.retries(2);
1631+
16231632
try {
16241633
await clientEncryptionNoTls.createDataKey('gcp', { masterKey });
16251634
expect.fail('it must fail with no tls');
@@ -1666,6 +1675,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
16661675
const masterKey = {};
16671676

16681677
it('should fail with no TLS', metadata, async function () {
1678+
// NODE-6861: flakiness is caused by mock KMS servers
1679+
this.retries(2);
1680+
16691681
const e = await clientEncryptionNoTls.createDataKey('kmip', { masterKey }).catch(e => e);
16701682
//Expect an error indicating TLS handshake failed.
16711683
expect(e.cause.message).to.match(/before secure TLS connection|handshake/);
@@ -1797,6 +1809,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
17971809
});
17981810
it('Named AWS', async function () {
17991811
{
1812+
// NODE-6861: flakiness is caused by mock KMS servers
1813+
this.retries(2);
1814+
18001815
// Call `client_encryption_with_names.createDataKey()` with "aws:no_client_cert" as the provider and the following masterKey.
18011816
const error = await clientEncryptionWithNames
18021817
.createDataKey('aws:no_client_cert', {
@@ -1832,6 +1847,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
18321847

18331848
it('Named Azure', async function () {
18341849
{
1850+
// NODE-6861: flakiness is caused by mock KMS servers
1851+
this.retries(2);
1852+
18351853
// Call `client_encryption_with_names.createDataKey()` with "aws:no_client_cert" as the provider and the following masterKey.
18361854
const error = await clientEncryptionWithNames
18371855
.createDataKey('azure:no_client_cert', {
@@ -1859,6 +1877,9 @@ describe('Client Side Encryption Prose Tests', metadata, function () {
18591877

18601878
it('Named GCP', async function () {
18611879
{
1880+
// NODE-6861: flakiness is caused by mock KMS servers
1881+
this.retries(2);
1882+
18621883
// Call `client_encryption_with_names.createDataKey()` with "aws:no_client_cert" as the provider and the following masterKey.
18631884
const error = await clientEncryptionWithNames
18641885
.createDataKey('gcp:no_client_cert', {

0 commit comments

Comments
 (0)