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

s2a: Address comments on PR#11113 #11534

Merged
merged 9 commits into from
Sep 20, 2024
Merged

Conversation

rmehta19
Copy link
Contributor

No description provided.

@rmehta19 rmehta19 mentioned this pull request Sep 17, 2024
Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

This batch of changes looks fine (excepting the one interrupt comment). We can merge this easily and additional changes can be in another PR.

@@ -121,6 +121,7 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC
try {
resp = stub.send(reqBuilder.build());
} catch (IOException | InterruptedException e) {
Copy link
Member

Choose a reason for hiding this comment

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

This catch needs to be split, because we don't want to interrupt on IOException.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for pointing that out, done in b060a49

@ejona86
Copy link
Member

ejona86 commented Sep 18, 2024

Ugh. Sorry, my #11537 is causing a conflict here.

@rmehta19 rmehta19 changed the title [In Progress]s2a: Address comments on PR#11113 s2a: Address comments on PR#11113 Sep 19, 2024
@rmehta19
Copy link
Contributor Author

This batch of changes looks fine (excepting the one interrupt comment). We can merge this easily and additional changes can be in another PR.

Thanks @ejona86, addressed the interrupt comment. I'll address the rest of the things from PR#113 in separate PR's as needed.

@rmehta19
Copy link
Contributor Author

@ejona86 , I think you may have to add the kokoro tag to get the rest of tests to run

@ejona86 ejona86 added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Sep 20, 2024
@grpc-kokoro grpc-kokoro removed the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Sep 20, 2024
@larry-safran larry-safran added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Sep 20, 2024
@grpc-kokoro grpc-kokoro removed the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Sep 20, 2024
@@ -121,6 +121,9 @@ private void checkPeerTrusted(X509Certificate[] chain, boolean isCheckingClientC
try {
resp = stub.send(reqBuilder.build());
} catch (IOException | InterruptedException e) {
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be more standard as the following (but I don't feel strongly about it as it requires the CertificateException definition to be duplicated)

    } catch (IOException e) {
      Thread.currentThread().interrupt();
      throw new CertificateException("Failed to send request to S2A.", e);
    } catch (InterruptedException e) {
      throw new CertificateException("Failed to send request to S2A.", e);
    }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks Larry, I'll address this in a followup along with #11539 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done in f264c58

@larry-safran larry-safran added the kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run label Sep 20, 2024
@larry-safran larry-safran merged commit d8f73e0 into grpc:master Sep 20, 2024
15 checks passed
kannanjgithub pushed a commit to kannanjgithub/grpc-java that referenced this pull request Oct 23, 2024
* Mark S2A public APIs as experimental.

* Rename S2AChannelCredentials createBuilder API to newBuilder.

* Remove usage of AdvancedTls.

* Use InsecureChannelCredentials.create instead of Optional.

* Invoke Thread.currentThread().interrupt() in a InterruptedException block.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kokoro:run Add this label to a PR to tell Kokoro the code is safe and tests can be run
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants