Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,18 @@ internal class WorkloadIdentityHttpClient(
}

override fun close() {
workloadIdentityAuth?.close()
try {
workloadIdentityAuth?.close()
} catch (authFailure: Throwable) {
try {
delegate.close()
} catch (delegateFailure: Throwable) {
if (delegateFailure !== authFailure) {
authFailure.addSuppressed(delegateFailure)
}
}
throw authFailure
}
delegate.close()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ import java.util.concurrent.ExecutionException
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.junit.jupiter.api.extension.ExtendWith
import org.mockito.junit.jupiter.MockitoExtension
import org.mockito.kotlin.any
import org.mockito.kotlin.argThat
import org.mockito.kotlin.doThrow
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
Expand Down Expand Up @@ -134,6 +136,51 @@ internal class WorkloadIdentityHttpClientTest {
)
}

@Test
fun close_closesAuthAndDelegate() {
val workloadIdentityAuth = mock<WorkloadIdentityAuth>()
val delegateHttpClient = mock<HttpClient>()
val client = WorkloadIdentityHttpClient(delegateHttpClient, workloadIdentityAuth)

client.close()

verify(workloadIdentityAuth).close()
verify(delegateHttpClient).close()
}

@Test
fun close_whenAuthCloseFails_stillClosesDelegate() {
val authFailure = IllegalStateException("auth close failed")
val workloadIdentityAuth = mock<WorkloadIdentityAuth>()
val delegateHttpClient = mock<HttpClient>()
doThrow(authFailure).whenever(workloadIdentityAuth).close()
val client = WorkloadIdentityHttpClient(delegateHttpClient, workloadIdentityAuth)

val thrown = assertThrows<IllegalStateException> { client.close() }

assertThat(thrown).isSameAs(authFailure)
verify(workloadIdentityAuth).close()
verify(delegateHttpClient).close()
}

@Test
fun close_whenAuthAndDelegateCloseFail_suppressesDelegateFailure() {
val authFailure = IllegalStateException("auth close failed")
val delegateFailure = IllegalArgumentException("delegate close failed")
val workloadIdentityAuth = mock<WorkloadIdentityAuth>()
val delegateHttpClient = mock<HttpClient>()
doThrow(authFailure).whenever(workloadIdentityAuth).close()
doThrow(delegateFailure).whenever(delegateHttpClient).close()
val client = WorkloadIdentityHttpClient(delegateHttpClient, workloadIdentityAuth)

val thrown = assertThrows<IllegalStateException> { client.close() }

assertThat(thrown).isSameAs(authFailure)
assertThat(thrown.suppressed).containsExactly(delegateFailure)
verify(workloadIdentityAuth).close()
verify(delegateHttpClient).close()
}

private fun mockResponse(statusCode: Int, body: String): HttpResponse {
return object : HttpResponse {
override fun statusCode() = statusCode
Expand Down