Skip to content

fix(amazonq): add retry on IOException #5246

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.

Sign up for GitHub

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

Merged
dhasani23 merged 7 commits into from
Jan 10, 2025
Merged

fix(amazonq): add retry on IOException #5246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d5f9346
fix(amazonq): add retry on IOException
Jan 10, 2025
e104077
fix test
Jan 10, 2025
05b97c2
update test
Jan 10, 2025
7d5c6cf
update test
Jan 10, 2025
5a3dbf1
fix detekt
Jan 10, 2025
38aa4b6
Merge branch 'main' into fixRetry
dhasani23 Jan 10, 2025
dcd8edb
Merge branch 'main' into fixRetry
dhasani23 Jan 10, 2025
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
7 changes: 5 additions & 2 deletions ...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ import java.net.ConnectException
import java.net.SocketTimeoutException
import java.net.UnknownHostException
import java.nio.file.Path
import java.time.Duration
import java.time.Instant
import java.util.Base64
import java.util.concurrent.CancellationException
Expand Down Expand Up @@ -408,8 +409,10 @@ class CodeModernizerSession(
UnknownHostException::class,
SocketTimeoutException::class,
HttpRequests.HttpStatusException::class,
ConnectException::class
)
ConnectException::class,
IOException::class,
),
maxDuration = Duration.ofMinutes(5)
) {
clientAdaptor.uploadArtifactToS3(
createUploadUrlResponse.uploadUrl(),
Expand Down
7 changes: 3 additions & 4 deletions .../aws/toolkits/jetbrains/services/codemodernizer/CodeWhispererCodeModernizerSessionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ import software.aws.toolkits.jetbrains.utils.rules.HeavyJavaCodeInsightTestFixtu
import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
import java.io.File
import java.io.FileInputStream
import java.io.IOException
import java.net.ConnectException
import java.util.Base64
import java.util.zip.ZipFile
Expand Down Expand Up @@ -478,13 +477,13 @@ class CodeWhispererCodeModernizerSessionTest : CodeWhispererCodeModernizerTestBa
}

@Test
fun `CodeModernizer cannot upload payload due to unknown issue`() = runTest {
fun `CodeModernizer cannot upload payload due to unknown client-side issue`() = runTest {
doReturn(ZipCreationResult.Succeeded(File("./tst-resources/codemodernizer/test.txt")))
.whenever(testSessionContextSpy).createZipWithModuleFiles(any())
doReturn(exampleCreateUploadUrlResponse).whenever(clientAdaptorSpy).createGumbyUploadUrl(any())
doAnswer { throw IOException("mock exception") }.whenever(clientAdaptorSpy).uploadArtifactToS3(any(), any(), any(), any(), any())
doAnswer { throw Exception("mock client-side exception") }.whenever(clientAdaptorSpy).uploadArtifactToS3(any(), any(), any(), any(), any())
val result = testSessionSpy.createModernizationJob(MavenCopyCommandsResult.Success(File("./mock/path/")))
assertEquals(CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.OTHER("mock exception")), result)
assertEquals(CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.OTHER("mock client-side exception")), result)
verify(testSessionStateSpy, times(1)).putJobHistory(any(), eq(TransformationStatus.FAILED), any(), any())
assertEquals(testSessionStateSpy.currentJobStatus, TransformationStatus.FAILED)
}
Expand Down
Loading