fix(CodeTransformation): refresh VFS if diff.patch not found (#4166)

Author: dhasani23

.changes/next-release/feature-1588ed67-8e95-4e9a-92ed-e761ca3ec97d.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "CodeTransform: add button to submit feedback when job fails"
+}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt

@@ -54,9 +54,8 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.state.buildState
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.getLatestJobId
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.toSessionContext
 import software.aws.toolkits.jetbrains.services.codemodernizer.toolwindow.CodeModernizerBottomToolWindowFactory
-import software.aws.toolkits.jetbrains.services.codemodernizer.ui.components.BuildErrorDialog
 import software.aws.toolkits.jetbrains.services.codemodernizer.ui.components.PreCodeTransformUserDialog
-import software.aws.toolkits.jetbrains.services.codemodernizer.ui.components.ValidationErrorDialog
+import software.aws.toolkits.jetbrains.ui.feedback.FeedbackDialog
 import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
 import software.aws.toolkits.jetbrains.utils.notifyStickyError
 import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
@@ -73,6 +72,8 @@ import java.util.Base64
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.swing.Icon
 
+const val AMAZON_Q_FEEDBACK_DIALOG_KEY = "Amazon Q"
+
 @State(name = "codemodernizerStates", storages = [Storage("aws.xml", roamingType = RoamingType.PER_OS)])
 class CodeModernizerManager(private val project: Project) : PersistentStateComponent<CodeModernizerState>, Disposable {
     private var managerState = CodeModernizerState()
@@ -296,6 +297,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             message("codemodernizer.notification.info.modernize_failed.title"),
             message("codemodernizer.notification.info.modernize_failed.description", reason, retryablestring),
             project,
+            listOf(displayFeedbackNotificationAction())
         )
     }
 
@@ -304,6 +306,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             message("codemodernizer.notification.info.transformation_stop.title"),
             message("codemodernizer.notification.info.transformation_stop.content"),
             project,
+            listOf(displayFeedbackNotificationAction())
         )
     }
 
@@ -312,6 +315,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             message("codemodernizer.notification.info.transformation_resume.title"),
             message("codemodernizer.notification.info.transformation_resume.content"),
             project,
+            listOf(displayFeedbackNotificationAction())
         )
     }
 
@@ -328,6 +332,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             message("codemodernizer.notification.info.transformation_start_stopping.failed_title"),
             message("codemodernizer.notification.info.transformation_start_stopping.failed_as_job_not_started"),
             project,
+            listOf(displayFeedbackNotificationAction())
         )
     }
 
@@ -336,6 +341,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             message("codemodernizer.notification.info.transformation_start_stopping.failed_title"),
             message("codemodernizer.notification.info.transformation_start_stopping.failed_content", message),
             project,
+            listOf(displayFeedbackNotificationAction())
         )
     }
 
@@ -487,7 +493,11 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                         message("codemodernizer.manager.job_finished_title"),
                         message("codemodernizer.manager.job_finished_content"),
                         project,
-                        listOf(displayDiffNotificationAction(lastJobId), displaySummaryNotificationAction(lastJobId), viewTransformationHubAction())
+                        listOf(
+                            displayDiffNotificationAction(lastJobId),
+                            displaySummaryNotificationAction(lastJobId),
+                            viewTransformationHubAction()
+                        )
                     )
                     resumeJob(session, lastJobId, result)
                     setJobNotOngoing()
@@ -498,7 +508,12 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                         message("codemodernizer.notification.info.modernize_failed.title"),
                         message("codemodernizer.manager.job_failed_content", result.reason()),
                         project,
-                        listOf(displayDiffNotificationAction(lastJobId), displaySummaryNotificationAction(lastJobId), viewTransformationHubAction())
+                        listOf(
+                            displayDiffNotificationAction(lastJobId),
+                            displaySummaryNotificationAction(lastJobId),
+                            displayFeedbackNotificationAction(),
+                            viewTransformationHubAction()
+                        )
                     )
                     resumeJob(session, lastJobId, result)
                     setJobNotOngoing()
@@ -561,6 +576,11 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
             artifactHandler.showTransformationSummary(jobId)
         }
 
