Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSOT: Master into csot merge #1397

Merged
merged 23 commits into from
May 24, 2024
Merged

Conversation

vbabanin
Copy link
Member

No description provided.

stIncMale and others added 20 commits April 23, 2024 09:22
* Implement OIDC SASL mechanism in sync (mongodb#1107)

JAVA-4980

* Implement OIDC auth for async (mongodb#1131)

JAVA-4981

* Remove non-machine workflow (mongodb#1259)

JAVA-5077

* Add Human OIDC Workflow (mongodb#1316)

JAVA-5328

* OIDC Add remaining environments (azure, gcp), evergreen testing, API naming updates (mongodb#1371)

JAVA-5353
JAVA-5395
JAVA-4834
JAVA-4932

Co-authored-by: Valentin Kovalenko <valentin.kovalenko@mongodb.com>
* Remove branching code in the driver based on 3.6 version checks
* Remove testing of 3.6
* Clean up tests

JAVA-5294
JAVA-5356

---------

Co-authored-by: slav.babanin <slav.babanin@mongodb.com>
# Conflicts:
#	THIRD-PARTY-NOTICES
#	driver-core/src/main/com/mongodb/internal/connection/Authenticator.java
#	driver-core/src/main/com/mongodb/internal/connection/DefaultAuthenticator.java
#	driver-core/src/main/com/mongodb/internal/connection/InternalConnection.java
#	driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnection.java
#	driver-core/src/main/com/mongodb/internal/connection/InternalStreamConnectionInitializer.java
#	driver-core/src/main/com/mongodb/internal/connection/SaslAuthenticator.java
#	driver-core/src/test/functional/com/mongodb/ClusterFixture.java
#	driver-core/src/test/unit/com/mongodb/internal/connection/AbstractConnectionPoolTest.java
#	driver-core/src/test/unit/com/mongodb/internal/connection/CommandMessageSpecification.groovy
#	driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncMongoClient.java
#	driver-sync/src/test/functional/com/mongodb/client/AbstractRetryableReadsTest.java
#	driver-sync/src/test/functional/com/mongodb/client/unified/Entities.java
@vbabanin vbabanin marked this pull request as ready for review May 21, 2024 05:37
@vbabanin vbabanin requested a review from katcharov May 21, 2024 22:21
@vbabanin
Copy link
Member Author

@katcharov this pull request merges master into CSOT. One of the features added to the master branch is OIDC. While I merged OIDC with CSOT, this merge does not include the OIDC spec implementation, which is covered by a separate ticket.

I've added you as a reviewer to double-check if merging CSOT with the OIDC-specific changes might introduce any regression issues. I would appreciate your review.

Copy link
Contributor

@katcharov katcharov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not see a way to review, except to perform the merge myself (which was not too substantial), and compare the results - there were not many differences, and I have noted the non-trivial ones below.

vbabanin and others added 3 commits May 22, 2024 17:03
…treamConnection.java

Co-authored-by: Maxim Katcharov <maxim.katcharov@mongodb.com>
…treamConnection.java

Co-authored-by: Maxim Katcharov <maxim.katcharov@mongodb.com>
@vbabanin vbabanin requested a review from katcharov May 23, 2024 06:11
@vbabanin vbabanin changed the title Master into csot merge CSOT: Master into csot merge May 23, 2024
Copy link
Contributor

@katcharov katcharov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@vbabanin vbabanin merged commit 2b4dc77 into mongodb:CSOT May 24, 2024
58 of 62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants