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

Revert "Revert "credentials/alts: defer ALTS stream creation until handshake …" #6179

Merged
merged 3 commits into from
Apr 11, 2023

Conversation

matthewstevenson88
Copy link
Contributor

@matthewstevenson88 matthewstevenson88 commented Apr 10, 2023

Reverts #6148.

In #6177, we added new tests that would have caught a bug like the one that forced #6077 to be reverted.

RELEASE NOTES: N/A

@zasweq
Copy link
Contributor

zasweq commented Apr 11, 2023

Does this fix the breakage caused by the commit (the reason we rolled back)?

@zasweq zasweq added the Type: Feature New features or improvements in behavior label Apr 11, 2023
@zasweq zasweq added this to the 1.55 Release milestone Apr 11, 2023
@matthewstevenson88 matthewstevenson88 marked this pull request as ready for review April 11, 2023 21:01
@matthewstevenson88
Copy link
Contributor Author

Thanks @zasweq! Yes this PR fixes the original problem with #6177: we check that h.stream is non-nil before calling Close(), and have a unit test that confirms this.

Additionally, I've already merged #6177, which adds e2e tests that would have caught the error in #6177 before import. The tests on this PR were originally failing because the e2e test was flaky: I just merged #6183, which fixes the flake. Huge thanks again to @easwars for his help on these 2 PRs. :)

@zasweq
Copy link
Contributor

zasweq commented Apr 11, 2023

Ah, good to hear! Will approve then. I ran our import already this week, so this will get picked up in next weeks import :).

Copy link
Contributor

@zasweq zasweq left a comment

Choose a reason for hiding this comment

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

LGTM.

@easwars easwars merged commit 5a50b97 into grpc:master Apr 11, 2023
1 check passed
@matthewstevenson88
Copy link
Contributor Author

Thank you both!

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Type: Feature New features or improvements in behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants