Fix bi-di subscription to support dapr-api-token #1142
Merged
Conversation
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
artursouza
commented
Oct 10, 2024
| @@ -59,7 +59,7 @@ public ActorClient(ResiliencyOptions resiliencyOptions) { | |||
| * @param overrideProperties Override properties. | |||
| */ | |||
| public ActorClient(Properties overrideProperties) { | |||
| this(buildManagedChannel(overrideProperties), null); | |||
| this(buildManagedChannel(overrideProperties), null, overrideProperties.getValue(Properties.API_TOKEN)); | |||
There was a problem hiding this comment.
I also needed to fix how properties override work in some cases because it was not handling overrides correctly for Dapr API Token. Now, it works too and all ITs require sidecar calls to have dapr-api-token header.
artursouza
commented
Oct 10, 2024
| @@ -425,7 +474,8 @@ private <T> Subscription<T> buildSubscription( | |||
| SubscriptionListener<T> listener, | |||
| TypeRef<T> type, | |||
| DaprProtos.SubscribeTopicEventsRequestAlpha1 request) { | |||
| Subscription<T> subscription = new Subscription<>(this.asyncStub, request, listener, response -> { | |||
| var interceptedStub = this.grpcInterceptors.intercept(this.asyncStub); | |||
There was a problem hiding this comment.
This is the fix for streaming subscription to handle Dapr API token header.
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
cicoyle
previously approved these changes
Oct 15, 2024
|
Changes lgtm, but I see some build failures - might be flaky |
I have been fixing those for the past few days. Almost there. |
Signed-off-by: Artur Souza <asouza.pro@gmail.com>
I think that was the last one. Waiting for the run now. |
cicoyle
approved these changes
Oct 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fix bi-di subscription to support dapr-api-token
Issue reference
We strive to have all PR being opened based on an issue, where the problem or feature have been discussed prior to implementation.
Please reference the issue this PR will close: #1072
Checklist
Please make sure you've completed the relevant tasks for this PR, out of the following list: