Skip to content

Commit 7cc09f3

Browse files
authored
fix(amazonq): fix uploading file method error handling for /doc (#5400)
1 parent 8de1315 commit 7cc09f3

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
4+
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.getLogger
2020
import software.aws.toolkits.core.utils.warn
2121
import software.aws.toolkits.jetbrains.common.clients.AmazonQCodeGenerateClient
2222
import software.aws.toolkits.jetbrains.common.session.Intent
23+
import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
2324
import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
2425
import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
2526
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOper
3132
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
3233
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
3334
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
35+
import software.aws.toolkits.resources.message
3436
import software.aws.toolkits.telemetry.AmazonqTelemetry
3537
import software.aws.toolkits.telemetry.MetricResult
3638

@@ -82,7 +84,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
8284
}
8385
}
8486

85-
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String):
87+
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String, featureName: String? = null):
8688
CreateUploadUrlResponse {
8789
try {
8890
logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
@@ -104,6 +106,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
104106
logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
105107

106108
if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
109+
if (featureName?.equals("docGeneration") == true) {
110+
throw docServiceError(message("amazonqDoc.exception.content_length_error"))
111+
}
107112
throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
108113
}
109114
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/PrepareDocGenerationState.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class PrepareDocGenerationState(
4848
config.conversationId,
4949
zipFileChecksum,
5050
zipFileLength,
51-
uploadId
51+
uploadId,
52+
"docGeneration"
5253
)
5354

5455
uploadArtifactToS3(

0 commit comments

Comments
 (0)