+    private fun displayFeedbackNotificationAction() =
+        NotificationAction.createSimple(message("codemodernizer.notification.warn.submit_feedback")) {
+            FeedbackDialog(project, productName = AMAZON_Q_FEEDBACK_DIALOG_KEY).showAndGet()
+        }
+
     fun informUserOfCompletion(result: CodeModernizerJobCompletedResult) {
         CodetransformTelemetry.totalRunTime(
             codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
@@ -585,17 +605,18 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 false,
             )
 
-            is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> {
-                ApplicationManager.getApplication().invokeLater {
-                    runInEdt { BuildErrorDialog.create(result.failureReason) }
-                }
-            }
+            is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> notifyStickyInfo(
+                message("codemodernizer.builderrordialog.description.title"),
+                result.failureReason,
+                project,
+                listOf(displayFeedbackNotificationAction())
+            )
 
             is CodeModernizerJobCompletedResult.JobPartiallySucceeded -> notifyStickyInfo(
                 message("codemodernizer.notification.info.modernize_partial_complete.title"),
                 message("codemodernizer.notification.info.modernize_partial_complete.content", result.targetJavaVersion.description),
                 project,
-                listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId)),
+                listOf(displayDiffNotificationAction(result.jobId), displaySummaryNotificationAction(result.jobId), displayFeedbackNotificationAction()),
             )
 
             is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> notifyStickyInfo(
@@ -611,13 +632,13 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
                 message("codemodernizer.notification.warn.maven_failed.title"),
                 message("codemodernizer.notification.warn.maven_failed.content"),
                 project,
-                listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_MAVEN_COMMANDS)),
+                listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_MAVEN_COMMANDS), displayFeedbackNotificationAction()),
             )
             is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge -> notifyStickyInfo(
                 message("codemodernizer.notification.warn.zip_too_large.title"),
                 message("codemodernizer.notification.warn.zip_too_large.content"),
                 project,
-                listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_PREREQUISITES)),
+                listOf(openTroubleshootingGuideNotificationAction(TROUBLESHOOTING_URL_PREREQUISITES), displayFeedbackNotificationAction()),
             )
         }
     }
@@ -695,9 +716,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
         addCodeModernizeUI(true)
         val maybeUnknownReason = reason ?: message("codemodernizer.notification.warn.invalid_project.description.reason.unknown")
         codeModernizerBottomWindowPanelManager.setProjectInvalidUI(maybeUnknownReason)
