CC-38701 Cherry Picks from v1.16.x branch onto v2.0.2 branch - #101
Open
sgarg99 wants to merge 16 commits into
Open
CC-38701 Cherry Picks from v1.16.x branch onto v2.0.2 branch #101sgarg99 wants to merge 16 commits into
sgarg99 wants to merge 16 commits into
Conversation
![service-bot-app[bot]](https://github.githubassets.com/images/gravatars/gravatar-user-420.png){kind=avatar}
* CC-31041 : Cherry-pick changes from release branch v1.11.x (#65) * Cherrypick local changes from previous releases (#32) (#36) * resolved merge conflicts * Throw ConnectException if resume of change stream is not possible * indentation and formatting Co-authored-by: Tarun Jain <107803496+tarunjain-confluent@users.noreply.github.com> * Skip logging of records on error (#37) (#39) Co-authored-by: Subhash Iyer <siyer@confluent.io> * change default to false (#40) * add srv check (#42) * Fix custom Delete write model strategy support (#44) KAFKA-395 Co-authored-by: tlsdnwn55 <tlsdnwn55@naver.com> Co-authored-by: Ross Lawley <ross@mongodb.com> * add logging in mongodbclient helper (#48) * add semaphore file for v1.11.x (#55) * CC-27090: Add upsert replace option for ReplaceOneModel in update operation (#54) * remove spotless (#57) * Change trace log to log hash of valueDoc (#60) * Added error message for IllegalArgumentException (#61) * Add error in dlq message (#59) --------- Co-authored-by: Rohit <rohit1@confluent.io> Co-authored-by: Tarun Jain <107803496+tarunjain-confluent@users.noreply.github.com> Co-authored-by: Subhash Iyer <siyer@confluent.io> Co-authored-by: srishti-saraswat <98515593+srishti-saraswat@users.noreply.github.com> Co-authored-by: tlsdnwn55 <tlsdnwn55@naver.com> Co-authored-by: Ross Lawley <ross@mongodb.com> Co-authored-by: Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> Co-authored-by: Rohit <32812417+rohits64@users.noreply.github.com> * chore: update repo by service bot (#66) (#68) * Replace all occurrences of 's1-prod-ubuntu20-04' with 's1-prod-ubuntu24-04' * chore: update repo semaphore config * Minor: fix build commands --------- Co-authored-by: service-bot-app[bot] <189278048+service-bot-app[bot]@users.noreply.github.com> Co-authored-by: service-bot-app[bot] <foo-bar+service-bot-app[bot]@users.noreply.github.com> * CC-33219 | Added new configuration remove.field.on.schema.mismatch (#72) * Added new configuration remove.field.on.schema.mismatch * Updated extra field exception format * CC-32392 | Used RegexUtils instead java.util to fix ReDOS issue (#73) * Used RegexUtils instead java.util to fix ReDOS issue * Updated default value to 100ms instead of 1000ms * [CC-32391] Use RegexUtils to avoid ReDOS in sink connector (#74) Summary: Potential ReDOS vulnerability from user-supplied data in java.util.regex When topics.regex and topic.override.<topic_name>.<property> are both provided, the sink connector matches <topic_name> with the topics.regex. Here there is a ReDOS vulnerability - CWE-1333. Switch to RegexUtils.matches, which enforces a timeout, and uses an executor thread. Expose regex.timeout.ms similar to SourceConfig Testing: Added unit test with: 1. A safe regex and topic override which does not cause ReDOS. 2. An unsafe regex and topic override, which would have caused ReDOS, but times out instead. Backward compatible: Yes * CC-32392 : Added mongo dependencies for connect-utils Added mongo dependencies for connect-utils * Fix non srv record validation (#76) --------- Co-authored-by: Aniket Shrimal <30872045+aniketshrimal@users.noreply.github.com> Co-authored-by: Rohit <rohit1@confluent.io> Co-authored-by: Tarun Jain <107803496+tarunjain-confluent@users.noreply.github.com> Co-authored-by: Subhash Iyer <siyer@confluent.io> Co-authored-by: srishti-saraswat <98515593+srishti-saraswat@users.noreply.github.com> Co-authored-by: tlsdnwn55 <tlsdnwn55@naver.com> Co-authored-by: Ross Lawley <ross@mongodb.com> Co-authored-by: Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> Co-authored-by: Rohit <32812417+rohits64@users.noreply.github.com> Co-authored-by: service-bot-app[bot] <189278048+service-bot-app[bot]@users.noreply.github.com> Co-authored-by: service-bot-app[bot] <foo-bar+service-bot-app[bot]@users.noreply.github.com> Co-authored-by: Sarthak Sonagara <ssonagara@confluent.io> Co-authored-by: Sharan Rudresh <srudresh@confluent.io>
* Remove sensitive info from logs * Removed %s
Enabled docker instance for Mongodb to run the ITs Enabled integration tests in the semaphore pipeline
…ma. (#82) * Added logging for reproducing the issue * Added logging for reproducing the issue * Added logging for reproducing the issue
…onnector in MongoCopyDataManager (#83)
* Doing redundant change to check if sonarqube is enabled * Editing the key value
…ing. (#87) Co-authored-by: service-bot-app[bot] <service-bot-app[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem:
https://confluentinc.atlassian.net/browse/CC-38701
Upgrade mongo-kafka to v2.0.2
Solution:
The mongo-kafka fork branch was upgraded to 2.0.2. In this PR adding the cherry-picks which are not present in the forked repo to the upgraded branch.