fix(NODE-3921): error on invalid TLS option combinations #3405
Conversation
biniona-mongodb
changed the title
| if (Reflect.has(options, a) && Reflect.has(options, b)) { | ||
| throw new MongoParseError(`The '${a}' option cannot be used with '${b}'`); | ||
| if (allOptions.has(a) && allOptions.has(b)) { | ||
| throw new MongoAPIError(`The '${a}' option cannot be used with the '${b}' option`); |
There was a problem hiding this comment.
See this thread for context on why this error type was changed
| } | ||
| } | ||
|
|
||
| checkTLSOptions(allOptions); |
There was a problem hiding this comment.
Changed check to use allOptions from mongoOptions as mongoOptions object does not have key value pairs when value would be falsy.
| * @param allOptions - all options provided by user | ||
| * @throws MongoAPIError if TLS options are invalid | ||
| */ | ||
| export function checkTLSOptions(options: AnyOptions): void { |
There was a problem hiding this comment.
Remove export because AFAICT checkTLSOptions is not used outside this module and is not included in public API.
nbbeeken
left a comment
nbbeeken
left a comment
There was a problem hiding this comment.
LGTM, Thanks for the help here!
|
hey @biniona-mongodb - thanks for the fix. Once the merge conflicts on this PR have been resolved, this should be good go to. if you don't have time, we can always resolve the conflicts as well. just let us know |
# Conflicts: # src/connection_string.ts
|
Hey @baileympearson and @nbbeeken, I just resolved the conflicts. Let me know if you'd like to see any additional changes 🙂. |
baileympearson
left a comment
baileympearson
left a comment
There was a problem hiding this comment.
@nbbeeken I logged the flaky tests and reran the failures, CI is green now
nbbeeken
changed the title
4 participants
Description
Unskip tests to ensure that specifying mutually exclusive TLS options raises an error.
What is changing?
allOptionsobject rather thanmongoOptionsobject. This was done asmongoOptionsobject does not contain options with falsy values.mongoOptionsobject.Is there new documentation needed for these changes?
None
What is the motivation for this change?
https://jira.mongodb.org/browse/NODE-3921
Double check the following
npm run check:lintscript<type>(NODE-xxxx)<!>: <description>