File tree 3 files changed +10
-4
lines changed
3 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -1630,7 +1630,7 @@ tasks:
1630
1630
- func : bootstrap mongo-orchestration
1631
1631
vars :
1632
1632
VERSION : latest
1633
- TOPOLOGY : server
1633
+ TOPOLOGY : replica_set
1634
1634
- func : bootstrap kms servers
1635
1635
- func : run custom csfle tests
1636
1636
- name : test-latest-server-noauth
Original file line number Diff line number Diff line change @@ -512,7 +512,7 @@ oneOffFuncAsTasks.push({
512
512
func : 'bootstrap mongo-orchestration' ,
513
513
vars : {
514
514
VERSION : 'latest' ,
515
- TOPOLOGY : 'server '
515
+ TOPOLOGY : 'replica_set '
516
516
}
517
517
} ,
518
518
{ func : 'bootstrap kms servers' } ,
Original file line number Diff line number Diff line change @@ -124,9 +124,15 @@ export class Encrypter {
124
124
125
125
static checkForMongoCrypt ( ) : void {
126
126
let mongodbClientEncryption = undefined ;
127
+ // Ensure you always wrap an optional require in the try block NODE-3199
127
128
try {
128
- // Ensure you always wrap an optional require in the try block NODE-3199
129
- mongodbClientEncryption = require ( 'mongodb-client-encryption' ) ;
129
+ // Note (NODE-4254): This is to get around the circular dependency between
130
+ // mongodb-client-encryption and the driver in the test scenarios.
131
+ if ( process . env . MONGODB_CLIENT_ENCRYPTION_OVERRIDE ) {
132
+ mongodbClientEncryption = require ( process . env . MONGODB_CLIENT_ENCRYPTION_OVERRIDE ) ;
133
+ } else {
134
+ mongodbClientEncryption = require ( 'mongodb-client-encryption' ) ;
135
+ }
130
136
} catch ( err ) {
131
137
throw new MongoMissingDependencyError (
132
138
'Auto-encryption requested, but the module is not installed. ' +
You can’t perform that action at this time.
0 commit comments