Merge branch 'main' into NODE-7067

Author: PavelSafronov

drivers-evergreen-tools

@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@mongodb-js/saslprep": "^1.3.0",
-    "bson": "^7.0.0-alpha.1",
+    "bson": "^7.0.0-alpha.2",
     "mongodb-connection-string-url": "^4.0.0-alpha"
   },
   "peerDependencies": {

package-lock.json

@@ -1,4 +1,4 @@
-import { type KMSProviders } from './mongodb';
+import { type KMSProviders } from './../src';
 
 const csfleKMSProviders = {
   aws: {

package.json

@@ -1,7 +1,10 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { Connection, LEGACY_HELLO_COMMAND, type MongoClient, ScramSHA256 } from '../../mongodb';
+import { type MongoClient } from '../../../src';
+import { ScramSHA256 } from '../../../src/cmap/auth/scram';
+import { Connection } from '../../../src/cmap/connection';
+import { LEGACY_HELLO_COMMAND } from '../../../src/constants';
 import { type TestConfiguration } from '../../tools/runner/config';
 
 function makeConnectionString(config, username, password) {

test/csfle-kms-providers.ts

@@ -2,7 +2,8 @@ import * as process from 'node:process';
 
 import { expect } from 'chai';
 
-import { AWSSDKCredentialProvider, type MongoClient, MongoServerError } from '../../mongodb';
+import { type MongoClient, MongoServerError } from '../../../src';
+import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
 
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 

test/integration/auth/auth.prose.test.ts

@@ -5,22 +5,22 @@ import * as http from 'http';
 import { performance } from 'perf_hooks';
 import * as sinon from 'sinon';
 
-import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
 import {
-  AWSSDKCredentialProvider,
   type CommandOptions,
-  Connection,
   type Document,
   MongoAWSError,
   type MongoClient,
-  MongoDBAWS,
   type MongoDBNamespace,
   type MongoDBResponseConstructor,
   MongoMissingCredentialsError,
   MongoMissingDependencyError,
-  MongoServerError,
-  setDifference
-} from '../../mongodb';
+  MongoServerError
+} from '../../../src';
+import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
+import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
+import { MongoDBAWS } from '../../../src/cmap/auth/mongodb_aws';
+import { Connection } from '../../../src/cmap/connection';
+import { setDifference } from '../../../src/utils';
 
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 

test/integration/auth/mongodb_aws.prose.test.ts

@@ -8,10 +8,10 @@ import {
   type ClientSession,
   type Collection,
   MongoClient,
-  type MongoDBOIDC,
   type OIDCCallbackParams,
   type OIDCResponse
-} from '../../mongodb';
+} from '../../../src';
+import { type MongoDBOIDC } from '../../../src/cmap/auth/mongodb_oidc';
 
 const createCallback = (tokenFile = 'test_user1', expiresInSeconds?: number, extraFields?: any) => {
   return async (params: OIDCCallbackParams) => {

test/integration/auth/mongodb_aws.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, MongoClient, type MongoClientOptions } from '../../mongodb';
+import { type Collection, MongoClient, type MongoClientOptions } from '../../../src';
 
 const DEFAULT_URI = 'mongodb://127.0.0.1:27017';
 

test/integration/auth/mongodb_oidc.prose.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, MongoClient, type MongoClientOptions } from '../../mongodb';
+import { type Collection, MongoClient, type MongoClientOptions } from '../../../src';
 
 const DEFAULT_URI = 'mongodb://127.0.0.1:27017';