part1 of add gradle support

Author: David Hasani

plugins/amazonq/build.gradle.kts

@@ -24,8 +24,25 @@ tasks.jar {
     from(changelog) {
         into("META-INF")
     }
+//    from("software/aws/toolkits/jetbrains/services/codemodernizer/utils/gradle_copy_deps.py") {
+//        into("pythonScript")
+//    }
 }
 
+//val codeTransformGradleScriptDirConfig = configurations.create("codeTransformGradleScriptDirConfig") {
+//    isCanBeResolved = false
+//}
+//
+//val codeTransformGradleScriptDir = tasks.register<Sync>("codeTransformGradleScriptDir") {
+//    from("software/aws/toolkits/jetbrains/services/codemodernizer/utils/gradle_copy_deps.py")
+//    into("$buildDir/$name")
+//    includeEmptyDirs = false
+//}
+//
+//artifacts {
+//    add(codeTransformGradleScriptDirConfig.name, codeTransformGradleScriptDir)
+//}
+
 dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))

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

@@ -43,10 +43,12 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CustomerSelection
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.Dependency
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.GRADLE_CONFIGURATION_FILE_NAME
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.GRADLE_KTS_CONFIGURATION_FILE_NAME
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.InvalidTelemetryReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.LocalBuildResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_CONFIGURATION_FILE_NAME
-import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
@@ -59,7 +61,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeMo
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_WHERE_PLAN_EXIST
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.createFileCopy
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.findLineNumberByString
-import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getMavenVersion
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getModuleOrProjectNameForFile
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilArtifactPomFile
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilDependencyReport
@@ -78,6 +79,7 @@ import software.aws.toolkits.jetbrains.ui.feedback.CodeTransformFeedbackDialog
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.jetbrains.utils.notifyStickyError
 import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
+import software.aws.toolkits.jetbrains.utils.notifyStickyWarn
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeTransformBuildSystem
 import software.aws.toolkits.telemetry.CodeTransformCancelSrcComponents
@@ -105,10 +107,10 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             Disposer.register(contentManager, it)
         }
     }
-    private val supportedBuildFileNames = listOf(MAVEN_CONFIGURATION_FILE_NAME)
+    private val supportedBuildFileNames = listOf(MAVEN_CONFIGURATION_FILE_NAME, GRADLE_CONFIGURATION_FILE_NAME, GRADLE_KTS_CONFIGURATION_FILE_NAME)
     private val isModernizationInProgress = AtomicBoolean(false)
     private val isResumingJob = AtomicBoolean(false)
-    private val isMvnRunning = AtomicBoolean(false)
+    private val isLocalBuildRunning = AtomicBoolean(false)
     private val isJobSuccessfullyResumed = AtomicBoolean(false)
 
     private val transformationStoppedByUsr = AtomicBoolean(false)
@@ -180,8 +182,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                     true,
                     validatedBuildFiles = validatedBuildFiles,
                     validatedProjectJdkName = projectJdk?.description.orEmpty(),
-                    buildSystem = CodeTransformBuildSystem.Maven,
-                    buildSystemVersion = getMavenVersion(project)
+                    // TO-DO: maybe add back the other two fields of ValidationResult
+                    // probably not since user has not selected a project at this point
                 )
             } else {
                 ValidationResult(
@@ -191,10 +193,10 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                         supportedBuildFileNames.joinToString()
                     ),
                     invalidTelemetryReason = InvalidTelemetryReason(
+                        // TO-DO: make this NonMavenGradleProject?
                         CodeTransformPreValidationError.NonMavenProject,
                         if (isGradleProject(project)) "Gradle build" else "other build"
                     ),
-                    buildSystem = if (isGradleProject(project)) CodeTransformBuildSystem.Gradle else CodeTransformBuildSystem.Unknown
                 )
             }
         }
@@ -250,11 +252,11 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         }
     }
 
-    fun runModernize(copyResult: MavenCopyCommandsResult) {
+    fun runModernize(localBuildResult: LocalBuildResult) {
         initStopParameters()
         val session = codeTransformationSession as CodeModernizerSession
         initModernizationJobUI(true, project.getModuleOrProjectNameForFile(session.sessionContext.configurationFile))
-        launchModernizationJob(session, copyResult)
+        launchModernizationJob(session, localBuildResult)
     }
 
     suspend fun resumePollingFromHil() {
@@ -314,9 +316,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         )
     }
 
