should stop transformation on profile changed (#2007)

Author: Will-ShaoHua

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

@@ -32,6 +32,8 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.projectCoroutineScope
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_MVN_FAILURE
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_PROJECT_SIZE
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_POM_FILE_NAME
@@ -130,6 +132,22 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     init {
         CodeModernizerSessionState.getInstance(project).setDefaults()
+        initQRegionProfileSelectedListener()
+    }
+
+    private fun initQRegionProfileSelectedListener() {
+        project.messageBus.connect(this).subscribe(
+            QRegionProfileSelectedListener.TOPIC,
+            object : QRegionProfileSelectedListener {
+                override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
+                    stopModernize()
+                    codeTransformationSession?.let {
+                        Disposer.dispose(it)
+                    }
+                    codeTransformationSession = null
+                }
+            }
+        )
     }
 
     fun validate(project: Project, transformationType: CodeTransformType): ValidationResult {
@@ -259,7 +277,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
 
     fun runModernize(copyResult: MavenCopyCommandsResult? = null) {
         initStopParameters()
-        val session = codeTransformationSession as CodeModernizerSession
+        val session = codeTransformationSession ?: return
         initModernizationJobUI(true, project.getModuleOrProjectNameForFile(session.sessionContext.configurationFile))
         launchModernizationJob(session, copyResult)
     }

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

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.util.Disposer
 import com.intellij.serviceContainer.AlreadyDisposedException
 import com.intellij.util.io.HttpRequests
 import kotlinx.coroutines.delay
@@ -149,6 +150,9 @@ class CodeModernizerSession(
      *  Based on [CodeWhispererCodeScanSession]
      */
     suspend fun createModernizationJob(copyResult: MavenCopyCommandsResult?): CodeModernizerStartJobResult {
+        if (this.isDisposed.get()) {
+            return CodeModernizerStartJobResult.Cancelled
+        }
         LOG.info { "Compressing local project" }
         val payload: File?
         var payloadSize = 0
@@ -182,6 +186,9 @@ class CodeModernizerSession(
             payloadSize = payload.length().toInt()
 
             LOG.info { "Uploading zip file with size: $payloadSize bytes" }
+            if (this.isDisposed.get()) {
+                return CodeModernizerStartJobResult.Cancelled
+            }
 
             if (payloadSize > MAX_ZIP_SIZE) {
                 telemetryErrorMessage = "Project exceeds max upload size"
@@ -210,7 +217,7 @@ class CodeModernizerSession(
                 telemetryErrorMessage = "Credential expired before uploading project"
                 return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.CREDENTIALS_EXPIRED)
             }
-            if (shouldStop.get()) {
+            if (shouldStop.get() || this.isDisposed.get()) {
                 LOG.warn { "Job was cancelled by user before upload was called" }
                 telemetryErrorMessage = "Cancelled when about to upload project"
                 return CodeModernizerStartJobResult.Cancelled
@@ -285,7 +292,7 @@ class CodeModernizerSession(
         CodeTransformMessageListener.instance.onUploadResult()
 
         return try {
-            if (shouldStop.get()) {
+            if (shouldStop.get() || this.isDisposed.get()) {
                 LOG.warn { "Job was cancelled by user before start job was called" }
                 return CodeModernizerStartJobResult.Cancelled
             }
@@ -625,6 +632,8 @@ class CodeModernizerSession(
 
     override fun dispose() {
         isDisposed.set(true)
+        shouldStop.set(true)
+        Disposer.dispose(sessionContext)
     }
 
     fun getActiveJobId() = state.currentJobId

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

@@ -16,6 +16,7 @@ import org.slf4j.Logger
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.jetbrains.services.codemodernizer.CodeTransformTelemetryManager
+import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
 import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
 import software.aws.toolkits.telemetry.CodeTransformBuildCommand
@@ -25,6 +26,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 
 fun runHilMavenCopyDependency(
+    context: CodeModernizerSessionContext,
     sourceFolder: File,
     destinationDir: File,
     logBuilder: StringBuilder,
@@ -35,6 +37,7 @@ fun runHilMavenCopyDependency(
     try {
         // Create shared parameters
         val transformMvnRunner = TransformMavenRunner(project)
+        context.mavenRunnerQueue.add(transformMvnRunner)
         val mvnSettings = MavenRunner.getInstance(project).settings.clone() // clone required to avoid editing user settings
 
         // run copy dependencies
@@ -57,7 +60,14 @@ fun runHilMavenCopyDependency(
     return MavenCopyCommandsResult.Success(destinationDir)
 }
 
-fun runMavenCopyCommands(sourceFolder: File, logBuilder: StringBuilder, logger: Logger, project: Project, shouldSkipTests: Boolean): MavenCopyCommandsResult {
+fun runMavenCopyCommands(
+    context: CodeModernizerSessionContext,
+    sourceFolder: File,
+    logBuilder: StringBuilder,
+    logger: Logger,
+    project: Project,
+    shouldSkipTests: Boolean,
+): MavenCopyCommandsResult {
     val currentTimestamp = System.currentTimeMillis()
     val destinationDir = Files.createTempDirectory("transformation_dependencies_temp_$currentTimestamp")
     val telemetry = CodeTransformTelemetryManager.getInstance(project)
@@ -68,6 +78,7 @@ fun runMavenCopyCommands(sourceFolder: File, logBuilder: StringBuilder, logger:
     try {
         // Create shared parameters
         val transformMvnRunner = TransformMavenRunner(project)
+        context.mavenRunnerQueue.add(transformMvnRunner)
         val mvnSettings = MavenRunner.getInstance(project).settings.clone() // clone required to avoid editing user settings
 
         val sourceVirtualFile = LocalFileSystem.getInstance().findFileByIoFile(sourceFolder)
@@ -282,10 +293,17 @@ private fun runMavenDependencyUpdatesReport(
     return dependencyUpdatesReportRunnable
 }
 
-fun runDependencyReportCommands(sourceFolder: File, logBuilder: StringBuilder, logger: Logger, project: Project): MavenDependencyReportCommandsResult {
+fun runDependencyReportCommands(
+    context: CodeModernizerSessionContext,
+    sourceFolder: File,
+    logBuilder: StringBuilder,
+    logger: Logger,
+    project: Project,
+): MavenDependencyReportCommandsResult {
     logger.info { "Executing IntelliJ bundled Maven" }
 
     val transformMvnRunner = TransformMavenRunner(project)
+    context.mavenRunnerQueue.add(transformMvnRunner)
     val mvnSettings = MavenRunner.getInstance(project).settings.clone() // clone required to avoid editing user settings
 
     val runnable = runMavenDependencyUpdatesReport(sourceFolder, logBuilder, mvnSettings, transformMvnRunner, logger)

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

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven
 
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
+import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.process.ProcessOutputTypes
 import com.intellij.execution.runners.ProgramRunner
 import com.intellij.execution.ui.RunContentDescriptor
@@ -16,11 +17,13 @@ import org.jetbrains.idea.maven.execution.MavenRunnerParameters
 import org.jetbrains.idea.maven.execution.MavenRunnerSettings
 
 class TransformMavenRunner(val project: Project) {
+    private var handler: ProcessHandler? = null
 
     fun run(parameters: MavenRunnerParameters, settings: MavenRunnerSettings, onComplete: TransformRunnable) {
         FileDocumentManager.getInstance().saveAllDocuments()
         val callback = ProgramRunner.Callback { descriptor: RunContentDescriptor ->
             val handler = descriptor.processHandler
+            this.handler = handler
             if (handler == null) {
                 // add log error here
                 onComplete.setExitCode(-1)
@@ -50,4 +53,8 @@ class TransformMavenRunner(val project: Project) {
         // Setting isDelegateBuild = true  allows us to set the JRE used by Maven during runtime
         MavenRunConfigurationType.runConfiguration(project, parameters, null, settings, callback, false)
     }
+
+    fun cancel() {
+        this.handler?.destroyProcess()
+    }
 }

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

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.codemodernizer.model
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.project.Project
@@ -19,6 +20,7 @@ import software.aws.toolkits.core.utils.putNextEntry
 import software.aws.toolkits.jetbrains.services.codemodernizer.EXPLAINABILITY_V1
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_DEPENDENCIES_ROOT_NAME
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.HIL_MANIFEST_FILE_NAME
+import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.TransformMavenRunner
 import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runDependencyReportCommands
 import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runHilMavenCopyDependency
 import software.aws.toolkits.jetbrains.services.codemodernizer.ideMaven.runMavenCopyCommands
@@ -59,6 +61,7 @@ const val INVALID_SUFFIX_REPOSITORIES = "repositories"
 const val ORACLE_DB = "ORACLE"
 const val AURORA_DB = "AURORA_POSTGRESQL"
 const val RDS_DB = "POSTGRESQL"
+
 data class CodeModernizerSessionContext(
     val project: Project,
     var configurationFile: VirtualFile? = null, // used to ZIP module
@@ -71,9 +74,11 @@ data class CodeModernizerSessionContext(
     val sourceServerName: String? = null,
     var schema: String? = null,
     val sqlMetadataZip: File? = null,
-) {
+) : Disposable {
     private val mapper = jacksonObjectMapper()
     private val ignoredDependencyFileExtensions = setOf(INVALID_SUFFIX_SHA, INVALID_SUFFIX_REPOSITORIES)
+    private var isDisposed = false
+    val mavenRunnerQueue: MutableList<TransformMavenRunner> = mutableListOf()
 
     private fun File.isMavenTargetFolder(): Boolean {
         val hasPomSibling = this.resolveSibling(MAVEN_CONFIGURATION_FILE_NAME).exists()
@@ -100,19 +105,22 @@ data class CodeModernizerSessionContext(
     }
 
     fun executeMavenCopyCommands(sourceFolder: File, buildLogBuilder: StringBuilder): MavenCopyCommandsResult {
+        if (isDisposed) return MavenCopyCommandsResult.Cancelled
         val shouldSkipTests = customBuildCommand == MAVEN_BUILD_SKIP_UNIT_TESTS
-        return runMavenCopyCommands(sourceFolder, buildLogBuilder, LOG, project, shouldSkipTests)
+        return runMavenCopyCommands(this, sourceFolder, buildLogBuilder, LOG, project, shouldSkipTests)
     }
 
     private fun executeHilMavenCopyDependency(sourceFolder: File, destinationFolder: File, buildLogBuilder: StringBuilder) = runHilMavenCopyDependency(
+        this,
         sourceFolder,
         destinationFolder,
         buildLogBuilder,
         LOG,
-        project
+        project,
     )
 
     fun copyHilDependencyUsingMaven(hilTepDirPath: Path): MavenCopyCommandsResult {
+        if (isDisposed) return MavenCopyCommandsResult.Cancelled
         val sourceFolder = File(getPathToHilArtifactPomFolder(hilTepDirPath).pathString)
         val destinationFolder = Files.createDirectories(getPathToHilDependenciesRootDir(hilTepDirPath)).toFile()
         val buildLogBuilder = StringBuilder("Starting Build Log...\n")
@@ -121,21 +129,24 @@ data class CodeModernizerSessionContext(
     }
 
     fun getDependenciesUsingMaven(): MavenCopyCommandsResult {
+        if (isDisposed) return MavenCopyCommandsResult.Cancelled
         val root = configurationFile?.parent
         val sourceFolder = File(root?.path)
         val buildLogBuilder = StringBuilder("Starting Build Log...\n")
         return executeMavenCopyCommands(sourceFolder, buildLogBuilder)
     }
 
     fun createDependencyReportUsingMaven(hilTempPomPath: Path): MavenDependencyReportCommandsResult {
+        if (isDisposed) return MavenDependencyReportCommandsResult.Cancelled
         val sourceFolder = File(hilTempPomPath.pathString)
         val buildLogBuilder = StringBuilder("Starting Build Log...\n")
         return executeDependencyVersionReportUsingMaven(sourceFolder, buildLogBuilder)
     }
+
     private fun executeDependencyVersionReportUsingMaven(
         sourceFolder: File,
         buildLogBuilder: StringBuilder,
-    ) = runDependencyReportCommands(sourceFolder, buildLogBuilder, LOG, project)
+    ) = runDependencyReportCommands(this, sourceFolder, buildLogBuilder, LOG, project)
 
     fun createZipForHilUpload(hilTempPath: Path, manifest: CodeTransformHilDownloadManifest?, targetVersion: String): ZipCreationResult =
         runReadAction {
@@ -326,6 +337,13 @@ data class CodeModernizerSessionContext(
         CodeModernizerBottomWindowPanelManager.getInstance(project).setJobStartingUI()
     }
 
+    override fun dispose() {
+        isDisposed = true
+        this.mavenRunnerQueue.forEach {
+            it.cancel()
+        }
+    }
+
     companion object {
         private val LOG = getLogger<CodeModernizerSessionContext>()
     }