more gradle updates

Author: David Hasani

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

@@ -152,7 +152,6 @@ class CodeTransformChatApp : AmazonQApp {
     }
 
     private suspend fun handleMessage(message: AmazonQMessage, inboundAppMessagesHandler: InboundAppMessagesHandler) {
-        notifyStickyInfo("message info", "message = $message")
         when (message) {
             is IncomingCodeTransformMessage.Transform -> inboundAppMessagesHandler.processTransformQuickAction(message)
             is IncomingCodeTransformMessage.CodeTransformStart -> inboundAppMessagesHandler.processCodeTransformStartAction(message)

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

@@ -234,24 +234,18 @@ fun buildUserBuildSystemSelectionChatContent(buildSystem: String) = CodeTransfor
     message = getUserBuildSystemSelectionFormattedMarkdown(buildSystem)
 )
 
-fun buildUserInputChatContent(project: Project, validationResult: ValidationResult): CodeTransformChatMessageContent {
-    val moduleBuildFiles = validationResult.validatedBuildFiles
-
-    notifyStickyInfo("build files", "validated build files = ${validationResult.validatedBuildFiles}")
-
-    return CodeTransformChatMessageContent(
-        message = message("codemodernizer.chat.form.user_selection.title"),
-        buttons = listOf(
-            confirmUserSelectionButton,
-            cancelUserSelectionButton,
-        ),
-        formItems = listOf(
-            getSelectModuleFormItem(project, moduleBuildFiles),
-            selectTargetVersionFormItem,
-        ),
-        type = CodeTransformChatMessageType.FinalizedAnswer,
-    )
-}
+fun buildUserInputChatContent(project: Project, validationResult: ValidationResult) = CodeTransformChatMessageContent(
+    message = message("codemodernizer.chat.form.user_selection.title"),
+    buttons = listOf(
+        confirmUserSelectionButton,
+        cancelUserSelectionButton,
+    ),
+    formItems = listOf(
+        getSelectModuleFormItem(project, validationResult.validatedBuildFiles),
+        selectTargetVersionFormItem,
+    ),
+    type = CodeTransformChatMessageType.FinalizedAnswer,
+)
 
 fun buildUserCancelledChatContent() = CodeTransformChatMessageContent(
     type = CodeTransformChatMessageType.FinalizedAnswer,

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

@@ -261,13 +261,10 @@ class CodeTransformChatController(
 
         val sourceJdk = getSourceJdk(moduleConfigurationFile)
 
-        notifyStickyWarn("Build File", "moduleConfigurationFile = ${moduleConfigurationFile.path}")
-
         // (rare) if a module has both a pom.xml and a build.gradle / build.gradle.kts, just the pom.xml will be detected up until here
         // so, check if a build.gradle / build.gradle.kts is present next to the pom.xml, and if so, ask the user what build system to use
         if (moduleConfigurationFile.name == MAVEN_CONFIGURATION_FILE_NAME &&
             moduleConfigurationFile.parent.children.any { it.name == "build.gradle" || it.name == "build.gradle.kts" }) {
-            notifyStickyInfo("Maven & Gradle found", "This project has a pom.xml and a build.gradle / build.gradle.kts")
             codeTransformChatHelper.addNewMessage(buildUserInputBuildSystemChatContent())
             return
         }

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

@@ -34,13 +34,15 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeMo
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactPomFolder
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilDependenciesRootDir
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilUploadZip
+import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import java.io.File
 import java.io.IOException
 import java.nio.file.FileVisitOption
 import java.nio.file.FileVisitResult
 import java.nio.file.Files
 import java.nio.file.Path
+import java.nio.file.Paths
 import java.nio.file.SimpleFileVisitor
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.zip.ZipOutputStream
@@ -156,15 +158,16 @@ data class CodeModernizerSessionContext(
         }
     }
 
+    // TODO: figure out why this isn't working
     private fun runGradleScript(sourceFolder: File, buildLogBuilder: StringBuilder, logger: Logger, project: Project): LocalBuildResult {
         val pythonExecutable = getPythonExecutable() ?: return LocalBuildResult.Failure("Python not found")
         val gradleWrapperExists = checkAndCreateGradleWrapper(sourceFolder)
         if (!gradleWrapperExists) {
             return LocalBuildResult.Failure("Gradle wrapper could not be created")
         }
-        val scriptPath = "/pythonScript/gradle_copy_deps.py" // AwsToolkit.PLUGINS_INFO.getValue(AwsPlugin.Q).path?.resolve("codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/gradle_copy_deps.py")
-        // TO-DO: evaluate if withWorkDirectory is needed here, and whether to use path or absolutePath
-        val commandLine = GeneralCommandLine("$pythonExecutable $scriptPath ${sourceFolder.path}")
+        val scriptPath = Paths.get("plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/gradle_copy_deps.py").toAbsolutePath().toString() // AwsToolkit.PLUGINS_INFO.getValue(AwsPlugin.Q).path?.resolve("codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/gradle_copy_deps.py")
+        // TODO: evaluate if withWorkDirectory is needed here, and whether to use path or absolutePath
+        val commandLine = GeneralCommandLine("$pythonExecutable $scriptPath ${sourceFolder.path}").withWorkDirectory(sourceFolder)
         try {
             val processOutput = ExecUtil.execAndGetOutput(commandLine)
             LOG.warn { "gradle_copy_deps.py finished with exitCode = ${processOutput.exitCode} and output = ${processOutput.stdout}\n${processOutput.stderr}" }
@@ -302,10 +305,10 @@ data class CodeModernizerSessionContext(
                 val outputFile = createTemporaryZipFile { zip ->
                     // 1) Manifest file
                     val dependenciesRoot = "$ZIP_DEPENDENCIES_PATH/${depDirectory?.name}"
-                    // TO-DO: fix backend issue where this needs to be equalsIgnoreCase: https://code.amazon.com/packages/ElasticGumbyCodeGenAgent/blobs/e4002a60a410da75c55aad1279a314204919bd80/--/src/main/java/com/amazonaws/elasticgumby/codegen/build/inference/FileBasedBuildSystemInference.java#L62
-                    // then the below "GRADLE" can just be "Gradle"
-                    val buildTool = if (configurationFile.name == MAVEN_CONFIGURATION_FILE_NAME) "Maven" else "GRADLE"
-                    mapper.writeValueAsString(ZipManifest(dependenciesRoot = dependenciesRoot, buildTool = buildTool))
+                    // TODO: fix backend issue where this needs to be equalsIgnoreCase: FileBasedBuildSystemInference.java#L62
+                    val buildTool = if (configurationFile.name == MAVEN_CONFIGURATION_FILE_NAME) MAVEN_BUILD_SYSTEM else GRADLE_BUILD_SYSTEM
+                    // buildTool needs to be uppercase for backend until we use equalsIgnoreCase
+                    mapper.writeValueAsString(ZipManifest(dependenciesRoot = dependenciesRoot, buildTool = buildTool.uppercase()))
                         .byteInputStream()
                         .use {
                             zip.putNextEntry(Path(MANIFEST_PATH).toString(), it)