Skip to content

Commit d57d82d

Browse files
committed
fix(amazonq): fix uploading file method error handling for /doc
1 parent a39df44 commit d57d82d

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-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: 5 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
@@ -82,7 +83,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
8283
}
8384
}
8485

85-
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String):
86+
fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String, featureName: String? = null):
8687
CreateUploadUrlResponse {
8788
try {
8889
logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
@@ -104,6 +105,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
104105
logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
105106

106107
if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
108+
if (featureName?.equals("docGeneration") == true) {
109+
throw docServiceError(message("amazonqDoc.exception.content_length_error"))
110+
}
107111
throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
108112
}
109113
}

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)