From 60a2be25ac576e84f9e9ba2ba2b4317d8a5338e3 Mon Sep 17 00:00:00 2001 From: Kevin Ding Date: Mon, 3 Feb 2025 18:54:25 -0500 Subject: [PATCH 1/4] telemetry: refactor doc telemetry to v2 version --- .../clients/AmazonQCodeGenerateClient.kt | 15 +- .../amazonqDoc/controller/DocController.kt | 56 +- .../controller/DocGenerationTask.kt | 77 ++- .../services/amazonqDoc/session/DocSession.kt | 99 +++- .../codemodernizer/model/BuildStepStatus.kt | 1 + .../codewhispererruntime/service-2.json | 477 ++++++++++++++---- 6 files changed, 568 insertions(+), 157 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt index 7741758d49..b6b192531e 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/clients/AmazonQCodeGenerateClient.kt @@ -13,7 +13,8 @@ import software.amazon.awssdk.services.codewhispererruntime.model.ContentChecksu import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationRequest import software.amazon.awssdk.services.codewhispererruntime.model.CreateTaskAssistConversationResponse import software.amazon.awssdk.services.codewhispererruntime.model.CreateUploadUrlResponse -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationEvent +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2AcceptanceEvent +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2GenerationEvent import software.amazon.awssdk.services.codewhispererruntime.model.GetTaskAssistCodeGenerationResponse import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem @@ -49,7 +50,7 @@ class AmazonQCodeGenerateClient(private val project: Project) { OptOutPreference.OPTOUT } - private val docGenerationUserContext = ClientMetadata.getDefault().let { + private val docUserContext = ClientMetadata.getDefault().let { val osForFeatureDev: OperatingSystem = when { SystemInfo.isWindows -> OperatingSystem.WINDOWS @@ -75,15 +76,17 @@ class AmazonQCodeGenerateClient(private val project: Project) { private val amazonQStreamingClient get() = AmazonQStreamingClient.getInstance(project) - fun sendDocGenerationTelemetryEvent( - docGenerationEvent: DocGenerationEvent, + fun sendDocTelemetryEvent( + generationEvent: DocV2GenerationEvent? = null, + acceptanceEvent: DocV2AcceptanceEvent? = null, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> - telemetryEventBuilder.docGenerationEvent(docGenerationEvent) + generationEvent?.let { telemetryEventBuilder.docV2GenerationEvent(it) } + acceptanceEvent?.let { telemetryEventBuilder.docV2AcceptanceEvent(it) } } requestBuilder.optOutPreference(getTelemetryOptOutPreference()) - requestBuilder.userContext(docGenerationUserContext) + requestBuilder.userContext(docUserContext) } fun createTaskAssistConversation(): CreateTaskAssistConversationResponse = bearerClient().createTaskAssistConversation( diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt index c52bedf1d9..8ae0833196 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt @@ -18,9 +18,9 @@ import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.wm.ToolWindowManager import kotlinx.coroutines.withContext -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationFolderLevel -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationInteractionType -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationUserDecision +import software.amazon.awssdk.services.codewhispererruntime.model.DocFolderLevel +import software.amazon.awssdk.services.codewhispererruntime.model.DocInteractionType +import software.amazon.awssdk.services.codewhispererruntime.model.DocUserDecision import software.aws.toolkits.core.utils.debug import software.aws.toolkits.core.utils.error import software.aws.toolkits.core.utils.getLogger @@ -168,25 +168,25 @@ class DocController( FollowUpTypes.NEW_TASK -> newTask(message.tabId) FollowUpTypes.CLOSE_SESSION -> closeSession(message.tabId) FollowUpTypes.CREATE_DOCUMENTATION -> { - docGenerationTask.interactionType = DocGenerationInteractionType.GENERATE_README + docGenerationTask.interactionType = DocInteractionType.GENERATE_README mode = Mode.CREATE promptForDocTarget(message.tabId) } FollowUpTypes.UPDATE_DOCUMENTATION -> { - docGenerationTask.interactionType = DocGenerationInteractionType.UPDATE_README + docGenerationTask.interactionType = DocInteractionType.UPDATE_README updateDocumentation(message.tabId) } FollowUpTypes.CANCEL_FOLDER_SELECTION -> { - docGenerationTask.reset() + docGenerationTask.folderLevel = DocFolderLevel.ENTIRE_WORKSPACE newTask(message.tabId) } FollowUpTypes.PROCEED_FOLDER_SELECTION -> if (mode == Mode.EDIT) makeChanges(message.tabId) else onDocsGeneration(message) FollowUpTypes.ACCEPT_CHANGES -> { - docGenerationTask.userDecision = DocGenerationUserDecision.ACCEPT - sendDocGenerationTelemetry(message.tabId) + docGenerationTask.userDecision = DocUserDecision.ACCEPT + sendDocAcceptanceTelemetry(message.tabId) acceptChanges(message) } @@ -196,8 +196,8 @@ class DocController( } FollowUpTypes.REJECT_CHANGES -> { - docGenerationTask.userDecision = DocGenerationUserDecision.REJECT - sendDocGenerationTelemetry(message.tabId) + docGenerationTask.userDecision = DocUserDecision.REJECT + sendDocAcceptanceTelemetry(message.tabId) rejectChanges(message) } @@ -208,7 +208,7 @@ class DocController( FollowUpTypes.EDIT_DOCUMENTATION -> { mode = Mode.EDIT - docGenerationTask.interactionType = DocGenerationInteractionType.EDIT_README + docGenerationTask.interactionType = DocInteractionType.EDIT_README promptForDocTarget(message.tabId) } } @@ -454,8 +454,7 @@ class DocController( session.isAuthenticating = true return } - docGenerationTask.userIdentity = session.getUserIdentity() - docGenerationTask.numberOfNavigation += 1 + docGenerationTask.numberOfNavigations += 1 messenger.sendUpdatePlaceholder(tabId, message("amazonqDoc.prompt.placeholder")) } catch (err: Exception) { val message = createUserFacingErrorMessage(err.message) @@ -733,7 +732,6 @@ class DocController( session.isAuthenticating = true return } - docGenerationTask.userIdentity = session.getUserIdentity() session.preloader(message, messenger) when (session.sessionState.phase) { @@ -747,6 +745,7 @@ class DocController( is PrepareDocGenerationState -> state.filePaths else -> emptyList() } + sendDocGenerationTelemetry(filePaths, session) broadcastQEvent(QFeatureEvent.INVOCATION) if (filePaths.isNotEmpty()) { @@ -811,6 +810,8 @@ class DocController( return } + sendDocGenerationTelemetry(filePaths, session) + messenger.sendAnswer( message = docGenerationProgressMessage(DocGenerationStep.COMPLETE, mode), messageType = DocMessageType.AnswerPart, @@ -988,9 +989,9 @@ class DocController( } if (selectedFolder.path == projectRoot.path) { - docGenerationTask.folderLevel = DocGenerationFolderLevel.ENTIRE_WORKSPACE + docGenerationTask.folderLevel = DocFolderLevel.ENTIRE_WORKSPACE } else { - docGenerationTask.folderLevel = DocGenerationFolderLevel.SUB_FOLDER + docGenerationTask.folderLevel = DocFolderLevel.SUB_FOLDER } logger.info { "Selected correct folder inside workspace: ${selectedFolder.path}" } @@ -1005,7 +1006,18 @@ class DocController( } } - private fun sendDocGenerationTelemetry(tabId: String) { + private fun sendDocGenerationTelemetry(filePaths: List, session: DocSession) { + docGenerationTask.conversationId = session.conversationId + val (totalGeneratedChars, totalGeneratedLines, totalGeneratedFiles) = session.countedGeneratedContent(filePaths, docGenerationTask.interactionType) + docGenerationTask.numberOfGeneratedChars = totalGeneratedChars + docGenerationTask.numberOfGeneratedLines = totalGeneratedLines + docGenerationTask.numberOfGeneratedFiles = totalGeneratedFiles + + val docGenerationEvent = docGenerationTask.docGenerationEventBase() + session.sendDocTelemetryEvent(docGenerationEvent) + } + + private fun sendDocAcceptanceTelemetry(tabId: String) { val session = getSessionInfo(tabId) var filePaths: List = emptyList() @@ -1016,12 +1028,12 @@ class DocController( } docGenerationTask.conversationId = session.conversationId val (totalAddedChars, totalAddedLines, totalAddedFiles) = session.countAddedContent(filePaths, docGenerationTask.interactionType) - docGenerationTask.numberOfAddChars = totalAddedChars - docGenerationTask.numberOfAddLines = totalAddedLines - docGenerationTask.numberOfAddFiles = totalAddedFiles + docGenerationTask.numberOfAddedChars = totalAddedChars + docGenerationTask.numberOfAddedLines = totalAddedLines + docGenerationTask.numberOfAddedFiles = totalAddedFiles - val docGenerationEvent = docGenerationTask.docGenerationEventBase() - session.sendDocGenerationEvent(docGenerationEvent) + val docAcceptanceEvent = docGenerationTask.docAcceptanceEventBase() + session.sendDocTelemetryEvent(null, docAcceptanceEvent) } fun getProject() = context.project diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocGenerationTask.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocGenerationTask.kt index 5080ab5b4f..d03b0b3d3b 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocGenerationTask.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocGenerationTask.kt @@ -3,57 +3,82 @@ package software.aws.toolkits.jetbrains.services.amazonqDoc.controller -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationEvent -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationFolderLevel -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationInteractionType -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationUserDecision +import software.amazon.awssdk.services.codewhispererruntime.model.DocFolderLevel +import software.amazon.awssdk.services.codewhispererruntime.model.DocInteractionType +import software.amazon.awssdk.services.codewhispererruntime.model.DocUserDecision +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2AcceptanceEvent +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2GenerationEvent import software.aws.toolkits.core.utils.debug import software.aws.toolkits.core.utils.getLogger class DocGenerationTask { // Telemetry fields var conversationId: String? = null - var numberOfAddChars: Int? = null - var numberOfAddLines: Int? = null - var numberOfAddFiles: Int? = null - var userDecision: DocGenerationUserDecision? = null - var interactionType: DocGenerationInteractionType? = null - var userIdentity: String? = null - var numberOfNavigation = 0 - var folderLevel: DocGenerationFolderLevel? = DocGenerationFolderLevel.ENTIRE_WORKSPACE - fun docGenerationEventBase(): DocGenerationEvent { + var numberOfAddedChars: Int? = null + var numberOfAddedLines: Int? = null + var numberOfAddedFiles: Int? = null + var numberOfGeneratedChars: Int? = null + var numberOfGeneratedLines: Int? = null + var numberOfGeneratedFiles: Int? = null + var userDecision: DocUserDecision? = null + var interactionType: DocInteractionType? = null + var numberOfNavigations = 0 + var folderLevel: DocFolderLevel? = DocFolderLevel.ENTIRE_WORKSPACE + fun docGenerationEventBase(): DocV2GenerationEvent { val undefinedProps = this::class.java.declaredFields .filter { it.get(this) == null } .map { it.name } if (undefinedProps.isNotEmpty()) { val undefinedValue = undefinedProps.joinToString(", ") - logger.debug { "DocGenerationEvent has undefined properties: $undefinedValue" } + logger.debug { "DocV2GenerationEvent has undefined properties: $undefinedValue" } } - return DocGenerationEvent.builder() + return DocV2GenerationEvent.builder() .conversationId(conversationId) - .numberOfAddChars(numberOfAddChars) - .numberOfAddLines(numberOfAddLines) - .numberOfAddFiles(numberOfAddFiles) + .numberOfGeneratedChars(numberOfGeneratedChars) + .numberOfGeneratedLines(numberOfGeneratedLines) + .numberOfGeneratedFiles(numberOfGeneratedFiles) + .interactionType(interactionType) + .numberOfNavigations(numberOfNavigations) + .folderLevel(folderLevel) + .build() + } + + fun docAcceptanceEventBase(): DocV2AcceptanceEvent { + val undefinedProps = this::class.java.declaredFields + .filter { it.get(this) == null } + .map { it.name } + + if (undefinedProps.isNotEmpty()) { + val undefinedValue = undefinedProps.joinToString(", ") + logger.debug { "DocV2AcceptanceEvent has undefined properties: $undefinedValue" } + } + + return DocV2AcceptanceEvent.builder() + .conversationId(conversationId) + .numberOfAddedChars(numberOfAddedChars) + .numberOfAddedLines(numberOfAddedLines) + .numberOfAddedFiles(numberOfAddedFiles) .userDecision(userDecision) .interactionType(interactionType) - .userIdentity(userIdentity) - .numberOfNavigation(numberOfNavigation) + .numberOfNavigations(numberOfNavigations) .folderLevel(folderLevel) .build() } fun reset() { conversationId = null - numberOfAddChars = null - numberOfAddLines = null - numberOfAddFiles = null + numberOfAddedChars = null + numberOfAddedLines = null + numberOfAddedFiles = null + numberOfGeneratedChars = null + numberOfGeneratedLines = null + numberOfGeneratedFiles = null userDecision = null interactionType = null - userIdentity = null - numberOfNavigation = 0 - folderLevel = null + numberOfNavigations = 0 + folderLevel = DocFolderLevel.ENTIRE_WORKSPACE } companion object { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocSession.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocSession.kt index c34ccb1589..25ff215a93 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocSession.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/DocSession.kt @@ -6,8 +6,9 @@ package software.aws.toolkits.jetbrains.services.amazonqDoc.session import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VfsUtil -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationEvent -import software.amazon.awssdk.services.codewhispererruntime.model.DocGenerationInteractionType +import software.amazon.awssdk.services.codewhispererruntime.model.DocInteractionType +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2AcceptanceEvent +import software.amazon.awssdk.services.codewhispererruntime.model.DocV2GenerationEvent import software.amazon.awssdk.services.codewhispererruntime.model.SendTelemetryEventResponse import software.aws.toolkits.core.utils.debug import software.aws.toolkits.core.utils.getLogger @@ -17,7 +18,6 @@ import software.aws.toolkits.jetbrains.common.session.ConversationNotStartedStat import software.aws.toolkits.jetbrains.common.session.SessionState import software.aws.toolkits.jetbrains.common.session.SessionStateConfigData import software.aws.toolkits.jetbrains.common.util.AmazonQCodeGenService -import software.aws.toolkits.jetbrains.common.util.getDiffCharsAndLines import software.aws.toolkits.jetbrains.common.util.resolveAndCreateOrUpdateFile import software.aws.toolkits.jetbrains.common.util.resolveAndDeleteFile import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext @@ -32,7 +32,10 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Intera import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionStateAction import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.CancellationTokenSource +import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getDiffMetrics import software.aws.toolkits.jetbrains.services.codewhisperer.util.content +import java.nio.charset.Charset +import java.security.MessageDigest private val logger = getLogger() @@ -47,6 +50,7 @@ class DocSession(val tabID: String, val project: Project) { var task: String = "" val proxyClient: AmazonQCodeGenerateClient val amazonQCodeGenService: AmazonQCodeGenService + private val _reportedChanges = mutableMapOf() // retry session state vars private var codegenRetries: Int @@ -115,31 +119,80 @@ class DocSession(val tabID: String, val project: Project) { VfsUtil.markDirtyAndRefresh(true, true, true, context.selectedSourceFolder) } + private fun getFromReportedChanges(filePath: NewFileZipInfo): String? { + val key = getChangeIdentifier(filePath.zipFilePath) + return this._reportedChanges[key] + } + + private fun addToReportedChanges(filePath: NewFileZipInfo) { + val key = getChangeIdentifier(filePath.zipFilePath) + _reportedChanges[key] = filePath.fileContent + } + + private fun getChangeIdentifier(filePath: String): String { + val hash = MessageDigest.getInstance("SHA-1") + hash.update(filePath.toByteArray(Charset.forName("UTF-8"))) + return hash.digest().joinToString("") { "%02x".format(it) } + } + data class AddedContent( val totalAddedChars: Int, val totalAddedLines: Int, val totalAddedFiles: Int, ) - fun countAddedContent(filePaths: List, interactionType: DocGenerationInteractionType? = null): AddedContent { + fun countedGeneratedContent(filePaths: List, interactionType: DocInteractionType? = null): AddedContent { var totalAddedChars = 0 var totalAddedLines = 0 var totalAddedFiles = 0 - filePaths.filter { !it.rejected }.forEach { filePath -> - val existingFile = VfsUtil.findRelativeFile(filePath.zipFilePath, context.selectedSourceFolder) + filePaths.forEach { filePath -> val content = filePath.fileContent + val reportedChange = getFromReportedChanges(filePath) + if (interactionType == DocInteractionType.GENERATE_README) { + if (reportedChange != null) { + val diffMetrics = getDiffMetrics(reportedChange, content) + totalAddedLines += diffMetrics.insertedLines + totalAddedChars += diffMetrics.insertedCharacters + } else { + totalAddedChars += content.length + totalAddedLines += content.split('\n').size + } + } else { + val sourceContent = reportedChange + ?: VfsUtil.findRelativeFile(filePath.zipFilePath, context.selectedSourceFolder)?.content() + .orEmpty() + val diffMetrics = getDiffMetrics(sourceContent, content) + totalAddedLines += diffMetrics.insertedLines + totalAddedChars += diffMetrics.insertedCharacters + } + addToReportedChanges(filePath) totalAddedFiles += 1 + } - if (existingFile != null && interactionType == DocGenerationInteractionType.UPDATE_README) { - val existingContent = existingFile.content() - val (addedChars, addedLines) = getDiffCharsAndLines(existingContent, content) - totalAddedChars += addedChars - totalAddedLines += addedLines - } else { + return AddedContent( + totalAddedChars = totalAddedChars, + totalAddedLines = totalAddedLines, + totalAddedFiles = totalAddedFiles + ) + } + fun countAddedContent(filePaths: List, interactionType: DocInteractionType? = null): AddedContent { + var totalAddedChars = 0 + var totalAddedLines = 0 + var totalAddedFiles = 0 + + filePaths.filter { !it.rejected }.forEach { filePath -> + val content = filePath.fileContent + if (interactionType == DocInteractionType.GENERATE_README) { totalAddedChars += content.length totalAddedLines += content.split('\n').size + } else { + val existingFileContent = VfsUtil.findRelativeFile(filePath.zipFilePath, context.selectedSourceFolder)?.content() + val diffMetrics = getDiffMetrics(existingFileContent.orEmpty(), content) + totalAddedLines += diffMetrics.insertedLines + totalAddedChars += diffMetrics.insertedCharacters } + totalAddedFiles += 1 } return AddedContent( @@ -218,16 +271,26 @@ class DocSession(val tabID: String, val project: Project) { codegenRetries -= 1 } - fun sendDocGenerationEvent(docGenerationEvent: DocGenerationEvent) { - val sendDocGenerationEventResponse: SendTelemetryEventResponse + fun sendDocTelemetryEvent( + generationEvent: DocV2GenerationEvent? = null, + acceptanceEvent: DocV2AcceptanceEvent? = null, + ) { + val sendDocTelemetryEventResponse: SendTelemetryEventResponse try { - sendDocGenerationEventResponse = proxyClient.sendDocGenerationTelemetryEvent(docGenerationEvent) - val requestId = sendDocGenerationEventResponse.responseMetadata().requestId() + sendDocTelemetryEventResponse = when { + generationEvent != null -> proxyClient.sendDocTelemetryEvent(generationEvent, null) + acceptanceEvent != null -> proxyClient.sendDocTelemetryEvent(null, acceptanceEvent) + else -> { + logger.warn { "Neither generation nor acceptance event was provided" } + return + } + } + val requestId = sendDocTelemetryEventResponse.responseMetadata().requestId() logger.debug { - "${FEATURE_NAME}: succesfully sent doc generation telemetry: ConversationId: $conversationId RequestId: $requestId" + "${FEATURE_NAME}: succesfully sent doc telemetry: ConversationId: $conversationId RequestId: $requestId" } } catch (e: Exception) { - logger.warn(e) { "${FEATURE_NAME}: failed to send doc generation telemetry" } + logger.warn(e) { "${FEATURE_NAME}: failed to send doc telemetry" } } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt index 8ebf5fd23d..359693ba1f 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt @@ -17,4 +17,5 @@ fun mapTransformationPlanApiStatus(apiStatus: TransformationProgressUpdateStatus TransformationProgressUpdateStatus.FAILED, TransformationProgressUpdateStatus.PAUSED -> BuildStepStatus.WARNING TransformationProgressUpdateStatus.AWAITING_CLIENT_ACTION, TransformationProgressUpdateStatus.IN_PROGRESS -> BuildStepStatus.WORKING TransformationProgressUpdateStatus.UNKNOWN_TO_SDK_VERSION -> BuildStepStatus.ERROR + TransformationProgressUpdateStatus.SKIPPED -> TODO() } diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json index 2541167599..09360f1db7 100644 --- a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json +++ b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json @@ -498,7 +498,9 @@ "messageId": { "shape": "MessageId" }, "customizationArn": { "shape": "CustomizationArn" }, "interactionType": { "shape": "ChatMessageInteractionType" }, - "interactionTarget": { "shape": "ChatInteractWithMessageEventInteractionTargetString" }, + "interactionTarget": { + "shape": "ChatInteractWithMessageEventInteractionTargetString" + }, "acceptedCharacterCount": { "shape": "Integer" }, "acceptedLineCount": { "shape": "Integer" }, "acceptedSnippetHasReference": { "shape": "Boolean" }, @@ -570,7 +572,12 @@ }, "CodeCoverageEvent": { "type": "structure", - "required": ["programmingLanguage", "acceptedCharacterCount", "totalCharacterCount", "timestamp"], + "required": [ + "programmingLanguage", + "acceptedCharacterCount", + "totalCharacterCount", + "timestamp" + ], "members": { "customizationArn": { "shape": "CustomizationArn" }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, @@ -580,10 +587,22 @@ "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeLineCount": { "shape": "PrimitiveInteger" }, - "userWrittenCodeCharacterCount": { "shape": "PrimitiveInteger" }, - "userWrittenCodeLineCount": { "shape": "PrimitiveInteger" } + "userWrittenCodeCharacterCount": { + "shape": "CodeCoverageEventUserWrittenCodeCharacterCountInteger" + }, + "userWrittenCodeLineCount": { + "shape": "CodeCoverageEventUserWrittenCodeLineCountInteger" + } } }, + "CodeCoverageEventUserWrittenCodeCharacterCountInteger": { + "type": "integer", + "min": 0 + }, + "CodeCoverageEventUserWrittenCodeLineCountInteger": { + "type": "integer", + "min": 0 + }, "CodeFixAcceptanceEvent": { "type": "structure", "required": ["jobId"], @@ -617,7 +636,8 @@ "CodeFixName": { "type": "string", "max": 128, - "min": 1 + "min": 1, + "pattern": "[a-zA-Z0-9-_$:.]*" }, "CodeFixUploadContext": { "type": "structure", @@ -685,7 +705,9 @@ "type": "structure", "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, - "CodeScanRemediationsEventType": { "shape": "CodeScanRemediationsEventType" }, + "CodeScanRemediationsEventType": { + "shape": "CodeScanRemediationsEventType" + }, "timestamp": { "shape": "Timestamp" }, "detectorId": { "shape": "String" }, "findingId": { "shape": "String" }, @@ -698,11 +720,20 @@ }, "CodeScanRemediationsEventType": { "type": "string", - "enum": ["CODESCAN_ISSUE_HOVER", "CODESCAN_ISSUE_APPLY_FIX", "CODESCAN_ISSUE_VIEW_DETAILS"] + "enum": [ + "CODESCAN_ISSUE_HOVER", + "CODESCAN_ISSUE_APPLY_FIX", + "CODESCAN_ISSUE_VIEW_DETAILS" + ] }, "CodeScanSucceededEvent": { "type": "structure", - "required": ["programmingLanguage", "codeScanJobId", "timestamp", "numberOfFindings"], + "required": [ + "programmingLanguage", + "codeScanJobId", + "timestamp", + "numberOfFindings" + ], "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, "codeScanJobId": { "shape": "CodeScanJobId" }, @@ -747,7 +778,11 @@ }, "ConflictExceptionReason": { "type": "string", - "enum": ["CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", "CUSTOMER_KMS_KEY_DISABLED", "MISMATCHED_KMS_KEY"] + "enum": [ + "CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", + "CUSTOMER_KMS_KEY_DISABLED", + "MISMATCHED_KMS_KEY" + ] }, "ConsoleState": { "type": "structure", @@ -799,7 +834,9 @@ "type": "structure", "members": { "contentMd5": { "shape": "CreateUploadUrlRequestContentMd5String" }, - "contentChecksum": { "shape": "CreateUploadUrlRequestContentChecksumString" }, + "contentChecksum": { + "shape": "CreateUploadUrlRequestContentChecksumString" + }, "contentChecksumType": { "shape": "ContentChecksumType" }, "contentLength": { "shape": "CreateUploadUrlRequestContentLengthLong" }, "artifactType": { "shape": "ArtifactType" }, @@ -925,6 +962,10 @@ "min": 1, "pattern": "[-a-zA-Z0-9._]*" }, + "DocFolderLevel": { + "type": "string", + "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] + }, "DocGenerationEvent": { "type": "structure", "required": ["conversationId"], @@ -933,25 +974,110 @@ "numberOfAddChars": { "shape": "PrimitiveInteger" }, "numberOfAddLines": { "shape": "PrimitiveInteger" }, "numberOfAddFiles": { "shape": "PrimitiveInteger" }, - "userDecision": { "shape": "DocGenerationUserDecision" }, - "interactionType": { "shape": "DocGenerationInteractionType" }, + "userDecision": { "shape": "DocUserDecision" }, + "interactionType": { "shape": "DocInteractionType" }, "userIdentity": { "shape": "String" }, "numberOfNavigation": { "shape": "PrimitiveInteger" }, - "folderLevel": { "shape": "DocGenerationFolderLevel" } + "folderLevel": { "shape": "DocFolderLevel" } } }, - "DocGenerationFolderLevel": { - "type": "string", - "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] - }, - "DocGenerationInteractionType": { + "DocInteractionType": { "type": "string", "enum": ["GENERATE_README", "UPDATE_README", "EDIT_README"] }, - "DocGenerationUserDecision": { + "DocUserDecision": { "type": "string", "enum": ["ACCEPT", "REJECT"] }, + "DocV2AcceptanceEvent": { + "type": "structure", + "required": [ + "conversationId", + "numberOfAddedChars", + "numberOfAddedLines", + "numberOfAddedFiles", + "userDecision", + "interactionType", + "numberOfNavigations", + "folderLevel" + ], + "members": { + "conversationId": { "shape": "ConversationId" }, + "numberOfAddedChars": { + "shape": "DocV2AcceptanceEventNumberOfAddedCharsInteger" + }, + "numberOfAddedLines": { + "shape": "DocV2AcceptanceEventNumberOfAddedLinesInteger" + }, + "numberOfAddedFiles": { + "shape": "DocV2AcceptanceEventNumberOfAddedFilesInteger" + }, + "userDecision": { "shape": "DocUserDecision" }, + "interactionType": { "shape": "DocInteractionType" }, + "numberOfNavigations": { + "shape": "DocV2AcceptanceEventNumberOfNavigationsInteger" + }, + "folderLevel": { "shape": "DocFolderLevel" } + } + }, + "DocV2AcceptanceEventNumberOfAddedCharsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfAddedFilesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfAddedLinesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfNavigationsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEvent": { + "type": "structure", + "required": [ + "conversationId", + "numberOfGeneratedChars", + "numberOfGeneratedLines", + "numberOfGeneratedFiles" + ], + "members": { + "conversationId": { "shape": "ConversationId" }, + "numberOfGeneratedChars": { + "shape": "DocV2GenerationEventNumberOfGeneratedCharsInteger" + }, + "numberOfGeneratedLines": { + "shape": "DocV2GenerationEventNumberOfGeneratedLinesInteger" + }, + "numberOfGeneratedFiles": { + "shape": "DocV2GenerationEventNumberOfGeneratedFilesInteger" + }, + "interactionType": { "shape": "DocInteractionType" }, + "numberOfNavigations": { + "shape": "DocV2GenerationEventNumberOfNavigationsInteger" + }, + "folderLevel": { "shape": "DocFolderLevel" } + } + }, + "DocV2GenerationEventNumberOfGeneratedCharsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfGeneratedFilesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfGeneratedLinesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfNavigationsInteger": { + "type": "integer", + "min": 0 + }, "DocumentSymbol": { "type": "structure", "required": ["name", "type"], @@ -1012,7 +1138,9 @@ "type": "structure", "members": { "operatingSystem": { "shape": "EnvStateOperatingSystemString" }, - "currentWorkingDirectory": { "shape": "EnvStateCurrentWorkingDirectoryString" }, + "currentWorkingDirectory": { + "shape": "EnvStateCurrentWorkingDirectoryString" + }, "environmentVariables": { "shape": "EnvironmentVariables" }, "timezoneOffset": { "shape": "EnvStateTimezoneOffsetInteger" } } @@ -1062,11 +1190,19 @@ }, "FeatureDevCodeAcceptanceEvent": { "type": "structure", - "required": ["conversationId", "linesOfCodeAccepted", "charactersOfCodeAccepted"], + "required": [ + "conversationId", + "linesOfCodeAccepted", + "charactersOfCodeAccepted" + ], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" }, - "charactersOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" }, + "linesOfCodeAccepted": { + "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" + }, + "charactersOfCodeAccepted": { + "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" + }, "programmingLanguage": { "shape": "ProgrammingLanguage" } } }, @@ -1080,10 +1216,16 @@ }, "FeatureDevCodeGenerationEvent": { "type": "structure", - "required": ["conversationId", "linesOfCodeGenerated", "charactersOfCodeGenerated"], + "required": [ + "conversationId", + "linesOfCodeGenerated", + "charactersOfCodeGenerated" + ], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" }, + "linesOfCodeGenerated": { + "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" + }, "charactersOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger" }, @@ -1149,7 +1291,12 @@ }, "FileContext": { "type": "structure", - "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"], + "required": [ + "leftFileContent", + "rightFileContent", + "filename", + "programmingLanguage" + ], "members": { "leftFileContent": { "shape": "FileContextLeftFileContentString" }, "rightFileContent": { "shape": "FileContextRightFileContentString" }, @@ -1194,9 +1341,13 @@ "required": ["fileContext"], "members": { "fileContext": { "shape": "FileContext" }, - "maxResults": { "shape": "GenerateCompletionsRequestMaxResultsInteger" }, + "maxResults": { + "shape": "GenerateCompletionsRequestMaxResultsInteger" + }, "nextToken": { "shape": "GenerateCompletionsRequestNextTokenString" }, - "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" }, + "referenceTrackerConfiguration": { + "shape": "ReferenceTrackerConfiguration" + }, "supplementalContexts": { "shape": "SupplementalContextList" }, "customizationArn": { "shape": "CustomizationArn" }, "optOutPreference": { "shape": "OptOutPreference" }, @@ -1269,8 +1420,7 @@ "required": ["conversationId", "codeGenerationId"], "members": { "conversationId": { "shape": "ConversationId" }, - "codeGenerationId": { "shape": "CodeGenerationId" }, - "intent": { "shape": "String" } + "codeGenerationId": { "shape": "CodeGenerationId" } } }, "GetTaskAssistCodeGenerationResponse": { @@ -1340,7 +1490,15 @@ }, "IdeCategory": { "type": "string", - "enum": ["JETBRAINS", "VSCODE", "CLI", "JUPYTER_MD", "JUPYTER_SM", "ECLIPSE", "VISUAL_STUDIO"], + "enum": [ + "JETBRAINS", + "VSCODE", + "CLI", + "JUPYTER_MD", + "JUPYTER_SM", + "ECLIPSE", + "VISUAL_STUDIO" + ], "max": 64, "min": 1 }, @@ -1422,7 +1580,9 @@ "ListAvailableCustomizationsRequest": { "type": "structure", "members": { - "maxResults": { "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" }, + "maxResults": { + "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" + }, "nextToken": { "shape": "Base64EncodedPaginationToken" } } }, @@ -1518,6 +1678,32 @@ "type": "string", "enum": ["OPTIN", "OPTOUT"] }, + "PackageInfo": { + "type": "structure", + "members": { + "executionCommand": { "shape": "SensitiveString" }, + "buildCommand": { "shape": "SensitiveString" }, + "buildOrder": { "shape": "PackageInfoBuildOrderInteger" }, + "testFramework": { "shape": "String" }, + "packageSummary": { "shape": "PackageInfoPackageSummaryString" }, + "targetFileInfoList": { "shape": "TargetFileInfoList" } + } + }, + "PackageInfoBuildOrderInteger": { + "type": "integer", + "box": true, + "min": 0 + }, + "PackageInfoList": { + "type": "list", + "member": { "shape": "PackageInfo" } + }, + "PackageInfoPackageSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, "PaginationToken": { "type": "string", "max": 2048, @@ -1597,7 +1783,9 @@ "type": "structure", "required": ["recommendationsWithReferences"], "members": { - "recommendationsWithReferences": { "shape": "RecommendationsWithReferencesPreference" } + "recommendationsWithReferences": { + "shape": "RecommendationsWithReferencesPreference" + } } }, "ReferenceUrlString": { @@ -1621,7 +1809,9 @@ "type": "structure", "required": ["relativeFilePath"], "members": { - "relativeFilePath": { "shape": "RelevantTextDocumentRelativeFilePathString" }, + "relativeFilePath": { + "shape": "RelevantTextDocumentRelativeFilePathString" + }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, "text": { "shape": "RelevantTextDocumentTextString" }, "documentSymbols": { "shape": "DocumentSymbols" } @@ -1855,8 +2045,9 @@ }, "StartCodeFixJobRequestDescriptionString": { "type": "string", - "max": 2000, - "min": 1 + "max": 5000, + "min": 1, + "sensitive": true }, "StartCodeFixJobRequestRuleIdString": { "type": "string", @@ -1981,7 +2172,8 @@ "SuggestedFixDescriptionString": { "type": "string", "max": 2000, - "min": 1 + "min": 1, + "sensitive": true }, "SuggestionState": { "type": "string", @@ -2069,6 +2261,40 @@ "min": 1, "sensitive": true }, + "TargetFileInfo": { + "type": "structure", + "members": { + "filePath": { "shape": "SensitiveString" }, + "testFilePath": { "shape": "SensitiveString" }, + "testCoverage": { "shape": "TargetFileInfoTestCoverageInteger" }, + "fileSummary": { "shape": "TargetFileInfoFileSummaryString" }, + "codeReferences": { "shape": "References" }, + "numberOfTestMethods": { + "shape": "TargetFileInfoNumberOfTestMethodsInteger" + } + } + }, + "TargetFileInfoFileSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, + "TargetFileInfoList": { + "type": "list", + "member": { "shape": "TargetFileInfo" } + }, + "TargetFileInfoNumberOfTestMethodsInteger": { + "type": "integer", + "box": true, + "min": 0 + }, + "TargetFileInfoTestCoverageInteger": { + "type": "integer", + "box": true, + "max": 100, + "min": 0 + }, "TaskAssistPlan": { "type": "list", "member": { "shape": "TaskAssistPlanStep" }, @@ -2130,15 +2356,25 @@ "codeFixAcceptanceEvent": { "shape": "CodeFixAcceptanceEvent" }, "metricData": { "shape": "MetricData" }, "chatAddMessageEvent": { "shape": "ChatAddMessageEvent" }, - "chatInteractWithMessageEvent": { "shape": "ChatInteractWithMessageEvent" }, + "chatInteractWithMessageEvent": { + "shape": "ChatInteractWithMessageEvent" + }, "chatUserModificationEvent": { "shape": "ChatUserModificationEvent" }, - "terminalUserInteractionEvent": { "shape": "TerminalUserInteractionEvent" }, + "terminalUserInteractionEvent": { + "shape": "TerminalUserInteractionEvent" + }, "featureDevEvent": { "shape": "FeatureDevEvent" }, - "featureDevCodeGenerationEvent": { "shape": "FeatureDevCodeGenerationEvent" }, - "featureDevCodeAcceptanceEvent": { "shape": "FeatureDevCodeAcceptanceEvent" }, + "featureDevCodeGenerationEvent": { + "shape": "FeatureDevCodeGenerationEvent" + }, + "featureDevCodeAcceptanceEvent": { + "shape": "FeatureDevCodeAcceptanceEvent" + }, "inlineChatEvent": { "shape": "InlineChatEvent" }, "transformEvent": { "shape": "TransformEvent" }, "docGenerationEvent": { "shape": "DocGenerationEvent" }, + "docV2GenerationEvent": { "shape": "DocV2GenerationEvent" }, + "docV2AcceptanceEvent": { "shape": "DocV2AcceptanceEvent" }, "testGenerationEvent": { "shape": "TestGenerationEvent" } }, "union": true @@ -2146,7 +2382,9 @@ "TerminalUserInteractionEvent": { "type": "structure", "members": { - "terminalUserInteractionEventType": { "shape": "TerminalUserInteractionEventType" }, + "terminalUserInteractionEventType": { + "shape": "TerminalUserInteractionEventType" + }, "terminal": { "shape": "String" }, "terminalVersion": { "shape": "String" }, "shell": { "shape": "String" }, @@ -2159,7 +2397,10 @@ }, "TerminalUserInteractionEventType": { "type": "string", - "enum": ["CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED"] + "enum": [ + "CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", + "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED" + ] }, "TestGenerationEvent": { "type": "structure", @@ -2180,14 +2421,22 @@ }, "TestGenerationJob": { "type": "structure", - "required": ["testGenerationJobId", "testGenerationJobGroupName", "status", "creationTime"], + "required": [ + "testGenerationJobId", + "testGenerationJobGroupName", + "status", + "creationTime" + ], "members": { "testGenerationJobId": { "shape": "UUID" }, "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" }, "status": { "shape": "TestGenerationJobStatus" }, "shortAnswer": { "shape": "SensitiveString" }, "creationTime": { "shape": "Timestamp" }, - "progressRate": { "shape": "TestGenerationJobProgressRateInteger" } + "progressRate": { "shape": "TestGenerationJobProgressRateInteger" }, + "jobStatusReason": { "shape": "String" }, + "jobSummary": { "shape": "TestGenerationJobJobSummaryString" }, + "packageInfoList": { "shape": "PackageInfoList" } } }, "TestGenerationJobGroupName": { @@ -2196,6 +2445,12 @@ "min": 1, "pattern": "[a-zA-Z0-9-_]+" }, + "TestGenerationJobJobSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, "TestGenerationJobProgressRateInteger": { "type": "integer", "box": true, @@ -2241,7 +2496,7 @@ }, "TextDocumentTextString": { "type": "string", - "max": 10240, + "max": 40000, "min": 0, "sensitive": true }, @@ -2249,11 +2504,16 @@ "type": "structure", "required": ["message"], "members": { - "message": { "shape": "String" } + "message": { "shape": "String" }, + "reason": { "shape": "ThrottlingExceptionReason" } }, "exception": true, "retryable": { "throttling": true } }, + "ThrottlingExceptionReason": { + "type": "string", + "enum": ["MONTHLY_REQUEST_COUNT"] + }, "Timestamp": { "type": "timestamp" }, "TransformEvent": { "type": "structure", @@ -2270,12 +2530,21 @@ }, "TransformationDotNetRuntimeEnv": { "type": "string", - "enum": ["NET_5_0", "NET_6_0", "NET_7_0", "NET_8_0", "NET_9_0", "NET_STANDARD_2_0"] + "enum": [ + "NET_5_0", + "NET_6_0", + "NET_7_0", + "NET_8_0", + "NET_9_0", + "NET_STANDARD_2_0" + ] }, "TransformationDownloadArtifact": { "type": "structure", "members": { - "downloadArtifactType": { "shape": "TransformationDownloadArtifactType" }, + "downloadArtifactType": { + "shape": "TransformationDownloadArtifactType" + }, "downloadArtifactId": { "shape": "ArtifactId" } } }, @@ -2312,7 +2581,16 @@ }, "TransformationLanguage": { "type": "string", - "enum": ["JAVA_8", "JAVA_11", "JAVA_17", "JAVA_21", "C_SHARP", "COBOL", "PL_I", "JCL"] + "enum": [ + "JAVA_8", + "JAVA_11", + "JAVA_17", + "JAVA_21", + "C_SHARP", + "COBOL", + "PL_I", + "JCL" + ] }, "TransformationLanguages": { "type": "list", @@ -2336,7 +2614,9 @@ "TransformationPlatformConfig": { "type": "structure", "members": { - "operatingSystemFamily": { "shape": "TransformationOperatingSystemFamily" } + "operatingSystemFamily": { + "shape": "TransformationOperatingSystemFamily" + } } }, "TransformationProgressUpdate": { @@ -2353,12 +2633,21 @@ }, "TransformationProgressUpdateStatus": { "type": "string", - "enum": ["IN_PROGRESS", "COMPLETED", "FAILED", "PAUSED", "AWAITING_CLIENT_ACTION"] + "enum": [ + "IN_PROGRESS", + "COMPLETED", + "FAILED", + "PAUSED", + "AWAITING_CLIENT_ACTION", + "SKIPPED" + ] }, "TransformationProjectArtifactDescriptor": { "type": "structure", "members": { - "sourceCodeArtifact": { "shape": "TransformationSourceCodeArtifactDescriptor" } + "sourceCodeArtifact": { + "shape": "TransformationSourceCodeArtifactDescriptor" + } }, "union": true }, @@ -2368,7 +2657,9 @@ "language": { "shape": "TransformationLanguage" }, "runtimeEnv": { "shape": "TransformationRuntimeEnv" }, "platformConfig": { "shape": "TransformationPlatformConfig" }, - "projectArtifact": { "shape": "TransformationProjectArtifactDescriptor" } + "projectArtifact": { + "shape": "TransformationProjectArtifactDescriptor" + } } }, "TransformationRuntimeEnv": { @@ -2432,7 +2723,15 @@ }, "TransformationStepStatus": { "type": "string", - "enum": ["CREATED", "COMPLETED", "PARTIALLY_COMPLETED", "STOPPED", "FAILED", "PAUSED"] + "enum": [ + "CREATED", + "COMPLETED", + "PARTIALLY_COMPLETED", + "STOPPED", + "FAILED", + "PAUSED", + "SKIPPED" + ] }, "TransformationSteps": { "type": "list", @@ -2466,8 +2765,12 @@ "UploadContext": { "type": "structure", "members": { - "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" }, - "transformationUploadContext": { "shape": "TransformationUploadContext" }, + "taskAssistPlanningUploadContext": { + "shape": "TaskAssistPlanningUploadContext" + }, + "transformationUploadContext": { + "shape": "TransformationUploadContext" + }, "codeAnalysisUploadContext": { "shape": "CodeAnalysisUploadContext" }, "codeFixUploadContext": { "shape": "CodeFixUploadContext" } }, @@ -2549,9 +2852,9 @@ "CODE_GENERATION" ] }, - "UserModificationEvent":{ - "type":"structure", - "required":[ + "UserModificationEvent": { + "type": "structure", + "required": [ "sessionId", "requestId", "programmingLanguage", @@ -2560,15 +2863,15 @@ "acceptedCharacterCount", "unmodifiedAcceptedCharacterCount" ], - "members":{ - "sessionId":{"shape":"UUID"}, - "requestId":{"shape":"UUID"}, - "programmingLanguage":{"shape":"ProgrammingLanguage"}, - "modificationPercentage":{"shape":"Double"}, - "customizationArn":{"shape":"CustomizationArn"}, - "timestamp":{"shape":"Timestamp"}, - "acceptedCharacterCount":{"shape":"PrimitiveInteger"}, - "unmodifiedAcceptedCharacterCount":{"shape":"PrimitiveInteger"} + "members": { + "sessionId": { "shape": "UUID" }, + "requestId": { "shape": "UUID" }, + "programmingLanguage": { "shape": "ProgrammingLanguage" }, + "modificationPercentage": { "shape": "Double" }, + "customizationArn": { "shape": "CustomizationArn" }, + "timestamp": { "shape": "Timestamp" }, + "acceptedCharacterCount": { "shape": "PrimitiveInteger" }, + "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" } } }, "UserSettings": { @@ -2588,21 +2891,21 @@ "recommendationLatencyMilliseconds", "timestamp" ], - "members":{ - "sessionId":{"shape":"UUID"}, - "requestId":{"shape":"UUID"}, - "customizationArn":{"shape":"CustomizationArn"}, - "programmingLanguage":{"shape":"ProgrammingLanguage"}, - "completionType":{"shape":"CompletionType"}, - "suggestionState":{"shape":"SuggestionState"}, - "recommendationLatencyMilliseconds":{"shape":"Double"}, - "timestamp":{"shape":"Timestamp"}, - "triggerToResponseLatencyMilliseconds":{"shape":"Double"}, - "suggestionReferenceCount":{"shape":"PrimitiveInteger"}, - "generatedLine":{"shape":"PrimitiveInteger"}, - "numberOfRecommendations":{"shape":"PrimitiveInteger"}, - "perceivedLatencyMilliseconds":{"shape":"Double"}, - "acceptedCharacterCount":{"shape":"PrimitiveInteger"} + "members": { + "sessionId": { "shape": "UUID" }, + "requestId": { "shape": "UUID" }, + "customizationArn": { "shape": "CustomizationArn" }, + "programmingLanguage": { "shape": "ProgrammingLanguage" }, + "completionType": { "shape": "CompletionType" }, + "suggestionState": { "shape": "SuggestionState" }, + "recommendationLatencyMilliseconds": { "shape": "Double" }, + "timestamp": { "shape": "Timestamp" }, + "triggerToResponseLatencyMilliseconds": { "shape": "Double" }, + "suggestionReferenceCount": { "shape": "PrimitiveInteger" }, + "generatedLine": { "shape": "PrimitiveInteger" }, + "numberOfRecommendations": { "shape": "PrimitiveInteger" }, + "perceivedLatencyMilliseconds": { "shape": "Double" }, + "acceptedCharacterCount": { "shape": "PrimitiveInteger" } } }, "ValidationException": { @@ -2616,7 +2919,11 @@ }, "ValidationExceptionReason": { "type": "string", - "enum": ["INVALID_CONVERSATION_ID", "CONTENT_LENGTH_EXCEEDS_THRESHOLD", "INVALID_KMS_GRANT"] + "enum": [ + "INVALID_CONVERSATION_ID", + "CONTENT_LENGTH_EXCEEDS_THRESHOLD", + "INVALID_KMS_GRANT" + ] }, "WorkspaceState": { "type": "structure", From 60c88dca30cb78ec32516539ed649f26d131f0ba Mon Sep 17 00:00:00 2001 From: Kevin Ding Date: Thu, 6 Feb 2025 13:25:49 -0500 Subject: [PATCH 2/4] chore: modify the PR according to the feedback --- .../services/codemodernizer/model/BuildStepStatus.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt index 359693ba1f..af330b4424 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt @@ -14,8 +14,8 @@ enum class BuildStepStatus { fun mapTransformationPlanApiStatus(apiStatus: TransformationProgressUpdateStatus): BuildStepStatus = when (apiStatus) { TransformationProgressUpdateStatus.COMPLETED -> BuildStepStatus.DONE - TransformationProgressUpdateStatus.FAILED, TransformationProgressUpdateStatus.PAUSED -> BuildStepStatus.WARNING + // SKIPPED status is not used for Java upgrades + TransformationProgressUpdateStatus.FAILED, TransformationProgressUpdateStatus.SKIPPED, TransformationProgressUpdateStatus.PAUSED -> BuildStepStatus.WARNING TransformationProgressUpdateStatus.AWAITING_CLIENT_ACTION, TransformationProgressUpdateStatus.IN_PROGRESS -> BuildStepStatus.WORKING TransformationProgressUpdateStatus.UNKNOWN_TO_SDK_VERSION -> BuildStepStatus.ERROR - TransformationProgressUpdateStatus.SKIPPED -> TODO() } From fb8e89ebf8275bd6f095f4e3ef7a2f81c7ae8752 Mon Sep 17 00:00:00 2001 From: David <60020664+dhasani23@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:44:45 -0400 Subject: [PATCH 3/4] feat(amazonq): support Java 21 (#5226) * feat(amazonq): support Java 21 * fix detekt * add test * update strings * update text * fix detekt * add jvm_21 * update strings * remove comment / unneeded notif --------- Co-authored-by: David Hasani --- .../codewhispererruntime/service-2.json | 477 ++++-------------- 1 file changed, 85 insertions(+), 392 deletions(-) diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json index 09360f1db7..2541167599 100644 --- a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json +++ b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json @@ -498,9 +498,7 @@ "messageId": { "shape": "MessageId" }, "customizationArn": { "shape": "CustomizationArn" }, "interactionType": { "shape": "ChatMessageInteractionType" }, - "interactionTarget": { - "shape": "ChatInteractWithMessageEventInteractionTargetString" - }, + "interactionTarget": { "shape": "ChatInteractWithMessageEventInteractionTargetString" }, "acceptedCharacterCount": { "shape": "Integer" }, "acceptedLineCount": { "shape": "Integer" }, "acceptedSnippetHasReference": { "shape": "Boolean" }, @@ -572,12 +570,7 @@ }, "CodeCoverageEvent": { "type": "structure", - "required": [ - "programmingLanguage", - "acceptedCharacterCount", - "totalCharacterCount", - "timestamp" - ], + "required": ["programmingLanguage", "acceptedCharacterCount", "totalCharacterCount", "timestamp"], "members": { "customizationArn": { "shape": "CustomizationArn" }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, @@ -587,22 +580,10 @@ "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeLineCount": { "shape": "PrimitiveInteger" }, - "userWrittenCodeCharacterCount": { - "shape": "CodeCoverageEventUserWrittenCodeCharacterCountInteger" - }, - "userWrittenCodeLineCount": { - "shape": "CodeCoverageEventUserWrittenCodeLineCountInteger" - } + "userWrittenCodeCharacterCount": { "shape": "PrimitiveInteger" }, + "userWrittenCodeLineCount": { "shape": "PrimitiveInteger" } } }, - "CodeCoverageEventUserWrittenCodeCharacterCountInteger": { - "type": "integer", - "min": 0 - }, - "CodeCoverageEventUserWrittenCodeLineCountInteger": { - "type": "integer", - "min": 0 - }, "CodeFixAcceptanceEvent": { "type": "structure", "required": ["jobId"], @@ -636,8 +617,7 @@ "CodeFixName": { "type": "string", "max": 128, - "min": 1, - "pattern": "[a-zA-Z0-9-_$:.]*" + "min": 1 }, "CodeFixUploadContext": { "type": "structure", @@ -705,9 +685,7 @@ "type": "structure", "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, - "CodeScanRemediationsEventType": { - "shape": "CodeScanRemediationsEventType" - }, + "CodeScanRemediationsEventType": { "shape": "CodeScanRemediationsEventType" }, "timestamp": { "shape": "Timestamp" }, "detectorId": { "shape": "String" }, "findingId": { "shape": "String" }, @@ -720,20 +698,11 @@ }, "CodeScanRemediationsEventType": { "type": "string", - "enum": [ - "CODESCAN_ISSUE_HOVER", - "CODESCAN_ISSUE_APPLY_FIX", - "CODESCAN_ISSUE_VIEW_DETAILS" - ] + "enum": ["CODESCAN_ISSUE_HOVER", "CODESCAN_ISSUE_APPLY_FIX", "CODESCAN_ISSUE_VIEW_DETAILS"] }, "CodeScanSucceededEvent": { "type": "structure", - "required": [ - "programmingLanguage", - "codeScanJobId", - "timestamp", - "numberOfFindings" - ], + "required": ["programmingLanguage", "codeScanJobId", "timestamp", "numberOfFindings"], "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, "codeScanJobId": { "shape": "CodeScanJobId" }, @@ -778,11 +747,7 @@ }, "ConflictExceptionReason": { "type": "string", - "enum": [ - "CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", - "CUSTOMER_KMS_KEY_DISABLED", - "MISMATCHED_KMS_KEY" - ] + "enum": ["CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", "CUSTOMER_KMS_KEY_DISABLED", "MISMATCHED_KMS_KEY"] }, "ConsoleState": { "type": "structure", @@ -834,9 +799,7 @@ "type": "structure", "members": { "contentMd5": { "shape": "CreateUploadUrlRequestContentMd5String" }, - "contentChecksum": { - "shape": "CreateUploadUrlRequestContentChecksumString" - }, + "contentChecksum": { "shape": "CreateUploadUrlRequestContentChecksumString" }, "contentChecksumType": { "shape": "ContentChecksumType" }, "contentLength": { "shape": "CreateUploadUrlRequestContentLengthLong" }, "artifactType": { "shape": "ArtifactType" }, @@ -962,10 +925,6 @@ "min": 1, "pattern": "[-a-zA-Z0-9._]*" }, - "DocFolderLevel": { - "type": "string", - "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] - }, "DocGenerationEvent": { "type": "structure", "required": ["conversationId"], @@ -974,110 +933,25 @@ "numberOfAddChars": { "shape": "PrimitiveInteger" }, "numberOfAddLines": { "shape": "PrimitiveInteger" }, "numberOfAddFiles": { "shape": "PrimitiveInteger" }, - "userDecision": { "shape": "DocUserDecision" }, - "interactionType": { "shape": "DocInteractionType" }, + "userDecision": { "shape": "DocGenerationUserDecision" }, + "interactionType": { "shape": "DocGenerationInteractionType" }, "userIdentity": { "shape": "String" }, "numberOfNavigation": { "shape": "PrimitiveInteger" }, - "folderLevel": { "shape": "DocFolderLevel" } + "folderLevel": { "shape": "DocGenerationFolderLevel" } } }, - "DocInteractionType": { + "DocGenerationFolderLevel": { + "type": "string", + "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] + }, + "DocGenerationInteractionType": { "type": "string", "enum": ["GENERATE_README", "UPDATE_README", "EDIT_README"] }, - "DocUserDecision": { + "DocGenerationUserDecision": { "type": "string", "enum": ["ACCEPT", "REJECT"] }, - "DocV2AcceptanceEvent": { - "type": "structure", - "required": [ - "conversationId", - "numberOfAddedChars", - "numberOfAddedLines", - "numberOfAddedFiles", - "userDecision", - "interactionType", - "numberOfNavigations", - "folderLevel" - ], - "members": { - "conversationId": { "shape": "ConversationId" }, - "numberOfAddedChars": { - "shape": "DocV2AcceptanceEventNumberOfAddedCharsInteger" - }, - "numberOfAddedLines": { - "shape": "DocV2AcceptanceEventNumberOfAddedLinesInteger" - }, - "numberOfAddedFiles": { - "shape": "DocV2AcceptanceEventNumberOfAddedFilesInteger" - }, - "userDecision": { "shape": "DocUserDecision" }, - "interactionType": { "shape": "DocInteractionType" }, - "numberOfNavigations": { - "shape": "DocV2AcceptanceEventNumberOfNavigationsInteger" - }, - "folderLevel": { "shape": "DocFolderLevel" } - } - }, - "DocV2AcceptanceEventNumberOfAddedCharsInteger": { - "type": "integer", - "min": 0 - }, - "DocV2AcceptanceEventNumberOfAddedFilesInteger": { - "type": "integer", - "min": 0 - }, - "DocV2AcceptanceEventNumberOfAddedLinesInteger": { - "type": "integer", - "min": 0 - }, - "DocV2AcceptanceEventNumberOfNavigationsInteger": { - "type": "integer", - "min": 0 - }, - "DocV2GenerationEvent": { - "type": "structure", - "required": [ - "conversationId", - "numberOfGeneratedChars", - "numberOfGeneratedLines", - "numberOfGeneratedFiles" - ], - "members": { - "conversationId": { "shape": "ConversationId" }, - "numberOfGeneratedChars": { - "shape": "DocV2GenerationEventNumberOfGeneratedCharsInteger" - }, - "numberOfGeneratedLines": { - "shape": "DocV2GenerationEventNumberOfGeneratedLinesInteger" - }, - "numberOfGeneratedFiles": { - "shape": "DocV2GenerationEventNumberOfGeneratedFilesInteger" - }, - "interactionType": { "shape": "DocInteractionType" }, - "numberOfNavigations": { - "shape": "DocV2GenerationEventNumberOfNavigationsInteger" - }, - "folderLevel": { "shape": "DocFolderLevel" } - } - }, - "DocV2GenerationEventNumberOfGeneratedCharsInteger": { - "type": "integer", - "min": 0 - }, - "DocV2GenerationEventNumberOfGeneratedFilesInteger": { - "type": "integer", - "min": 0 - }, - "DocV2GenerationEventNumberOfGeneratedLinesInteger": { - "type": "integer", - "min": 0 - }, - "DocV2GenerationEventNumberOfNavigationsInteger": { - "type": "integer", - "min": 0 - }, "DocumentSymbol": { "type": "structure", "required": ["name", "type"], @@ -1138,9 +1012,7 @@ "type": "structure", "members": { "operatingSystem": { "shape": "EnvStateOperatingSystemString" }, - "currentWorkingDirectory": { - "shape": "EnvStateCurrentWorkingDirectoryString" - }, + "currentWorkingDirectory": { "shape": "EnvStateCurrentWorkingDirectoryString" }, "environmentVariables": { "shape": "EnvironmentVariables" }, "timezoneOffset": { "shape": "EnvStateTimezoneOffsetInteger" } } @@ -1190,19 +1062,11 @@ }, "FeatureDevCodeAcceptanceEvent": { "type": "structure", - "required": [ - "conversationId", - "linesOfCodeAccepted", - "charactersOfCodeAccepted" - ], + "required": ["conversationId", "linesOfCodeAccepted", "charactersOfCodeAccepted"], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeAccepted": { - "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" - }, - "charactersOfCodeAccepted": { - "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" - }, + "linesOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" }, + "charactersOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" }, "programmingLanguage": { "shape": "ProgrammingLanguage" } } }, @@ -1216,16 +1080,10 @@ }, "FeatureDevCodeGenerationEvent": { "type": "structure", - "required": [ - "conversationId", - "linesOfCodeGenerated", - "charactersOfCodeGenerated" - ], + "required": ["conversationId", "linesOfCodeGenerated", "charactersOfCodeGenerated"], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeGenerated": { - "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" - }, + "linesOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" }, "charactersOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger" }, @@ -1291,12 +1149,7 @@ }, "FileContext": { "type": "structure", - "required": [ - "leftFileContent", - "rightFileContent", - "filename", - "programmingLanguage" - ], + "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"], "members": { "leftFileContent": { "shape": "FileContextLeftFileContentString" }, "rightFileContent": { "shape": "FileContextRightFileContentString" }, @@ -1341,13 +1194,9 @@ "required": ["fileContext"], "members": { "fileContext": { "shape": "FileContext" }, - "maxResults": { - "shape": "GenerateCompletionsRequestMaxResultsInteger" - }, + "maxResults": { "shape": "GenerateCompletionsRequestMaxResultsInteger" }, "nextToken": { "shape": "GenerateCompletionsRequestNextTokenString" }, - "referenceTrackerConfiguration": { - "shape": "ReferenceTrackerConfiguration" - }, + "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" }, "supplementalContexts": { "shape": "SupplementalContextList" }, "customizationArn": { "shape": "CustomizationArn" }, "optOutPreference": { "shape": "OptOutPreference" }, @@ -1420,7 +1269,8 @@ "required": ["conversationId", "codeGenerationId"], "members": { "conversationId": { "shape": "ConversationId" }, - "codeGenerationId": { "shape": "CodeGenerationId" } + "codeGenerationId": { "shape": "CodeGenerationId" }, + "intent": { "shape": "String" } } }, "GetTaskAssistCodeGenerationResponse": { @@ -1490,15 +1340,7 @@ }, "IdeCategory": { "type": "string", - "enum": [ - "JETBRAINS", - "VSCODE", - "CLI", - "JUPYTER_MD", - "JUPYTER_SM", - "ECLIPSE", - "VISUAL_STUDIO" - ], + "enum": ["JETBRAINS", "VSCODE", "CLI", "JUPYTER_MD", "JUPYTER_SM", "ECLIPSE", "VISUAL_STUDIO"], "max": 64, "min": 1 }, @@ -1580,9 +1422,7 @@ "ListAvailableCustomizationsRequest": { "type": "structure", "members": { - "maxResults": { - "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" - }, + "maxResults": { "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" }, "nextToken": { "shape": "Base64EncodedPaginationToken" } } }, @@ -1678,32 +1518,6 @@ "type": "string", "enum": ["OPTIN", "OPTOUT"] }, - "PackageInfo": { - "type": "structure", - "members": { - "executionCommand": { "shape": "SensitiveString" }, - "buildCommand": { "shape": "SensitiveString" }, - "buildOrder": { "shape": "PackageInfoBuildOrderInteger" }, - "testFramework": { "shape": "String" }, - "packageSummary": { "shape": "PackageInfoPackageSummaryString" }, - "targetFileInfoList": { "shape": "TargetFileInfoList" } - } - }, - "PackageInfoBuildOrderInteger": { - "type": "integer", - "box": true, - "min": 0 - }, - "PackageInfoList": { - "type": "list", - "member": { "shape": "PackageInfo" } - }, - "PackageInfoPackageSummaryString": { - "type": "string", - "max": 30720, - "min": 0, - "sensitive": true - }, "PaginationToken": { "type": "string", "max": 2048, @@ -1783,9 +1597,7 @@ "type": "structure", "required": ["recommendationsWithReferences"], "members": { - "recommendationsWithReferences": { - "shape": "RecommendationsWithReferencesPreference" - } + "recommendationsWithReferences": { "shape": "RecommendationsWithReferencesPreference" } } }, "ReferenceUrlString": { @@ -1809,9 +1621,7 @@ "type": "structure", "required": ["relativeFilePath"], "members": { - "relativeFilePath": { - "shape": "RelevantTextDocumentRelativeFilePathString" - }, + "relativeFilePath": { "shape": "RelevantTextDocumentRelativeFilePathString" }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, "text": { "shape": "RelevantTextDocumentTextString" }, "documentSymbols": { "shape": "DocumentSymbols" } @@ -2045,9 +1855,8 @@ }, "StartCodeFixJobRequestDescriptionString": { "type": "string", - "max": 5000, - "min": 1, - "sensitive": true + "max": 2000, + "min": 1 }, "StartCodeFixJobRequestRuleIdString": { "type": "string", @@ -2172,8 +1981,7 @@ "SuggestedFixDescriptionString": { "type": "string", "max": 2000, - "min": 1, - "sensitive": true + "min": 1 }, "SuggestionState": { "type": "string", @@ -2261,40 +2069,6 @@ "min": 1, "sensitive": true }, - "TargetFileInfo": { - "type": "structure", - "members": { - "filePath": { "shape": "SensitiveString" }, - "testFilePath": { "shape": "SensitiveString" }, - "testCoverage": { "shape": "TargetFileInfoTestCoverageInteger" }, - "fileSummary": { "shape": "TargetFileInfoFileSummaryString" }, - "codeReferences": { "shape": "References" }, - "numberOfTestMethods": { - "shape": "TargetFileInfoNumberOfTestMethodsInteger" - } - } - }, - "TargetFileInfoFileSummaryString": { - "type": "string", - "max": 30720, - "min": 0, - "sensitive": true - }, - "TargetFileInfoList": { - "type": "list", - "member": { "shape": "TargetFileInfo" } - }, - "TargetFileInfoNumberOfTestMethodsInteger": { - "type": "integer", - "box": true, - "min": 0 - }, - "TargetFileInfoTestCoverageInteger": { - "type": "integer", - "box": true, - "max": 100, - "min": 0 - }, "TaskAssistPlan": { "type": "list", "member": { "shape": "TaskAssistPlanStep" }, @@ -2356,25 +2130,15 @@ "codeFixAcceptanceEvent": { "shape": "CodeFixAcceptanceEvent" }, "metricData": { "shape": "MetricData" }, "chatAddMessageEvent": { "shape": "ChatAddMessageEvent" }, - "chatInteractWithMessageEvent": { - "shape": "ChatInteractWithMessageEvent" - }, + "chatInteractWithMessageEvent": { "shape": "ChatInteractWithMessageEvent" }, "chatUserModificationEvent": { "shape": "ChatUserModificationEvent" }, - "terminalUserInteractionEvent": { - "shape": "TerminalUserInteractionEvent" - }, + "terminalUserInteractionEvent": { "shape": "TerminalUserInteractionEvent" }, "featureDevEvent": { "shape": "FeatureDevEvent" }, - "featureDevCodeGenerationEvent": { - "shape": "FeatureDevCodeGenerationEvent" - }, - "featureDevCodeAcceptanceEvent": { - "shape": "FeatureDevCodeAcceptanceEvent" - }, + "featureDevCodeGenerationEvent": { "shape": "FeatureDevCodeGenerationEvent" }, + "featureDevCodeAcceptanceEvent": { "shape": "FeatureDevCodeAcceptanceEvent" }, "inlineChatEvent": { "shape": "InlineChatEvent" }, "transformEvent": { "shape": "TransformEvent" }, "docGenerationEvent": { "shape": "DocGenerationEvent" }, - "docV2GenerationEvent": { "shape": "DocV2GenerationEvent" }, - "docV2AcceptanceEvent": { "shape": "DocV2AcceptanceEvent" }, "testGenerationEvent": { "shape": "TestGenerationEvent" } }, "union": true @@ -2382,9 +2146,7 @@ "TerminalUserInteractionEvent": { "type": "structure", "members": { - "terminalUserInteractionEventType": { - "shape": "TerminalUserInteractionEventType" - }, + "terminalUserInteractionEventType": { "shape": "TerminalUserInteractionEventType" }, "terminal": { "shape": "String" }, "terminalVersion": { "shape": "String" }, "shell": { "shape": "String" }, @@ -2397,10 +2159,7 @@ }, "TerminalUserInteractionEventType": { "type": "string", - "enum": [ - "CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", - "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED" - ] + "enum": ["CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED"] }, "TestGenerationEvent": { "type": "structure", @@ -2421,22 +2180,14 @@ }, "TestGenerationJob": { "type": "structure", - "required": [ - "testGenerationJobId", - "testGenerationJobGroupName", - "status", - "creationTime" - ], + "required": ["testGenerationJobId", "testGenerationJobGroupName", "status", "creationTime"], "members": { "testGenerationJobId": { "shape": "UUID" }, "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" }, "status": { "shape": "TestGenerationJobStatus" }, "shortAnswer": { "shape": "SensitiveString" }, "creationTime": { "shape": "Timestamp" }, - "progressRate": { "shape": "TestGenerationJobProgressRateInteger" }, - "jobStatusReason": { "shape": "String" }, - "jobSummary": { "shape": "TestGenerationJobJobSummaryString" }, - "packageInfoList": { "shape": "PackageInfoList" } + "progressRate": { "shape": "TestGenerationJobProgressRateInteger" } } }, "TestGenerationJobGroupName": { @@ -2445,12 +2196,6 @@ "min": 1, "pattern": "[a-zA-Z0-9-_]+" }, - "TestGenerationJobJobSummaryString": { - "type": "string", - "max": 30720, - "min": 0, - "sensitive": true - }, "TestGenerationJobProgressRateInteger": { "type": "integer", "box": true, @@ -2496,7 +2241,7 @@ }, "TextDocumentTextString": { "type": "string", - "max": 40000, + "max": 10240, "min": 0, "sensitive": true }, @@ -2504,16 +2249,11 @@ "type": "structure", "required": ["message"], "members": { - "message": { "shape": "String" }, - "reason": { "shape": "ThrottlingExceptionReason" } + "message": { "shape": "String" } }, "exception": true, "retryable": { "throttling": true } }, - "ThrottlingExceptionReason": { - "type": "string", - "enum": ["MONTHLY_REQUEST_COUNT"] - }, "Timestamp": { "type": "timestamp" }, "TransformEvent": { "type": "structure", @@ -2530,21 +2270,12 @@ }, "TransformationDotNetRuntimeEnv": { "type": "string", - "enum": [ - "NET_5_0", - "NET_6_0", - "NET_7_0", - "NET_8_0", - "NET_9_0", - "NET_STANDARD_2_0" - ] + "enum": ["NET_5_0", "NET_6_0", "NET_7_0", "NET_8_0", "NET_9_0", "NET_STANDARD_2_0"] }, "TransformationDownloadArtifact": { "type": "structure", "members": { - "downloadArtifactType": { - "shape": "TransformationDownloadArtifactType" - }, + "downloadArtifactType": { "shape": "TransformationDownloadArtifactType" }, "downloadArtifactId": { "shape": "ArtifactId" } } }, @@ -2581,16 +2312,7 @@ }, "TransformationLanguage": { "type": "string", - "enum": [ - "JAVA_8", - "JAVA_11", - "JAVA_17", - "JAVA_21", - "C_SHARP", - "COBOL", - "PL_I", - "JCL" - ] + "enum": ["JAVA_8", "JAVA_11", "JAVA_17", "JAVA_21", "C_SHARP", "COBOL", "PL_I", "JCL"] }, "TransformationLanguages": { "type": "list", @@ -2614,9 +2336,7 @@ "TransformationPlatformConfig": { "type": "structure", "members": { - "operatingSystemFamily": { - "shape": "TransformationOperatingSystemFamily" - } + "operatingSystemFamily": { "shape": "TransformationOperatingSystemFamily" } } }, "TransformationProgressUpdate": { @@ -2633,21 +2353,12 @@ }, "TransformationProgressUpdateStatus": { "type": "string", - "enum": [ - "IN_PROGRESS", - "COMPLETED", - "FAILED", - "PAUSED", - "AWAITING_CLIENT_ACTION", - "SKIPPED" - ] + "enum": ["IN_PROGRESS", "COMPLETED", "FAILED", "PAUSED", "AWAITING_CLIENT_ACTION"] }, "TransformationProjectArtifactDescriptor": { "type": "structure", "members": { - "sourceCodeArtifact": { - "shape": "TransformationSourceCodeArtifactDescriptor" - } + "sourceCodeArtifact": { "shape": "TransformationSourceCodeArtifactDescriptor" } }, "union": true }, @@ -2657,9 +2368,7 @@ "language": { "shape": "TransformationLanguage" }, "runtimeEnv": { "shape": "TransformationRuntimeEnv" }, "platformConfig": { "shape": "TransformationPlatformConfig" }, - "projectArtifact": { - "shape": "TransformationProjectArtifactDescriptor" - } + "projectArtifact": { "shape": "TransformationProjectArtifactDescriptor" } } }, "TransformationRuntimeEnv": { @@ -2723,15 +2432,7 @@ }, "TransformationStepStatus": { "type": "string", - "enum": [ - "CREATED", - "COMPLETED", - "PARTIALLY_COMPLETED", - "STOPPED", - "FAILED", - "PAUSED", - "SKIPPED" - ] + "enum": ["CREATED", "COMPLETED", "PARTIALLY_COMPLETED", "STOPPED", "FAILED", "PAUSED"] }, "TransformationSteps": { "type": "list", @@ -2765,12 +2466,8 @@ "UploadContext": { "type": "structure", "members": { - "taskAssistPlanningUploadContext": { - "shape": "TaskAssistPlanningUploadContext" - }, - "transformationUploadContext": { - "shape": "TransformationUploadContext" - }, + "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" }, + "transformationUploadContext": { "shape": "TransformationUploadContext" }, "codeAnalysisUploadContext": { "shape": "CodeAnalysisUploadContext" }, "codeFixUploadContext": { "shape": "CodeFixUploadContext" } }, @@ -2852,9 +2549,9 @@ "CODE_GENERATION" ] }, - "UserModificationEvent": { - "type": "structure", - "required": [ + "UserModificationEvent":{ + "type":"structure", + "required":[ "sessionId", "requestId", "programmingLanguage", @@ -2863,15 +2560,15 @@ "acceptedCharacterCount", "unmodifiedAcceptedCharacterCount" ], - "members": { - "sessionId": { "shape": "UUID" }, - "requestId": { "shape": "UUID" }, - "programmingLanguage": { "shape": "ProgrammingLanguage" }, - "modificationPercentage": { "shape": "Double" }, - "customizationArn": { "shape": "CustomizationArn" }, - "timestamp": { "shape": "Timestamp" }, - "acceptedCharacterCount": { "shape": "PrimitiveInteger" }, - "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" } + "members":{ + "sessionId":{"shape":"UUID"}, + "requestId":{"shape":"UUID"}, + "programmingLanguage":{"shape":"ProgrammingLanguage"}, + "modificationPercentage":{"shape":"Double"}, + "customizationArn":{"shape":"CustomizationArn"}, + "timestamp":{"shape":"Timestamp"}, + "acceptedCharacterCount":{"shape":"PrimitiveInteger"}, + "unmodifiedAcceptedCharacterCount":{"shape":"PrimitiveInteger"} } }, "UserSettings": { @@ -2891,21 +2588,21 @@ "recommendationLatencyMilliseconds", "timestamp" ], - "members": { - "sessionId": { "shape": "UUID" }, - "requestId": { "shape": "UUID" }, - "customizationArn": { "shape": "CustomizationArn" }, - "programmingLanguage": { "shape": "ProgrammingLanguage" }, - "completionType": { "shape": "CompletionType" }, - "suggestionState": { "shape": "SuggestionState" }, - "recommendationLatencyMilliseconds": { "shape": "Double" }, - "timestamp": { "shape": "Timestamp" }, - "triggerToResponseLatencyMilliseconds": { "shape": "Double" }, - "suggestionReferenceCount": { "shape": "PrimitiveInteger" }, - "generatedLine": { "shape": "PrimitiveInteger" }, - "numberOfRecommendations": { "shape": "PrimitiveInteger" }, - "perceivedLatencyMilliseconds": { "shape": "Double" }, - "acceptedCharacterCount": { "shape": "PrimitiveInteger" } + "members":{ + "sessionId":{"shape":"UUID"}, + "requestId":{"shape":"UUID"}, + "customizationArn":{"shape":"CustomizationArn"}, + "programmingLanguage":{"shape":"ProgrammingLanguage"}, + "completionType":{"shape":"CompletionType"}, + "suggestionState":{"shape":"SuggestionState"}, + "recommendationLatencyMilliseconds":{"shape":"Double"}, + "timestamp":{"shape":"Timestamp"}, + "triggerToResponseLatencyMilliseconds":{"shape":"Double"}, + "suggestionReferenceCount":{"shape":"PrimitiveInteger"}, + "generatedLine":{"shape":"PrimitiveInteger"}, + "numberOfRecommendations":{"shape":"PrimitiveInteger"}, + "perceivedLatencyMilliseconds":{"shape":"Double"}, + "acceptedCharacterCount":{"shape":"PrimitiveInteger"} } }, "ValidationException": { @@ -2919,11 +2616,7 @@ }, "ValidationExceptionReason": { "type": "string", - "enum": [ - "INVALID_CONVERSATION_ID", - "CONTENT_LENGTH_EXCEEDS_THRESHOLD", - "INVALID_KMS_GRANT" - ] + "enum": ["INVALID_CONVERSATION_ID", "CONTENT_LENGTH_EXCEEDS_THRESHOLD", "INVALID_KMS_GRANT"] }, "WorkspaceState": { "type": "structure", From ab102df31364107c4eefbdf435140d13bbe5ab1d Mon Sep 17 00:00:00 2001 From: Kevin Ding Date: Fri, 7 Feb 2025 15:04:19 -0500 Subject: [PATCH 4/4] chore: resolve merge conflict and update API model --- .../codewhispererruntime/service-2.json | 538 +++++++++++++++--- 1 file changed, 451 insertions(+), 87 deletions(-) diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json index 2541167599..ac1f5d6e35 100644 --- a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json +++ b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json @@ -386,6 +386,40 @@ "type": "string", "enum": ["UNAUTHORIZED_CUSTOMIZATION_RESOURCE_ACCESS"] }, + "AdditionalContentEntry": { + "type": "structure", + "required": ["name", "description"], + "members": { + "name": { "shape": "AdditionalContentEntryNameString" }, + "description": { "shape": "AdditionalContentEntryDescriptionString" }, + "innerContext": { "shape": "AdditionalContentEntryInnerContextString" } + } + }, + "AdditionalContentEntryDescriptionString": { + "type": "string", + "max": 1024, + "min": 1, + "sensitive": true + }, + "AdditionalContentEntryInnerContextString": { + "type": "string", + "max": 8192, + "min": 1, + "sensitive": true + }, + "AdditionalContentEntryNameString": { + "type": "string", + "max": 1024, + "min": 1, + "pattern": "[a-z]+(?:-[a-z0-9]+)*", + "sensitive": true + }, + "AdditionalContentList": { + "type": "list", + "member": { "shape": "AdditionalContentEntry" }, + "max": 20, + "min": 0 + }, "AppStudioState": { "type": "structure", "required": ["namespace", "propertyName", "propertyContext"], @@ -498,7 +532,9 @@ "messageId": { "shape": "MessageId" }, "customizationArn": { "shape": "CustomizationArn" }, "interactionType": { "shape": "ChatMessageInteractionType" }, - "interactionTarget": { "shape": "ChatInteractWithMessageEventInteractionTargetString" }, + "interactionTarget": { + "shape": "ChatInteractWithMessageEventInteractionTargetString" + }, "acceptedCharacterCount": { "shape": "Integer" }, "acceptedLineCount": { "shape": "Integer" }, "acceptedSnippetHasReference": { "shape": "Boolean" }, @@ -570,7 +606,12 @@ }, "CodeCoverageEvent": { "type": "structure", - "required": ["programmingLanguage", "acceptedCharacterCount", "totalCharacterCount", "timestamp"], + "required": [ + "programmingLanguage", + "acceptedCharacterCount", + "totalCharacterCount", + "timestamp" + ], "members": { "customizationArn": { "shape": "CustomizationArn" }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, @@ -580,10 +621,22 @@ "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeCharacterCount": { "shape": "PrimitiveInteger" }, "totalNewCodeLineCount": { "shape": "PrimitiveInteger" }, - "userWrittenCodeCharacterCount": { "shape": "PrimitiveInteger" }, - "userWrittenCodeLineCount": { "shape": "PrimitiveInteger" } + "userWrittenCodeCharacterCount": { + "shape": "CodeCoverageEventUserWrittenCodeCharacterCountInteger" + }, + "userWrittenCodeLineCount": { + "shape": "CodeCoverageEventUserWrittenCodeLineCountInteger" + } } }, + "CodeCoverageEventUserWrittenCodeCharacterCountInteger": { + "type": "integer", + "min": 0 + }, + "CodeCoverageEventUserWrittenCodeLineCountInteger": { + "type": "integer", + "min": 0 + }, "CodeFixAcceptanceEvent": { "type": "structure", "required": ["jobId"], @@ -617,7 +670,8 @@ "CodeFixName": { "type": "string", "max": 128, - "min": 1 + "min": 1, + "pattern": "[a-zA-Z0-9-_$:.]*" }, "CodeFixUploadContext": { "type": "structure", @@ -685,7 +739,9 @@ "type": "structure", "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, - "CodeScanRemediationsEventType": { "shape": "CodeScanRemediationsEventType" }, + "CodeScanRemediationsEventType": { + "shape": "CodeScanRemediationsEventType" + }, "timestamp": { "shape": "Timestamp" }, "detectorId": { "shape": "String" }, "findingId": { "shape": "String" }, @@ -698,11 +754,20 @@ }, "CodeScanRemediationsEventType": { "type": "string", - "enum": ["CODESCAN_ISSUE_HOVER", "CODESCAN_ISSUE_APPLY_FIX", "CODESCAN_ISSUE_VIEW_DETAILS"] + "enum": [ + "CODESCAN_ISSUE_HOVER", + "CODESCAN_ISSUE_APPLY_FIX", + "CODESCAN_ISSUE_VIEW_DETAILS" + ] }, "CodeScanSucceededEvent": { "type": "structure", - "required": ["programmingLanguage", "codeScanJobId", "timestamp", "numberOfFindings"], + "required": [ + "programmingLanguage", + "codeScanJobId", + "timestamp", + "numberOfFindings" + ], "members": { "programmingLanguage": { "shape": "ProgrammingLanguage" }, "codeScanJobId": { "shape": "CodeScanJobId" }, @@ -747,7 +812,11 @@ }, "ConflictExceptionReason": { "type": "string", - "enum": ["CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", "CUSTOMER_KMS_KEY_DISABLED", "MISMATCHED_KMS_KEY"] + "enum": [ + "CUSTOMER_KMS_KEY_INVALID_KEY_POLICY", + "CUSTOMER_KMS_KEY_DISABLED", + "MISMATCHED_KMS_KEY" + ] }, "ConsoleState": { "type": "structure", @@ -799,7 +868,9 @@ "type": "structure", "members": { "contentMd5": { "shape": "CreateUploadUrlRequestContentMd5String" }, - "contentChecksum": { "shape": "CreateUploadUrlRequestContentChecksumString" }, + "contentChecksum": { + "shape": "CreateUploadUrlRequestContentChecksumString" + }, "contentChecksumType": { "shape": "ContentChecksumType" }, "contentLength": { "shape": "CreateUploadUrlRequestContentLengthLong" }, "artifactType": { "shape": "ArtifactType" }, @@ -925,6 +996,10 @@ "min": 1, "pattern": "[-a-zA-Z0-9._]*" }, + "DocFolderLevel": { + "type": "string", + "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] + }, "DocGenerationEvent": { "type": "structure", "required": ["conversationId"], @@ -933,25 +1008,110 @@ "numberOfAddChars": { "shape": "PrimitiveInteger" }, "numberOfAddLines": { "shape": "PrimitiveInteger" }, "numberOfAddFiles": { "shape": "PrimitiveInteger" }, - "userDecision": { "shape": "DocGenerationUserDecision" }, - "interactionType": { "shape": "DocGenerationInteractionType" }, + "userDecision": { "shape": "DocUserDecision" }, + "interactionType": { "shape": "DocInteractionType" }, "userIdentity": { "shape": "String" }, "numberOfNavigation": { "shape": "PrimitiveInteger" }, - "folderLevel": { "shape": "DocGenerationFolderLevel" } + "folderLevel": { "shape": "DocFolderLevel" } } }, - "DocGenerationFolderLevel": { - "type": "string", - "enum": ["SUB_FOLDER", "ENTIRE_WORKSPACE"] - }, - "DocGenerationInteractionType": { + "DocInteractionType": { "type": "string", "enum": ["GENERATE_README", "UPDATE_README", "EDIT_README"] }, - "DocGenerationUserDecision": { + "DocUserDecision": { "type": "string", "enum": ["ACCEPT", "REJECT"] }, + "DocV2AcceptanceEvent": { + "type": "structure", + "required": [ + "conversationId", + "numberOfAddedChars", + "numberOfAddedLines", + "numberOfAddedFiles", + "userDecision", + "interactionType", + "numberOfNavigations", + "folderLevel" + ], + "members": { + "conversationId": { "shape": "ConversationId" }, + "numberOfAddedChars": { + "shape": "DocV2AcceptanceEventNumberOfAddedCharsInteger" + }, + "numberOfAddedLines": { + "shape": "DocV2AcceptanceEventNumberOfAddedLinesInteger" + }, + "numberOfAddedFiles": { + "shape": "DocV2AcceptanceEventNumberOfAddedFilesInteger" + }, + "userDecision": { "shape": "DocUserDecision" }, + "interactionType": { "shape": "DocInteractionType" }, + "numberOfNavigations": { + "shape": "DocV2AcceptanceEventNumberOfNavigationsInteger" + }, + "folderLevel": { "shape": "DocFolderLevel" } + } + }, + "DocV2AcceptanceEventNumberOfAddedCharsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfAddedFilesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfAddedLinesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2AcceptanceEventNumberOfNavigationsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEvent": { + "type": "structure", + "required": [ + "conversationId", + "numberOfGeneratedChars", + "numberOfGeneratedLines", + "numberOfGeneratedFiles" + ], + "members": { + "conversationId": { "shape": "ConversationId" }, + "numberOfGeneratedChars": { + "shape": "DocV2GenerationEventNumberOfGeneratedCharsInteger" + }, + "numberOfGeneratedLines": { + "shape": "DocV2GenerationEventNumberOfGeneratedLinesInteger" + }, + "numberOfGeneratedFiles": { + "shape": "DocV2GenerationEventNumberOfGeneratedFilesInteger" + }, + "interactionType": { "shape": "DocInteractionType" }, + "numberOfNavigations": { + "shape": "DocV2GenerationEventNumberOfNavigationsInteger" + }, + "folderLevel": { "shape": "DocFolderLevel" } + } + }, + "DocV2GenerationEventNumberOfGeneratedCharsInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfGeneratedFilesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfGeneratedLinesInteger": { + "type": "integer", + "min": 0 + }, + "DocV2GenerationEventNumberOfNavigationsInteger": { + "type": "integer", + "min": 0 + }, "DocumentSymbol": { "type": "structure", "required": ["name", "type"], @@ -1012,7 +1172,9 @@ "type": "structure", "members": { "operatingSystem": { "shape": "EnvStateOperatingSystemString" }, - "currentWorkingDirectory": { "shape": "EnvStateCurrentWorkingDirectoryString" }, + "currentWorkingDirectory": { + "shape": "EnvStateCurrentWorkingDirectoryString" + }, "environmentVariables": { "shape": "EnvironmentVariables" }, "timezoneOffset": { "shape": "EnvStateTimezoneOffsetInteger" } } @@ -1062,11 +1224,19 @@ }, "FeatureDevCodeAcceptanceEvent": { "type": "structure", - "required": ["conversationId", "linesOfCodeAccepted", "charactersOfCodeAccepted"], + "required": [ + "conversationId", + "linesOfCodeAccepted", + "charactersOfCodeAccepted" + ], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" }, - "charactersOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" }, + "linesOfCodeAccepted": { + "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" + }, + "charactersOfCodeAccepted": { + "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" + }, "programmingLanguage": { "shape": "ProgrammingLanguage" } } }, @@ -1080,10 +1250,16 @@ }, "FeatureDevCodeGenerationEvent": { "type": "structure", - "required": ["conversationId", "linesOfCodeGenerated", "charactersOfCodeGenerated"], + "required": [ + "conversationId", + "linesOfCodeGenerated", + "charactersOfCodeGenerated" + ], "members": { "conversationId": { "shape": "ConversationId" }, - "linesOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" }, + "linesOfCodeGenerated": { + "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" + }, "charactersOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger" }, @@ -1149,7 +1325,12 @@ }, "FileContext": { "type": "structure", - "required": ["leftFileContent", "rightFileContent", "filename", "programmingLanguage"], + "required": [ + "leftFileContent", + "rightFileContent", + "filename", + "programmingLanguage" + ], "members": { "leftFileContent": { "shape": "FileContextLeftFileContentString" }, "rightFileContent": { "shape": "FileContextRightFileContentString" }, @@ -1194,9 +1375,13 @@ "required": ["fileContext"], "members": { "fileContext": { "shape": "FileContext" }, - "maxResults": { "shape": "GenerateCompletionsRequestMaxResultsInteger" }, + "maxResults": { + "shape": "GenerateCompletionsRequestMaxResultsInteger" + }, "nextToken": { "shape": "GenerateCompletionsRequestNextTokenString" }, - "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" }, + "referenceTrackerConfiguration": { + "shape": "ReferenceTrackerConfiguration" + }, "supplementalContexts": { "shape": "SupplementalContextList" }, "customizationArn": { "shape": "CustomizationArn" }, "optOutPreference": { "shape": "OptOutPreference" }, @@ -1269,8 +1454,7 @@ "required": ["conversationId", "codeGenerationId"], "members": { "conversationId": { "shape": "ConversationId" }, - "codeGenerationId": { "shape": "CodeGenerationId" }, - "intent": { "shape": "String" } + "codeGenerationId": { "shape": "CodeGenerationId" } } }, "GetTaskAssistCodeGenerationResponse": { @@ -1340,7 +1524,15 @@ }, "IdeCategory": { "type": "string", - "enum": ["JETBRAINS", "VSCODE", "CLI", "JUPYTER_MD", "JUPYTER_SM", "ECLIPSE", "VISUAL_STUDIO"], + "enum": [ + "JETBRAINS", + "VSCODE", + "CLI", + "JUPYTER_MD", + "JUPYTER_SM", + "ECLIPSE", + "VISUAL_STUDIO" + ], "max": 64, "min": 1 }, @@ -1422,8 +1614,11 @@ "ListAvailableCustomizationsRequest": { "type": "structure", "members": { - "maxResults": { "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" }, - "nextToken": { "shape": "Base64EncodedPaginationToken" } + "maxResults": { + "shape": "ListAvailableCustomizationsRequestMaxResultsInteger" + }, + "nextToken": { "shape": "Base64EncodedPaginationToken" }, + "profileArn": { "shape": "ProfileArn" } } }, "ListAvailableCustomizationsRequestMaxResultsInteger": { @@ -1518,6 +1713,39 @@ "type": "string", "enum": ["OPTIN", "OPTOUT"] }, + "PackageInfo": { + "type": "structure", + "members": { + "executionCommand": { "shape": "SensitiveString" }, + "buildCommand": { "shape": "SensitiveString" }, + "buildOrder": { "shape": "PackageInfoBuildOrderInteger" }, + "testFramework": { "shape": "String" }, + "packageSummary": { "shape": "PackageInfoPackageSummaryString" }, + "packagePlan": { "shape": "PackageInfoPackagePlanString" }, + "targetFileInfoList": { "shape": "TargetFileInfoList" } + } + }, + "PackageInfoBuildOrderInteger": { + "type": "integer", + "box": true, + "min": 0 + }, + "PackageInfoList": { + "type": "list", + "member": { "shape": "PackageInfo" } + }, + "PackageInfoPackagePlanString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, + "PackageInfoPackageSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, "PaginationToken": { "type": "string", "max": 2048, @@ -1597,7 +1825,9 @@ "type": "structure", "required": ["recommendationsWithReferences"], "members": { - "recommendationsWithReferences": { "shape": "RecommendationsWithReferencesPreference" } + "recommendationsWithReferences": { + "shape": "RecommendationsWithReferencesPreference" + } } }, "ReferenceUrlString": { @@ -1621,7 +1851,9 @@ "type": "structure", "required": ["relativeFilePath"], "members": { - "relativeFilePath": { "shape": "RelevantTextDocumentRelativeFilePathString" }, + "relativeFilePath": { + "shape": "RelevantTextDocumentRelativeFilePathString" + }, "programmingLanguage": { "shape": "ProgrammingLanguage" }, "text": { "shape": "RelevantTextDocumentTextString" }, "documentSymbols": { "shape": "DocumentSymbols" } @@ -1855,8 +2087,9 @@ }, "StartCodeFixJobRequestDescriptionString": { "type": "string", - "max": 2000, - "min": 1 + "max": 5000, + "min": 1, + "sensitive": true }, "StartCodeFixJobRequestRuleIdString": { "type": "string", @@ -1981,7 +2214,8 @@ "SuggestedFixDescriptionString": { "type": "string", "max": 2000, - "min": 1 + "min": 1, + "sensitive": true }, "SuggestionState": { "type": "string", @@ -2069,6 +2303,47 @@ "min": 1, "sensitive": true }, + "TargetFileInfo": { + "type": "structure", + "members": { + "filePath": { "shape": "SensitiveString" }, + "testFilePath": { "shape": "SensitiveString" }, + "testCoverage": { "shape": "TargetFileInfoTestCoverageInteger" }, + "fileSummary": { "shape": "TargetFileInfoFileSummaryString" }, + "filePlan": { "shape": "TargetFileInfoFilePlanString" }, + "codeReferences": { "shape": "References" }, + "numberOfTestMethods": { + "shape": "TargetFileInfoNumberOfTestMethodsInteger" + } + } + }, + "TargetFileInfoFilePlanString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, + "TargetFileInfoFileSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, + "TargetFileInfoList": { + "type": "list", + "member": { "shape": "TargetFileInfo" } + }, + "TargetFileInfoNumberOfTestMethodsInteger": { + "type": "integer", + "box": true, + "min": 0 + }, + "TargetFileInfoTestCoverageInteger": { + "type": "integer", + "box": true, + "max": 100, + "min": 0 + }, "TaskAssistPlan": { "type": "list", "member": { "shape": "TaskAssistPlanStep" }, @@ -2130,15 +2405,25 @@ "codeFixAcceptanceEvent": { "shape": "CodeFixAcceptanceEvent" }, "metricData": { "shape": "MetricData" }, "chatAddMessageEvent": { "shape": "ChatAddMessageEvent" }, - "chatInteractWithMessageEvent": { "shape": "ChatInteractWithMessageEvent" }, + "chatInteractWithMessageEvent": { + "shape": "ChatInteractWithMessageEvent" + }, "chatUserModificationEvent": { "shape": "ChatUserModificationEvent" }, - "terminalUserInteractionEvent": { "shape": "TerminalUserInteractionEvent" }, + "terminalUserInteractionEvent": { + "shape": "TerminalUserInteractionEvent" + }, "featureDevEvent": { "shape": "FeatureDevEvent" }, - "featureDevCodeGenerationEvent": { "shape": "FeatureDevCodeGenerationEvent" }, - "featureDevCodeAcceptanceEvent": { "shape": "FeatureDevCodeAcceptanceEvent" }, + "featureDevCodeGenerationEvent": { + "shape": "FeatureDevCodeGenerationEvent" + }, + "featureDevCodeAcceptanceEvent": { + "shape": "FeatureDevCodeAcceptanceEvent" + }, "inlineChatEvent": { "shape": "InlineChatEvent" }, "transformEvent": { "shape": "TransformEvent" }, "docGenerationEvent": { "shape": "DocGenerationEvent" }, + "docV2GenerationEvent": { "shape": "DocV2GenerationEvent" }, + "docV2AcceptanceEvent": { "shape": "DocV2AcceptanceEvent" }, "testGenerationEvent": { "shape": "TestGenerationEvent" } }, "union": true @@ -2146,7 +2431,9 @@ "TerminalUserInteractionEvent": { "type": "structure", "members": { - "terminalUserInteractionEventType": { "shape": "TerminalUserInteractionEventType" }, + "terminalUserInteractionEventType": { + "shape": "TerminalUserInteractionEventType" + }, "terminal": { "shape": "String" }, "terminalVersion": { "shape": "String" }, "shell": { "shape": "String" }, @@ -2159,7 +2446,10 @@ }, "TerminalUserInteractionEventType": { "type": "string", - "enum": ["CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED"] + "enum": [ + "CODEWHISPERER_TERMINAL_TRANSLATION_ACTION", + "CODEWHISPERER_TERMINAL_COMPLETION_INSERTED" + ] }, "TestGenerationEvent": { "type": "structure", @@ -2180,14 +2470,23 @@ }, "TestGenerationJob": { "type": "structure", - "required": ["testGenerationJobId", "testGenerationJobGroupName", "status", "creationTime"], + "required": [ + "testGenerationJobId", + "testGenerationJobGroupName", + "status", + "creationTime" + ], "members": { "testGenerationJobId": { "shape": "UUID" }, "testGenerationJobGroupName": { "shape": "TestGenerationJobGroupName" }, "status": { "shape": "TestGenerationJobStatus" }, "shortAnswer": { "shape": "SensitiveString" }, "creationTime": { "shape": "Timestamp" }, - "progressRate": { "shape": "TestGenerationJobProgressRateInteger" } + "progressRate": { "shape": "TestGenerationJobProgressRateInteger" }, + "jobStatusReason": { "shape": "String" }, + "jobSummary": { "shape": "TestGenerationJobJobSummaryString" }, + "jobPlan": { "shape": "TestGenerationJobJobPlanString" }, + "packageInfoList": { "shape": "PackageInfoList" } } }, "TestGenerationJobGroupName": { @@ -2196,6 +2495,18 @@ "min": 1, "pattern": "[a-zA-Z0-9-_]+" }, + "TestGenerationJobJobPlanString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, + "TestGenerationJobJobSummaryString": { + "type": "string", + "max": 30720, + "min": 0, + "sensitive": true + }, "TestGenerationJobProgressRateInteger": { "type": "integer", "box": true, @@ -2241,7 +2552,7 @@ }, "TextDocumentTextString": { "type": "string", - "max": 10240, + "max": 40000, "min": 0, "sensitive": true }, @@ -2249,11 +2560,16 @@ "type": "structure", "required": ["message"], "members": { - "message": { "shape": "String" } + "message": { "shape": "String" }, + "reason": { "shape": "ThrottlingExceptionReason" } }, "exception": true, "retryable": { "throttling": true } }, + "ThrottlingExceptionReason": { + "type": "string", + "enum": ["MONTHLY_REQUEST_COUNT"] + }, "Timestamp": { "type": "timestamp" }, "TransformEvent": { "type": "structure", @@ -2270,12 +2586,21 @@ }, "TransformationDotNetRuntimeEnv": { "type": "string", - "enum": ["NET_5_0", "NET_6_0", "NET_7_0", "NET_8_0", "NET_9_0", "NET_STANDARD_2_0"] + "enum": [ + "NET_5_0", + "NET_6_0", + "NET_7_0", + "NET_8_0", + "NET_9_0", + "NET_STANDARD_2_0" + ] }, "TransformationDownloadArtifact": { "type": "structure", "members": { - "downloadArtifactType": { "shape": "TransformationDownloadArtifactType" }, + "downloadArtifactType": { + "shape": "TransformationDownloadArtifactType" + }, "downloadArtifactId": { "shape": "ArtifactId" } } }, @@ -2312,7 +2637,16 @@ }, "TransformationLanguage": { "type": "string", - "enum": ["JAVA_8", "JAVA_11", "JAVA_17", "JAVA_21", "C_SHARP", "COBOL", "PL_I", "JCL"] + "enum": [ + "JAVA_8", + "JAVA_11", + "JAVA_17", + "JAVA_21", + "C_SHARP", + "COBOL", + "PL_I", + "JCL" + ] }, "TransformationLanguages": { "type": "list", @@ -2336,7 +2670,9 @@ "TransformationPlatformConfig": { "type": "structure", "members": { - "operatingSystemFamily": { "shape": "TransformationOperatingSystemFamily" } + "operatingSystemFamily": { + "shape": "TransformationOperatingSystemFamily" + } } }, "TransformationProgressUpdate": { @@ -2353,12 +2689,21 @@ }, "TransformationProgressUpdateStatus": { "type": "string", - "enum": ["IN_PROGRESS", "COMPLETED", "FAILED", "PAUSED", "AWAITING_CLIENT_ACTION"] + "enum": [ + "IN_PROGRESS", + "COMPLETED", + "FAILED", + "PAUSED", + "AWAITING_CLIENT_ACTION", + "SKIPPED" + ] }, "TransformationProjectArtifactDescriptor": { "type": "structure", "members": { - "sourceCodeArtifact": { "shape": "TransformationSourceCodeArtifactDescriptor" } + "sourceCodeArtifact": { + "shape": "TransformationSourceCodeArtifactDescriptor" + } }, "union": true }, @@ -2368,7 +2713,9 @@ "language": { "shape": "TransformationLanguage" }, "runtimeEnv": { "shape": "TransformationRuntimeEnv" }, "platformConfig": { "shape": "TransformationPlatformConfig" }, - "projectArtifact": { "shape": "TransformationProjectArtifactDescriptor" } + "projectArtifact": { + "shape": "TransformationProjectArtifactDescriptor" + } } }, "TransformationRuntimeEnv": { @@ -2432,7 +2779,15 @@ }, "TransformationStepStatus": { "type": "string", - "enum": ["CREATED", "COMPLETED", "PARTIALLY_COMPLETED", "STOPPED", "FAILED", "PAUSED"] + "enum": [ + "CREATED", + "COMPLETED", + "PARTIALLY_COMPLETED", + "STOPPED", + "FAILED", + "PAUSED", + "SKIPPED" + ] }, "TransformationSteps": { "type": "list", @@ -2466,8 +2821,12 @@ "UploadContext": { "type": "structure", "members": { - "taskAssistPlanningUploadContext": { "shape": "TaskAssistPlanningUploadContext" }, - "transformationUploadContext": { "shape": "TransformationUploadContext" }, + "taskAssistPlanningUploadContext": { + "shape": "TaskAssistPlanningUploadContext" + }, + "transformationUploadContext": { + "shape": "TransformationUploadContext" + }, "codeAnalysisUploadContext": { "shape": "CodeAnalysisUploadContext" }, "codeFixUploadContext": { "shape": "CodeFixUploadContext" } }, @@ -2531,7 +2890,8 @@ "appStudioContext": { "shape": "AppStudioState" }, "diagnostic": { "shape": "Diagnostic" }, "consoleState": { "shape": "ConsoleState" }, - "userSettings": { "shape": "UserSettings" } + "userSettings": { "shape": "UserSettings" }, + "additionalContext": { "shape": "AdditionalContentList" } } }, "UserIntent": { @@ -2549,9 +2909,9 @@ "CODE_GENERATION" ] }, - "UserModificationEvent":{ - "type":"structure", - "required":[ + "UserModificationEvent": { + "type": "structure", + "required": [ "sessionId", "requestId", "programmingLanguage", @@ -2560,15 +2920,15 @@ "acceptedCharacterCount", "unmodifiedAcceptedCharacterCount" ], - "members":{ - "sessionId":{"shape":"UUID"}, - "requestId":{"shape":"UUID"}, - "programmingLanguage":{"shape":"ProgrammingLanguage"}, - "modificationPercentage":{"shape":"Double"}, - "customizationArn":{"shape":"CustomizationArn"}, - "timestamp":{"shape":"Timestamp"}, - "acceptedCharacterCount":{"shape":"PrimitiveInteger"}, - "unmodifiedAcceptedCharacterCount":{"shape":"PrimitiveInteger"} + "members": { + "sessionId": { "shape": "UUID" }, + "requestId": { "shape": "UUID" }, + "programmingLanguage": { "shape": "ProgrammingLanguage" }, + "modificationPercentage": { "shape": "Double" }, + "customizationArn": { "shape": "CustomizationArn" }, + "timestamp": { "shape": "Timestamp" }, + "acceptedCharacterCount": { "shape": "PrimitiveInteger" }, + "unmodifiedAcceptedCharacterCount": { "shape": "PrimitiveInteger" } } }, "UserSettings": { @@ -2588,21 +2948,21 @@ "recommendationLatencyMilliseconds", "timestamp" ], - "members":{ - "sessionId":{"shape":"UUID"}, - "requestId":{"shape":"UUID"}, - "customizationArn":{"shape":"CustomizationArn"}, - "programmingLanguage":{"shape":"ProgrammingLanguage"}, - "completionType":{"shape":"CompletionType"}, - "suggestionState":{"shape":"SuggestionState"}, - "recommendationLatencyMilliseconds":{"shape":"Double"}, - "timestamp":{"shape":"Timestamp"}, - "triggerToResponseLatencyMilliseconds":{"shape":"Double"}, - "suggestionReferenceCount":{"shape":"PrimitiveInteger"}, - "generatedLine":{"shape":"PrimitiveInteger"}, - "numberOfRecommendations":{"shape":"PrimitiveInteger"}, - "perceivedLatencyMilliseconds":{"shape":"Double"}, - "acceptedCharacterCount":{"shape":"PrimitiveInteger"} + "members": { + "sessionId": { "shape": "UUID" }, + "requestId": { "shape": "UUID" }, + "customizationArn": { "shape": "CustomizationArn" }, + "programmingLanguage": { "shape": "ProgrammingLanguage" }, + "completionType": { "shape": "CompletionType" }, + "suggestionState": { "shape": "SuggestionState" }, + "recommendationLatencyMilliseconds": { "shape": "Double" }, + "timestamp": { "shape": "Timestamp" }, + "triggerToResponseLatencyMilliseconds": { "shape": "Double" }, + "suggestionReferenceCount": { "shape": "PrimitiveInteger" }, + "generatedLine": { "shape": "PrimitiveInteger" }, + "numberOfRecommendations": { "shape": "PrimitiveInteger" }, + "perceivedLatencyMilliseconds": { "shape": "Double" }, + "acceptedCharacterCount": { "shape": "PrimitiveInteger" } } }, "ValidationException": { @@ -2616,7 +2976,11 @@ }, "ValidationExceptionReason": { "type": "string", - "enum": ["INVALID_CONVERSATION_ID", "CONTENT_LENGTH_EXCEEDS_THRESHOLD", "INVALID_KMS_GRANT"] + "enum": [ + "INVALID_CONVERSATION_ID", + "CONTENT_LENGTH_EXCEEDS_THRESHOLD", + "INVALID_KMS_GRANT" + ] }, "WorkspaceState": { "type": "structure",