-        ApplicationManager.getApplication().invokeLater {
-            runInEdt { ValidationErrorDialog.create(maybeUnknownReason) }
-        }
         notifyStickyInfo(
             message("codemodernizer.validationerrordialog.description.title"),
             message("codemodernizer.validationerrordialog.description.main"),

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerSession.kt

@@ -37,6 +37,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.plan.CodeModerniz
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeTransformTelemetryState
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
+import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodeTransformApiNames
 import software.aws.toolkits.telemetry.CodetransformTelemetry
@@ -83,6 +84,10 @@ class CodeModernizerSession(
                 return CodeModernizerStartJobResult.Disposed
             }
             val startTime = Instant.now()
+            notifyStickyInfo(
+                message("codemodernizer.notification.info.compiling_project.title"),
+                message("codemodernizer.notification.info.compiling_project.content"),
+            )
             val result = sessionContext.createZipWithModuleFiles()
 
             if (result is ZipCreationResult.Missing1P) {
@@ -121,6 +126,10 @@ class CodeModernizerSession(
                 LOG.warn { "Job was cancelled by user before upload was called" }
                 return CodeModernizerStartJobResult.Cancelled
             }
+            notifyStickyInfo(
+                message("codemodernizer.notification.info.submitted_project.title"),
+                message("codemodernizer.notification.info.submitted_project.content"),
+            )
             val uploadId = uploadPayload(payload)
             if (shouldStop.get()) {
                 LOG.warn { "Job was cancelled by user before start job was called" }
@@ -289,6 +298,7 @@ class CodeModernizerSession(
         if (!shouldStop.get()) {
             CodetransformTelemetry.logApiLatency(
                 codeTransformApiNames = CodeTransformApiNames.UploadZip,
+                codeTransformUploadId = createUploadUrlResponse.uploadId(),
                 codeTransformSessionId = CodeTransformTelemetryState.instance.getSessionId(),
                 codeTransformRunTimeLatency = calculateTotalLatency(uploadStartTime, Instant.now()),
                 codeTransformTotalByteSize = payload.length().toInt(),

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt

@@ -53,7 +53,6 @@ open class CodeModernizerArtifact(
                 val manifest = loadManifest()
                 if (manifest.version > maxSupportedVersion) {
                     // If not supported we can still try to use it, i.e. the versions should largely be backwards compatible
-                    // Can also notify user to consider upgrading the toolkit version.
                     LOG.warn { "Unsupported version: ${manifest.version}" }
                 }
                 val patches = extractPatches(manifest)
@@ -100,7 +99,7 @@ open class CodeModernizerArtifact(
                 throw RuntimeException("Expected root for patches was not a directory.")
             }
             return patchesDir.walk()
-                .map { fileSystem.findFileByNioFile(it) ?: throw RuntimeException("Could not find patch") }
+                .map { fileSystem.refreshAndFindFileByNioFile(it) ?: throw RuntimeException("Could not find patch") }
                 .toList()
         }
     }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt

@@ -66,10 +66,6 @@ data class CodeModernizerSessionContext(
         return isIdea
     }
 
-    /**
-     * Can eventually modify to use an approach based on walkTopDown instead of VfsUtil.collectChildrenRecursively(root) in createZipWithModuleFiles.
-     * We now recurse the file tree twice and then filter which hurts performance for large projects.
-     */
     private fun findDirectoriesToExclude(sourceFolder: File): List<File> {
         val excluded = mutableListOf<File>()
         sourceFolder.walkTopDown().onEnter {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codemodernizer/ui/components/BuildErrorDialog.kt

@@ -575,6 +575,8 @@ codemodernizer.migration_plan.substeps.description_failed=Build failed
 codemodernizer.migration_plan.substeps.description_stopped=Job is stopped
 codemodernizer.migration_plan.substeps.description_succeed=Build succeeded
 codemodernizer.migration_summary.header.title=Transformation summary
+codemodernizer.notification.info.compiling_project.content=Amazon Q is compiling your project. This can take up to 10 minutes.
+codemodernizer.notification.info.compiling_project.title=Compiling Project
 codemodernizer.notification.info.download.started.content=Downloading the updated code
 codemodernizer.notification.info.download.started.title=Download Started
 codemodernizer.notification.info.modernize_complete.content=Transformation job successfully finished. You can view the changes and accept changes to further test the transformed code and push it to production.
@@ -589,6 +591,8 @@ codemodernizer.notification.info.modernize_failed.unknown_failure_reason=unknown
 codemodernizer.notification.info.modernize_ongoing.view_status=View status
 codemodernizer.notification.info.modernize_partial_complete.content=Transformation job partially successful! The new code is not fully Java {0} compatible yet. You will need to fix changes yourself. You can view the changes by clicking view diff below.
 codemodernizer.notification.info.modernize_partial_complete.title=Transformation partially successful!
+codemodernizer.notification.info.submitted_project.content=Your project has been submitted for transformation. The code transformation process may take 10-30 mins depending on the size of your project.
+codemodernizer.notification.info.submitted_project.title=Submitted Project
 codemodernizer.notification.info.transformation_resume.content=We were unable to resume polling for the job you started before closing the project.
 codemodernizer.notification.info.transformation_resume.title=Unable to resume polling for job updates.
 codemodernizer.notification.info.transformation_start_stopping.as_no_response=Unable to stop job due to an internal error.
@@ -602,7 +606,7 @@ codemodernizer.notification.info.transformation_stop.title=Transformation stoppe
 codemodernizer.notification.info.transformation_summary.content=We need to download the transformation summary, please try again after this has completed.
 codemodernizer.notification.info.transformation_summary.title=Transformation summary download started!
 codemodernizer.notification.info.view_troubleshooting_guide=View troubleshooting guide
-codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions=We could not find an upgrade eligible application. We currently support upgrade of Maven Java applications of version 8 and 11. Go to File -> Project Structure and ensure the correct JDK is selected in the SDK field.
+codemodernizer.notification.warn.invalid_project.description.reason.invalid_jdk_versions=We could not find an upgrade eligible application.
 codemodernizer.notification.warn.invalid_project.description.reason.missing_content_roots=We could not find an upgrade eligible application. We currently support upgrade of Maven Java applications of version 8 and 11.
 codemodernizer.notification.warn.invalid_project.description.reason.no_valid_files=We could not find a valid configuration file for the project. We currently support Maven build tool and require a POM.xml to identify build configurations.
 codemodernizer.notification.warn.invalid_project.description.reason.not_logged_in=We can not start the transform as you are not logged in with sso, please log in to CodeWhisperer using SSO.
@@ -612,6 +616,7 @@ codemodernizer.notification.warn.maven_failed.content=We were unable to build an
 codemodernizer.notification.warn.maven_failed.title=Amazon Q Code Transform unable to zip dependencies
 codemodernizer.notification.warn.on_resume.unknown_status_response.content=We received data from Amazon Q in a format that the plugin cannot handle. You may need to update the plugin and then try again.
 codemodernizer.notification.warn.on_resume.unknown_status_response.title=Unable to resume job.
+codemodernizer.notification.warn.submit_feedback=Submit feedback
 codemodernizer.notification.warn.unable_to_generate_plan=The job failed before a code transform plan could be generated.
 codemodernizer.notification.warn.unable_to_start_job=we were unable to start the job as an exception happened:\n{0}
 codemodernizer.notification.warn.unknown_build_failure=Your application failed to build due to an unknown error.
@@ -666,7 +671,7 @@ codemodernizer.toolwindow.table.header.status=Status
 codemodernizer.toolwindow.transformation.history.header=Transformation job history
 codemodernizer.toolwindow.transformation.progress.header=Transformation progress
 codemodernizer.toolwindow.transformation.progress.running_time=Running time: {0}
-codemodernizer.validationerrordialog.description.main=Amazon Q Code cannot transform your project as it is not eligible.
+codemodernizer.validationerrordialog.description.main=Amazon Q Code cannot transform your project as it is not eligible. We currently support upgrade of Maven Java applications of version 8 and 11. To start, go to File -> Project Structure and ensure the correct JDK is selected in the SDK field.
 codemodernizer.validationerrordialog.description.title=Validation Error occurred
 codewhisperer.codescan.apply_fix_button_label=Apply fix
 codewhisperer.codescan.apply_fix_button_tooltip=Apply suggested fix