-    fun launchModernizationJob(session: CodeModernizerSession, copyResult: MavenCopyCommandsResult) = projectCoroutineScope(project).launch {
-        val result = initModernizationJob(session, copyResult)
-
+    fun launchModernizationJob(session: CodeModernizerSession, localBuildResult: LocalBuildResult) = projectCoroutineScope(project).launch {
+        val result = initModernizationJob(session, localBuildResult)
         postModernizationJob(result)
     }
 
@@ -364,22 +365,23 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     fun isJobOngoingInState() = managerState.flags.getOrDefault(StateFlags.IS_ONGOING, false)
 
-    fun handleLocalMavenBuildResult(mavenCopyCommandsResult: MavenCopyCommandsResult) {
-        codeTransformationSession?.setLastMvnBuildResult(mavenCopyCommandsResult)
+    private fun handleLocalBuildResult(localBuildResult: LocalBuildResult) {
+        codeTransformationSession?.setLastLocalBuildResult(localBuildResult)
         // Send IDE notifications first
-        if (mavenCopyCommandsResult == MavenCopyCommandsResult.Failure) {
+        if (localBuildResult is LocalBuildResult.Failure) {
             notifyStickyInfo(
-                message("codemodernizer.notification.warn.maven_failed.title"),
-                message("codemodernizer.notification.warn.maven_failed.content"),
+                message("codemodernizer.notification.warn.local_build_failed.title"),
+                localBuildResult.failureReason,
                 project,
+                // TO-DO: maybe update URL once troubleshooting docs are updated
                 listOf(openTroubleshootingGuideNotificationAction(CODE_TRANSFORM_TROUBLESHOOT_DOC_MVN_FAILURE), displayFeedbackNotificationAction()),
             )
         }
 
-        CodeTransformMessageListener.instance.onMavenBuildResult(mavenCopyCommandsResult)
+        CodeTransformMessageListener.instance.onLocalBuildResult(localBuildResult)
     }
 
-    fun runLocalMavenBuild(project: Project, customerSelection: CustomerSelection) {
+    fun runLocalBuild(project: Project, customerSelection: CustomerSelection) {
         // TODO: deprecated metric - remove after BI started using new metric
         telemetry.jobStartedCompleteFromPopupDialog(customerSelection)
 
@@ -389,17 +391,17 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         codeTransformationSession = session
 
         projectCoroutineScope(project).launch {
-            isMvnRunning.set(true)
-            val result = session.getDependenciesUsingMaven()
-            isMvnRunning.set(false)
-            handleLocalMavenBuildResult(result)
+            isLocalBuildRunning.set(true)
+            val result = session.getDependencies()
+            isLocalBuildRunning.set(false)
+            handleLocalBuildResult(result)
         }
     }
 
     fun parseBuildFile(): String? = parseBuildFile(codeTransformationSession?.sessionContext?.configurationFile)
 
-    internal suspend fun initModernizationJob(session: CodeModernizerSession, copyResult: MavenCopyCommandsResult): CodeModernizerJobCompletedResult =
-        when (val result = session.createModernizationJob(copyResult)) {
+    internal suspend fun initModernizationJob(session: CodeModernizerSession, localBuildResult: LocalBuildResult): CodeModernizerJobCompletedResult =
+        when (val result = session.createModernizationJob(localBuildResult)) {
             is CodeModernizerStartJobResult.ZipCreationFailed -> {
                 CodeModernizerJobCompletedResult.UnableToCreateJob(
                     message("codemodernizer.notification.warn.zip_creation_failed", result.reason),
@@ -432,10 +434,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 CodeModernizerJobCompletedResult.JobAbortedBeforeStarting
             }
 
-            is CodeModernizerStartJobResult.CancelledMissingDependencies -> {
-                CodeModernizerJobCompletedResult.JobAbortedMissingDependencies
-            }
-
             is CodeModernizerStartJobResult.CancelledZipTooLarge -> {
                 CodeModernizerJobCompletedResult.JobAbortedZipTooLarge
             }
@@ -650,12 +648,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
             is CodeModernizerJobCompletedResult.ManagerDisposed -> LOG.warn { "Manager disposed" }
             is CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> LOG.warn { "Job was aborted" }
-            is CodeModernizerJobCompletedResult.JobAbortedMissingDependencies -> notifyStickyInfo(
-                message("codemodernizer.notification.warn.maven_failed.title"),
-                message("codemodernizer.notification.warn.maven_failed.content"),
-                project,
-                listOf(openTroubleshootingGuideNotificationAction(CODE_TRANSFORM_TROUBLESHOOT_DOC_MVN_FAILURE), displayFeedbackNotificationAction()),
-            )
             is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge -> notifyStickyInfo(
                 message("codemodernizer.notification.warn.zip_too_large.title"),
                 message("codemodernizer.notification.warn.zip_too_large.content"),
@@ -716,11 +708,11 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     fun isModernizationJobActive(): Boolean = isModernizationInProgress.get()
 
-    fun isRunningMvn(): Boolean = isMvnRunning.get()
+    fun isLocalBuildRunning(): Boolean = isLocalBuildRunning.get()
 
     fun isJobSuccessfullyResumed(): Boolean = isJobSuccessfullyResumed.get()
 
-    fun getLastMvnBuildResult(): MavenCopyCommandsResult? = codeTransformationSession?.getLastMvnBuildResult()
+    fun getLastLocalBuildResult(): LocalBuildResult? = codeTransformationSession?.getLastLocalBuildResult()
 
     fun getLastTransformResult(): CodeModernizerJobCompletedResult? = codeTransformationSession?.getLastTransformResult()
 
@@ -729,8 +721,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
     fun getBottomToolWindow() = ToolWindowManager.getInstance(project).getToolWindow(CodeModernizerBottomToolWindowFactory.id)
         ?: error(message("codemodernizer.toolwindow.problems_window_not_found"))
 
-    fun getMvnBuildWindow() = ToolWindowManager.getInstance(project).getToolWindow("Run")
-        ?: error(message("codemodernizer.toolwindow.problems_mvn_window_not_found"))
+    fun getLocalBuildWindow() = ToolWindowManager.getInstance(project).getToolWindow("Run")
+        ?: error(message("codemodernizer.toolwindow.problems_local_build_window_not_found"))
 
     override fun getState(): CodeModernizerState = CodeModernizerState().apply {
         lastJobContext.putAll(managerState.lastJobContext)
@@ -856,7 +848,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         }
     }
 
-    fun copyDependencyForHil(selectedVersion: String): MavenCopyCommandsResult {
+    fun copyDependencyForHil(selectedVersion: String): LocalBuildResult {
         try {
             val session = codeTransformationSession ?: throw CodeModernizerException("Cannot get the current session")
 
@@ -865,27 +857,27 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
             val downloadedPomPath = getPathToHilArtifactPomFile(tmpDirPath)
             if (!downloadedPomPath.exists()) {
-                return MavenCopyCommandsResult.Failure
+                return LocalBuildResult.Failure(message("codemodernizer.chat.message.hil.error.cannot_upload"))
             }
 
             val downloadedPomFile = File(downloadedPomPath.pathString)
             setDependencyVersionInPom(downloadedPomFile, selectedVersion)
 
-            val copyDependencyResult = session.copyHilDependencyUsingMaven()
-            return copyDependencyResult
+            val localBuildResult = session.copyHilDependencyUsingMaven()
+            return localBuildResult
         } catch (e: Exception) {
             val errorMessage = "Unexpected error when getting HIL dependency for upload: ${e.localizedMessage}"
             telemetry.error(errorMessage)
             LOG.error { errorMessage }
-            return MavenCopyCommandsResult.Failure
+            return LocalBuildResult.Failure(message("codemodernizer.chat.message.hil.error.cannot_upload"))
         }
     }
 
     suspend fun tryResumeWithAlternativeVersion(selectedVersion: String) {
         try {
             val zipCreationResult = codeTransformationSession?.createHilUploadZip(selectedVersion)
             if (zipCreationResult?.payload?.exists() == true) {
-                codeTransformationSession?.uploadHilPayload(zipCreationResult.payload)
+                codeTransformationSession?.uploadHilPayload(zipCreationResult.payload!!)
 
                 // Add delay between upload complete and trying to resume
                 delay(500)

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

@@ -34,7 +34,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
-import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.LocalBuildResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.ZipCreationResult
@@ -84,7 +84,7 @@ class CodeModernizerSession(
     private val telemetry = CodeTransformTelemetryManager.getInstance(sessionContext.project)
     private val artifactHandler = ArtifactHandler(sessionContext.project, GumbyClient.getInstance(sessionContext.project))
 
-    private var mvnBuildResult: MavenCopyCommandsResult? = null
+    private var localBuildResult: LocalBuildResult? = null
     private var transformResult: CodeModernizerJobCompletedResult? = null
 
     private var hilDownloadArtifactId: String? = null
@@ -108,10 +108,10 @@ class CodeModernizerSession(
     fun setHilTempDirectoryPath(path: Path) {
         hilTempDirectoryPath = path
     }
-    fun getLastMvnBuildResult(): MavenCopyCommandsResult? = mvnBuildResult
+    fun getLastLocalBuildResult(): LocalBuildResult? = localBuildResult
 
-    fun setLastMvnBuildResult(result: MavenCopyCommandsResult) {
-        mvnBuildResult = result
+    fun setLastLocalBuildResult(result: LocalBuildResult) {
+        localBuildResult = result
     }
 
     fun getLastTransformResult(): CodeModernizerJobCompletedResult? = transformResult
@@ -120,13 +120,13 @@ class CodeModernizerSession(
         transformResult = result
     }
 
-    fun getDependenciesUsingMaven(): MavenCopyCommandsResult = sessionContext.getDependenciesUsingMaven()
+    fun getDependencies(): LocalBuildResult = sessionContext.getDependencies()
 
     fun createHilDependencyReportUsingMaven(): MavenDependencyReportCommandsResult = sessionContext.createDependencyReportUsingMaven(
         getPathToHilDependencyReportDir(hilTempDirectoryPath as Path)
     )
 
-    fun copyHilDependencyUsingMaven(): MavenCopyCommandsResult = sessionContext.copyHilDependencyUsingMaven(hilTempDirectoryPath as Path)
+    fun copyHilDependencyUsingMaven(): LocalBuildResult = sessionContext.copyHilDependencyUsingMaven(hilTempDirectoryPath as Path)
 
     fun createHilUploadZip(selectedVersion: String) = sessionContext.createZipForHilUpload(
         hilTempDirectoryPath as Path,
@@ -144,13 +144,13 @@ class CodeModernizerSession(
      *
      *  Based on [CodeWhispererCodeScanSession]
      */
-    fun createModernizationJob(copyResult: MavenCopyCommandsResult): CodeModernizerStartJobResult {
+    fun createModernizationJob(localBuildResult: LocalBuildResult): CodeModernizerStartJobResult {
+        // local build result must have been successful here
         LOG.info { "Compressing local project" }
         val payload: File?
         var payloadSize = 0
         val startTime = Instant.now()
         var telemetryErrorMessage: String? = null
-        var dependenciesCopied = false
 
         try {
             // Generate zip file
@@ -164,17 +164,10 @@ class CodeModernizerSession(
                 telemetryErrorMessage = "Disposed when about to create zip"
                 return CodeModernizerStartJobResult.Disposed
             }
-            val result = sessionContext.createZipWithModuleFiles(copyResult)
+            val result = sessionContext.createZipWithModuleFiles(localBuildResult)
 
-            if (result is ZipCreationResult.Missing1P) {
-                telemetryErrorMessage = "Missing 1p dependencies"
-                return CodeModernizerStartJobResult.CancelledMissingDependencies
-            } else {
-                dependenciesCopied = true
-            }
-
-            payload = result.payload
-            payloadSize = payload.length().toInt()
+            payload = result.payload // must be non-null here
+            payloadSize = payload!!.length().toInt()
 
             // TODO: deprecated metric - remove after BI started using new metric
             telemetry.jobCreateZipEndTime(payloadSize, startTime)
@@ -197,7 +190,7 @@ class CodeModernizerSession(
         } finally {
             // Publish metric if uploadProject failed at the zipping step, since the process will return early.
             if (!telemetryErrorMessage.isNullOrEmpty()) {
-                telemetry.uploadProject(payloadSize, startTime, dependenciesCopied, telemetryErrorMessage)
+                telemetry.uploadProject(payloadSize, startTime, true, telemetryErrorMessage)
             }
         }