address final 11/18 comments

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -11,10 +11,9 @@ import com.intellij.openapi.module.ModuleUtil
 import com.intellij.openapi.projectRoots.JavaSdkVersion
 import com.intellij.openapi.util.io.FileUtil.createTempDirectory
 import com.intellij.openapi.vfs.VirtualFile
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
@@ -322,12 +321,12 @@ class CodeTransformChatController(
     }
 
     override suspend fun processCodeTransformSelectSQLMetadataAction(message: IncomingCodeTransformMessage.CodeTransformSelectSQLMetadata) {
-        runInEdt {
+        withContext(EDT) {
             val descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor()
                 .withDescription("Select metadata file")
                 .withFileFilter { it.extension == "zip" }
 
-            val selectedZipFile = FileChooser.chooseFile(descriptor, null, null) ?: return@runInEdt
+            val selectedZipFile = FileChooser.chooseFile(descriptor, null, null) ?: return@withContext
             val extractedZip = createTempDirectory("codeTransformSQLMetadata", null)
 
             unzipFile(selectedZipFile.toNioPath(), extractedZip.toPath(), true)
@@ -337,36 +336,32 @@ class CodeTransformChatController(
             val metadataValidationResult = validateSctMetadata(sctFile)
 
             if (!metadataValidationResult.valid) {
-                CoroutineScope(EDT).launch {
-                    codeTransformChatHelper.run {
-                        addNewMessage(buildSQLMetadataValidationErrorChatContent(metadataValidationResult.errorReason))
-                        addNewMessage(buildStartNewTransformFollowup())
-                    }
+                codeTransformChatHelper.run {
+                    addNewMessage(buildSQLMetadataValidationErrorChatContent(metadataValidationResult.errorReason))
+                    addNewMessage(buildStartNewTransformFollowup())
                 }
-                return@runInEdt
+                return@withContext
             }
 
-            CoroutineScope(EDT).launch {
-                codeTransformChatHelper.run {
-                    addNewMessage(buildSQLMetadataValidationSuccessIntroChatContent())
-                    addNewMessage(buildSQLMetadataValidationSuccessDetailsChatContent(metadataValidationResult))
-                    addNewMessage(buildModuleSchemaFormIntroChatContent())
-                    addNewMessage(
-                        buildModuleSchemaFormChatContent(context.project, context.project.getJavaModulesWithSQL(), metadataValidationResult.schemaOptions)
-                    )
-                }
-                val selection = CustomerSelection(
-                    // for SQL conversions (no sourceJavaVersion), use dummy value of Java 8 so that startJob API can be called
-                    sourceJavaVersion = JavaSdkVersion.JDK_1_8,
-                    targetJavaVersion = JavaSdkVersion.JDK_17,
-                    sourceVendor = metadataValidationResult.sourceVendor,
-                    targetVendor = metadataValidationResult.targetVendor,
-                    sourceServerName = metadataValidationResult.sourceServerName,
-                    sqlMetadataZip = extractedZip,
+            codeTransformChatHelper.run {
+                addNewMessage(buildSQLMetadataValidationSuccessIntroChatContent())
+                addNewMessage(buildSQLMetadataValidationSuccessDetailsChatContent(metadataValidationResult))
+                addNewMessage(buildModuleSchemaFormIntroChatContent())
+                addNewMessage(
+                    buildModuleSchemaFormChatContent(context.project, context.project.getJavaModulesWithSQL(), metadataValidationResult.schemaOptions)
                 )
-                codeModernizerManager.createCodeModernizerSession(selection, context.project)
-                telemetry.submitSelection("Confirm-SQL", selection)
             }
+            val selection = CustomerSelection(
+                // for SQL conversions (no sourceJavaVersion), use dummy value of Java 8 so that startJob API can be called
+                sourceJavaVersion = JavaSdkVersion.JDK_1_8,
+                targetJavaVersion = JavaSdkVersion.JDK_17,
+                sourceVendor = metadataValidationResult.sourceVendor,
+                targetVendor = metadataValidationResult.targetVendor,
+                sourceServerName = metadataValidationResult.sourceServerName,
+                sqlMetadataZip = extractedZip,
+            )
+            codeModernizerManager.createCodeModernizerSession(selection, context.project)
+            telemetry.submitSelection("Confirm-SQL", selection)
         }
     }
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformFileUtils.kt

@@ -151,7 +151,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
     try {
         sctMetadata = XML_MAPPER.readValue<SctMetadata>(sctFile)
     } catch (e: Exception) {
-        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered. $e" }
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file; invalid XML encountered: ${e.localizedMessage}" }
         return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_sct"))
     }
 
@@ -182,7 +182,7 @@ fun validateSctMetadata(sctFile: File?): SqlMetadataValidationResult {
         }
         return SqlMetadataValidationResult(true, "", sourceVendor, targetVendor, sourceServerName, schemaNames)
     } catch (e: Exception) {
-        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file: $e" }
+        getLogger<CodeTransformChatController>().error { "Error parsing .sct metadata file: ${e.localizedMessage}" }
         return SqlMetadataValidationResult(false, message("codemodernizer.chat.message.validation.error.invalid_sct"))
     }
 }

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -564,7 +564,7 @@ code.aws.workspaces.short=Dev Environments
 codemodernizer.builderrordialog.description.title=Error occurred when building your project
 codemodernizer.chat.form.user_selection.item.choose_module=Choose a module to transform
 codemodernizer.chat.form.user_selection.item.choose_skip_tests_option=Choose to skip unit tests
-codemodernizer.chat.form.user_selection.item.choose_sql_metadata_file=Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Choose the link to Amazon S3 console.\n\nYou can download the metadata file from the {schema-conversion-project}/ directory. For more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).
+codemodernizer.chat.form.user_selection.item.choose_sql_metadata_file=Okay, I can convert the embedded SQL code for your Oracle to PostgreSQL transformation. To get started, upload the zipped metadata file from your schema conversion in AWS Data Migration Service (DMS). To retrieve the metadata file:\n1. Open your database migration project in the AWS DMS console.\n2. Open the schema conversion and choose **Convert the embedded SQL in your application**.\n3. Once you complete the conversion, close the project and go to the S3 bucket where your project is stored.\n4. Open the folder and find the project folder ("sct-project").\n5. Download the object inside the project folder. This will be a zip file.\n\nFor more info, refer to the [documentation](https://docs.aws.amazon.com/dms/latest/userguide/schema-conversion-save-apply.html#schema-conversion-save).
 codemodernizer.chat.form.user_selection.item.choose_target_version=Choose the target code version
 codemodernizer.chat.form.user_selection.title=Q - Code transformation
 codemodernizer.chat.message.absolute_path_detected=I detected {0} potential absolute file path(s) in your {1} file: **{2}**. Absolute file paths might cause issues when I build your code. Any errors will show up in the build log.