add check for empty diff

Author: David Hasani

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt

@@ -348,7 +348,7 @@ fun buildUserInputSQLConversionMetadataChatContent() = CodeTransformChatMessageC
 )
 
 fun buildUserInputCustomDependencyVersionsChatContent() = CodeTransformChatMessageContent(
-    message = "Optionally, provide a .YAML file which specifies custom dependency versions you want Q to upgrade to.",
+    message =  message("codemodernizer.chat.message.custom_dependency_upgrades_prompt"),
     buttons = listOf(
         confirmCustomDependencyVersionsButton,
         continueTransformationButton,
@@ -368,7 +368,7 @@ fun buildInvalidTargetJdkNameChatContent(jdkName: String) = CodeTransformChatMes
 )
 
 fun buildCustomDependencyVersionsFileValidChatContent() = CodeTransformChatMessageContent(
-    message = "I received your .yaml file and will upload it to Q.",
+    message = message("codemodernizer.chat.message.custom_dependency_upgrades_valid"),
     type = CodeTransformChatMessageType.FinalizedAnswer,
 )
 
@@ -415,7 +415,7 @@ fun buildSQLMetadataValidationErrorChatContent(errorReason: String) = CodeTransf
 
 fun buildCustomDependencyVersionsFileInvalidChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.FinalizedAnswer,
-    message = "The file you uploaded does not follow the format of the sample YAML file provided.",
+    message = message("codemodernizer.chat.message.custom_dependency_upgrades_invalid"),
 )
 
 fun buildUserCancelledChatContent() = CodeTransformChatMessageContent(
@@ -455,7 +455,7 @@ fun buildUserLanguageUpgradeSelectionSummaryChatContent(moduleName: String, targ
 
 fun buildContinueTransformationChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.FinalizedAnswer,
-    message = "Ok, I will continue without this information.",
+    message = message("codemodernizer.chat.message.custom_dependency_upgrades_continue"),
 )
 
 fun buildCompileLocalInProgressChatContent() = CodeTransformChatMessageContent(

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

@@ -475,7 +475,7 @@ dependencyManagement:
     - identifier: "com.example:library1"
       targetVersion: "2.1.0"
       versionProperty: "library1.version"  # Optional
-      originType: "FIRST_PARTY" # or "THIRD_PARTY"  # Optional
+      originType: "FIRST_PARTY" # or "THIRD_PARTY"
     - identifier: "com.example:library2"
       targetVersion: "3.0.0"
       originType: "THIRD_PARTY"
@@ -485,7 +485,7 @@ dependencyManagement:
       versionProperty: "plugin.version"  # Optional
         """.trimIndent()
 
-        val virtualFile = LightVirtualFile("sample-dependency-upgrade.yaml", YAMLFileType.YML, sampleYAML)
+        val virtualFile = LightVirtualFile("dependency_upgrade.yml", YAMLFileType.YML, sampleYAML)
         virtualFile.isWritable = true
         ApplicationManager.getApplication().invokeLater {
             FileEditorManager.getInstance(context.project).openFile(virtualFile, true)

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

@@ -44,6 +44,7 @@ import kotlin.io.path.pathString
 const val MANIFEST_PATH = "manifest.json"
 const val ZIP_SOURCES_PATH = "sources"
 const val ZIP_DEPENDENCIES_PATH = "dependencies"
+const val COMPILATIONS_JSON_FILE = "compilations.json"
 const val CUSTOM_DEPENDENCY_VERSIONS_FILE_PATH = "dependency_upgrade.yml"
 const val UPLOAD_ZIP_MANIFEST_VERSION = "1.0"
 const val HIL_1P_UPGRADE_CAPABILITY = "HIL_1pDependency_VersionUpgrade"

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt

@@ -3,18 +3,18 @@
 
 package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
-// TODO: include custom yaml file path in manifest.json?
 data class ZipManifest(
     val sourcesRoot: String = ZIP_SOURCES_PATH,
     val dependenciesRoot: String = ZIP_DEPENDENCIES_PATH,
     val version: String = UPLOAD_ZIP_MANIFEST_VERSION,
     val hilCapabilities: List<String> = listOf(HIL_1P_UPGRADE_CAPABILITY),
-    // TODO: add CLIENT_SIDE_BUILD to transformCapabilities when releasing CSB
-    val transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1, SELECTIVE_TRANSFORMATION_V2),
-    val noInteractiveMode: Boolean = true,
+    val transformCapabilities: List<String> = listOf(EXPLAINABILITY_V1, CLIENT_SIDE_BUILD, SELECTIVE_TRANSFORMATION_V2),
     val customBuildCommand: String = MAVEN_BUILD_RUN_UNIT_TESTS,
     val requestedConversions: RequestedConversions? = null, // only used for SQL conversions for now
     var dependencyUpgradeConfigFile: String? = null,
+    // TODO: make sure the below 2 keys don't mess up SQL conversions when present
+    val noInteractiveMode: Boolean = true,
+    val compilationsJsonFile: String = COMPILATIONS_JSON_FILE
 )
 
 data class RequestedConversions(

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

@@ -170,8 +170,12 @@ suspend fun attemptLocalBuild(plan: TransformationPlan, jobId: JobId, project: P
     if (artifactId != null) {
         val clientInstructionsPath = downloadClientInstructions(jobId, artifactId, project)
         getLogger<CodeModernizerManager>().info { "Downloaded client instructions for job ${jobId.id} and artifact $artifactId at: $clientInstructionsPath" }
-        processClientInstructions(clientInstructionsPath, jobId, artifactId, project)
-        getLogger<CodeModernizerManager>().info { "Finished processing client instructions for job ${jobId.id} and artifact $artifactId" }
+        if (clientInstructionsPath.toFile().readText().trim().isNotEmpty()) {
+            processClientInstructions(clientInstructionsPath, jobId, artifactId, project)
+            getLogger<CodeModernizerManager>().info { "Finished processing client instructions for job ${jobId.id} and artifact $artifactId" }
+        } else {
+            getLogger<CodeModernizerManager>().info { "Client instructions for job ${jobId.id} and artifact $artifactId is empty; skipping client-side build" }
+        }
     }
 }
 

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

@@ -197,7 +197,8 @@ fun parseXmlDependenciesReport(pathToXmlDependency: Path): DependencyUpdatesRepo
 }
 
 fun validateCustomVersionsFile(file: VirtualFile): Boolean {
-    if (!file.name.lowercase().endsWith(".yaml")) {
+    val validFileEndings = listOf("yaml", "yml")
+    if (!validFileEndings.any { file.name.lowercase().endsWith(it) }) {
         getLogger<CodeTransformChatController>().error { "Custom versions file is not a YAML file: ${file.name}" }
         return false
     }

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

@@ -646,6 +646,10 @@ codemodernizer.chat.message.button.view_summary=View summary
 codemodernizer.chat.message.changes_applied=I applied the changes to your project.
 codemodernizer.chat.message.choose_objective=I can help you with the following tasks:\n- Upgrade your Java 8, Java 11, and Java 17 codebases to Java 17 or Java 21.\n- Upgrade Java 17 or Java 21 code with up-to-date libraries and other dependencies.\n- Convert embedded SQL code for Oracle to PostgreSQL database migrations in AWS DMS.\n\nWhat would you like to do? You can enter "language upgrade" or "sql conversion".
 codemodernizer.chat.message.choose_objective_placeholder=Enter "language upgrade" or "sql conversion"
+codemodernizer.chat.message.custom_dependency_upgrades_continue=Ok, I will continue the transformation without additional dependency upgrade information.
+codemodernizer.chat.message.custom_dependency_upgrades_prompt=Would you like to provide a dependency upgrade file? You can specify first and third party dependencies and their versions in a YAML file, and I will upgrade them during the transformation. For an example dependency upgrade file, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).
+codemodernizer.chat.message.custom_dependency_upgrades_invalid=I wasn't able to parse the dependency upgrade file. Check that it's configured properly and try again. For an example of the required dependency upgrade file format, see the [documentation](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-transformation.html#dependency-upgrade-file).
+codemodernizer.chat.message.custom_dependency_upgrades_valid=The dependency upgrade file looks good. I will use this information to upgrade the dependencies you specified.
 codemodernizer.chat.message.download_failed_client_instructions_expired=Your transformation is not available anymore. Your code and transformation summary are deleted 24 hours after the transformation completes. Please try starting the transformation again.
 codemodernizer.chat.message.download_failed_invalid_artifact=Sorry, I was unable to find your {0}. Artifacts are deleted after 24 hours. Please try starting the transformation again.
 codemodernizer.chat.message.download_failed_other=Sorry, I ran into an issue while trying to download your {0}. Please try again. {1}