-
Notifications
You must be signed in to change notification settings - Fork 59
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
feat: revert #3400: reintroduce experimental S2A integration in client libraries grpc transport #3548
Merged
lqiu96
merged 25 commits into
googleapis:main
from
rmehta19:s2a-integration-roll-forward
Jan 24, 2025
Merged
feat: revert #3400: reintroduce experimental S2A integration in client libraries grpc transport #3548
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
3d99673
initial revert of #3400.
rmehta19 9b4b405
Path #3401.
rmehta19 ffa4e7b
Patch #3386.
rmehta19 b03cb51
change env var name.
rmehta19 451e31b
fix comment.
rmehta19 494e828
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 22c82ad
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 2ce9003
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 e19dad4
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 0807a2e
declare + define env var one line.
rmehta19 95e70d3
remove duplicate builder initialization.
rmehta19 b807294
Modify S2A API reflection log message.
rmehta19 882047c
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 25445d3
set mtls endpoint for S2A in EndpointContext.
rmehta19 e921696
address nits in code comment language + formatting.
rmehta19 9fb0b49
move S2A check in determineEndpoint.
rmehta19 fd6163a
mark withUseS2A as a Beta API.
rmehta19 a814a53
remove mtls endpoint from clirr-ignored-differences.
rmehta19 1703f51
default withUseS2A doesn't throw an exception.
rmehta19 22562d6
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 b046dc9
resolve merge conflict.
rmehta19 6f56cff
move S2A check to end of determineEndpoint.
rmehta19 ea4e701
update comment above S2A logic in determineEndpoint.
rmehta19 fa59ce8
Merge branch 'main' into s2a-integration-roll-forward
rmehta19 aa6ba37
add more detail to S2A comment in determine endpoint.
rmehta19 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
...ogle/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/AsyncGetBook.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...apic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetCredentialsProvider.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncCreateSetEndpoint.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oogle/api/generator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBook.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...enerator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookIntListbook.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...rator/gapic/composer/grpc/goldens/samples/bookshopclient/SyncGetBookStringListbook.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...tor/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncFastFibonacci.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...tor/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/AsyncSlowFibonacci.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oser/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetCredentialsProvider.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncCreateSetEndpoint.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncFastFibonacci.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ator/gapic/composer/grpc/goldens/samples/deprecatedserviceclient/SyncSlowFibonacci.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncBlock.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChat.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncChatAgain.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...m/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollect.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncCollideName.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncEcho.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...om/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncExpand.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpand.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncPagedExpandPaged.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...pi/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpand.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...nerator/gapic/composer/grpc/goldens/samples/echoclient/AsyncSimplePagedExpandPaged.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWait.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...m/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/AsyncWaitLRO.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncBlock.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCollideName.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...or/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetCredentialsProvider.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncCreateSetEndpoint.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...a/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEcho.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...le/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoFoobarname.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoNoargs.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
.../api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoResourcename.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStatus.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString1.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoString2.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...pi/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncEchoStringSeverity.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...oogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncPagedExpand.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpand.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...nerator/gapic/composer/grpc/goldens/samples/echoclient/SyncSimplePagedExpandNoargs.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...a/com/google/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWait.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ogle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitDuration.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...gle/api/generator/gapic/composer/grpc/goldens/samples/echoclient/SyncWaitTimestamp.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...e/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncCreateUser.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...e/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncDeleteUser.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...ogle/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncGetUser.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...le/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsers.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...i/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncListUsersPaged.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...e/api/generator/gapic/composer/grpc/goldens/samples/identityclient/AsyncUpdateUser.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...apic/composer/grpc/goldens/samples/identityclient/SyncCreateSetCredentialsProvider.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateSetEndpoint.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...le/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncCreateUser.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...apic/composer/grpc/goldens/samples/identityclient/SyncCreateUserStringStringString.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...dens/samples/identityclient/SyncCreateUserStringStringStringIntStringBooleanDouble.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...tityclient/SyncCreateUserStringStringStringStringStringIntStringStringStringString.golden
This file contains 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
2 changes: 1 addition & 1 deletion
2
...le/api/generator/gapic/composer/grpc/goldens/samples/identityclient/SyncDeleteUser.golden
This file contains 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like running
mvn fmt:formatresulted in all these changes. Perhaps these changes could be made in another PR and then can be removed from this PR.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like these are missed in #3513.
We will do a separate PR for these and you can remove from this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! with the latest merge of main, these changes have been removed from this PR.