AWS: Close custom AwsCredentialsProvider in RESTSigV4AuthSession#15818
Open
XJDKC wants to merge 1 commit intoapache:mainfrom
Open
AWS: Close custom AwsCredentialsProvider in RESTSigV4AuthSession#15818XJDKC wants to merge 1 commit intoapache:mainfrom
XJDKC wants to merge 1 commit intoapache:mainfrom
Conversation
XJDKC
changed the title
singhpk234
reviewed
Mar 29, 2026
Comment on lines
+315
to
+327
| AuthSession delegate = Mockito.mock(AuthSession.class); | ||
| CloseableAwsCredentialsProvider credentialsProvider = | ||
| Mockito.mock(CloseableAwsCredentialsProvider.class); | ||
| AwsProperties properties = Mockito.mock(AwsProperties.class); | ||
| when(properties.restSigningRegion()).thenReturn(Region.US_WEST_2); | ||
| when(properties.restSigningName()).thenReturn("execute-api"); | ||
| when(properties.restCredentialsProvider()).thenReturn(credentialsProvider); | ||
|
|
||
| RESTSigV4AuthSession session = new RESTSigV4AuthSession(signer, delegate, properties); | ||
| session.close(); | ||
|
|
||
| Mockito.verify(delegate).close(); | ||
| Mockito.verify(credentialsProvider).close(); |
Contributor
There was a problem hiding this comment.
There is lot of common code between this and function below can we extract the common part, i beliver we just need a delegate that throws and a delegate that doesn't in both the test respectively
singhpk234
reviewed
Mar 29, 2026
| @Override | ||
| public void close() { | ||
| delegate.close(); | ||
| if (closeableGroup != null) { |
Contributor
There was a problem hiding this comment.
when will this be null ?
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Summary
RESTSigV4AuthSessionholds anAwsCredentialsProviderobtained fromAwsProperties.restCredentialsProvider(), which may beAutoCloseable(e.g.DefaultCredentialsProvider,StsCredentialsProvider). Previously,close()only closed the delegateAuthSessionbut never closed the credentials provider, causing a resource leak.This PR uses a
CloseableGroupto manage both the delegate and the credentials provider (when it implementsAutoCloseable), ensuring both are properly closed. Close failures are suppressed so that one failing resource doesn't prevent the other from being closed.