Skip to content

Commit f0af5a2

Browse files
rlirli
authored
Merge branch 'main' into rli/fix-infinite-loop
2 parents ccd6897 + e1b0ce8 commit f0af5a2

File tree

439 files changed

+1783
-1494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

439 files changed

+1783
-1494
lines changed

‎.changes/next-release/bugfix-157ef077-cf07-42c8-99f7-1412ee28ce2b.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix an issue where worker threads are unable to properly resolve the calling plugin, resulting in invalid telemetry data"
4+
}

‎.changes/next-release/bugfix-9142060f-f7e0-47d8-a082-ce95dcbfae79.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Feature Development: update /dev welcome message"
4+
}

‎.changes/next-release/bugfix-a6c159d0-f2cb-469d-9c46-49a378eaaf60.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix IDE auto completion settings potentially overwritten by Q inline suggestion"
4+
}

‎buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
66
import software.aws.toolkits.gradle.jvmTarget
77

88
plugins {
9+
id("java-library")
910
id("toolkit-detekt")
1011
id("toolkit-jvm-conventions")
1112
}
@@ -19,7 +20,10 @@ dependencies {
1920
implementation(versionCatalog.findBundle("kotlin").get())
2021
implementation(versionCatalog.findLibrary("kotlin-coroutines").get())
2122

22-
testImplementation(versionCatalog.findLibrary("kotlin-test").get())
23+
testFixturesApi(versionCatalog.findLibrary("kotlin-test").get())
24+
testFixturesApi(versionCatalog.findLibrary("kotlin-coroutinesDebug").get())
25+
testFixturesApi(versionCatalog.findLibrary("kotlin-coroutinesTest").get())
26+
testFixturesApi(versionCatalog.findLibrary("mockk").get())
2327
}
2428

2529
sourceSets {

‎plugins/amazonq/chat/jetbrains-community/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ intellij {
1717

1818
dependencies {
1919
implementation(project(":plugin-amazonq:shared:jetbrains-community"))
20+
// everything references codewhisperer, which is not ideal
21+
implementation(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
2022

2123
compileOnly(project(":plugin-core:jetbrains-community"))
2224

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
77
import com.intellij.openapi.Disposable
88
import com.intellij.openapi.actionSystem.AnActionEvent
99
import com.intellij.openapi.actionSystem.DataContext
10-
import com.intellij.openapi.application.ApplicationManager
1110
import com.intellij.openapi.components.Service
1211
import com.intellij.openapi.components.service
1312
import com.intellij.openapi.project.Project
@@ -39,6 +38,7 @@ import software.aws.toolkits.jetbrains.isDeveloperMode
3938
import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
4039
import software.aws.toolkits.jetbrains.utils.isQConnected
4140
import software.aws.toolkits.jetbrains.utils.isQExpired
41+
import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
4242
import software.aws.toolkits.telemetry.FeatureId
4343
import software.aws.toolkits.telemetry.WebviewTelemetry
4444
import java.awt.event.ActionListener
@@ -164,7 +164,7 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
164164
"reauth" -> {
165165
ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())?.let { conn ->
166166
if (conn is ManagedBearerSsoConnection) {
167-
ApplicationManager.getApplication().executeOnPooledThread {
167+
pluginAwareExecuteOnPooledThread {
168168
reauthConnectionIfNeeded(project, conn, onPendingToken)
169169
}
170170
}
@@ -221,7 +221,12 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
221221
}
222222

223223
// previous login
224-
val lastLoginIdcInfo = ToolkitAuthManager.getInstance().getLastLoginIdcInfo()
224+
val lastLoginIdcInfo = ToolkitAuthManager.getInstance().getLastLoginIdcInfo().apply {
225+
// set default option as us-east-1
226+
if (this.region.isBlank()) {
227+
this.region = AwsRegionProvider.getInstance().defaultRegion().id
228+
}
229+
}
225230

226231
// available regions
227232
val regions = AwsRegionProvider.getInstance().allRegionsForService("sso").values.let {

‎plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ dependencies {
1919
implementation(project(":plugin-amazonq:shared:jetbrains-community"))
2020
// hack because transform has a chat entrypoint
2121
implementation(project(":plugin-amazonq:chat:jetbrains-community"))
22+
// hack because everything references codewhisperer
23+
implementation(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
2224

2325
compileOnly(project(":plugin-core:jetbrains-community"))
2426

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

Lines changed: 145 additions & 61 deletions
Large diffs are not rendered by default.

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

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer
44

55
import com.intellij.notification.NotificationAction
66
import com.intellij.openapi.Disposable
7+
import com.intellij.openapi.actionSystem.AnAction
78
import com.intellij.openapi.application.ApplicationManager
89
import com.intellij.openapi.application.runInEdt
910
import com.intellij.openapi.components.PersistentStateComponent
@@ -47,6 +48,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
4748
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MAVEN_CONFIGURATION_FILE_NAME
4849
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
4950
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
51+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.UploadFailureReason
5052
import software.aws.toolkits.jetbrains.services.codemodernizer.model.ValidationResult
5153
import software.aws.toolkits.jetbrains.services.codemodernizer.panels.managers.CodeModernizerBottomWindowPanelManager
5254
import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
@@ -74,7 +76,7 @@ import software.aws.toolkits.jetbrains.ui.feedback.CodeTransformFeedbackDialog
7476
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
7577
import software.aws.toolkits.jetbrains.utils.notifyStickyError
7678
import software.aws.toolkits.jetbrains.utils.notifyStickyInfo
77-
import software.aws.toolkits.resources.AwsToolkitBundle.message
79+
import software.aws.toolkits.resources.message
7880
import software.aws.toolkits.telemetry.CodeTransformCancelSrcComponents
7981
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
8082
import java.io.File
@@ -197,6 +199,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
197199
*/
198200
fun addCodeModernizeUI(setSelected: Boolean = false, moduleOrProjectNameForFile: String? = null) = runInEdt {
199201
val appModernizerBottomWindow = getBottomToolWindow()
202+
appModernizerBottomWindow.isAvailable = true
200203
if (!appModernizerBottomWindow.contentManager.contents.contains(codeModernizerBottomWindowPanelContent)) {
201204
appModernizerBottomWindow.contentManager.addContent(codeModernizerBottomWindowPanelContent)
202205
}
@@ -249,13 +252,13 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
249252
CodeModernizerSessionState.getInstance(project).currentJobStopTime = Instant.MIN
250253
}
251254

252-
private fun notifyJobFailure(failureReason: String?) {
255+
private fun notifyJobFailure(failureReason: String?, actions: Collection<AnAction> = listOf()) {
253256
val reason = failureReason ?: message("codemodernizer.notification.info.modernize_failed.unknown_failure_reason") // should not happen
254257
notifyStickyInfo(
255258
message("codemodernizer.notification.info.modernize_failed.title"),
256259
reason,
257260
project,
258-
listOf(displayFeedbackNotificationAction())
261+
listOf(displayFeedbackNotificationAction(), *actions.toTypedArray())
259262
)
260263
}
261264

@@ -301,6 +304,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
301304
}
302305

303306
fun resumeJob(session: CodeModernizerSession, lastJobId: JobId, currentJobResult: TransformationJob) = projectCoroutineScope(project).launch {
307+
isJobSuccessfullyResumed.set(true)
308+
CodeTransformMessageListener.instance.onTransformResuming()
304309
if (isModernizationJobActive()) {
305310
runInEdt { getBottomToolWindow().show() }
306311
return@launch
@@ -340,6 +345,8 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
340345
managerState.flags[StateFlags.IS_ONGOING] = false
341346
}
342347

348+
fun isJobOngoingInState() = managerState.flags.getOrDefault(StateFlags.IS_ONGOING, false)
349+
343350
fun handleLocalMavenBuildResult(mavenCopyCommandsResult: MavenCopyCommandsResult) {
344351
codeTransformationSession?.setLastMvnBuildResult(mavenCopyCommandsResult)
345352
// Send IDE notifications first
@@ -467,6 +474,9 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
467474
}
468475
}
469476

477+
/**
478+
* Silently try to resume the job, informs users only when job successfully resumed, suppresses exceptions.
479+
*/
470480
fun tryResumeJob(onProjectFirstOpen: Boolean = false) = projectCoroutineScope(project).launch {
471481
try {
472482
val notYetResumed = isResumingJob.compareAndSet(false, true)
@@ -492,40 +502,16 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
492502
val result = session.getJobDetails(lastJobId)
493503
when (result.status()) {
494504
TransformationStatus.COMPLETED -> {
495-
CodeTransformMessageListener.instance.onTransformResuming()
496-
notifyStickyInfo(
497-
message("codemodernizer.manager.job_finished_title"),
498-
message("codemodernizer.manager.job_finished_content"),
499-
project,
500-
listOf(
501-
displayDiffNotificationAction(lastJobId),
502-
displaySummaryNotificationAction(lastJobId),
503-
viewTransformationHubAction()
504-
)
505-
)
506505
resumeJob(session, lastJobId, result)
507506
setJobNotOngoing()
508507
}
509508

510509
TransformationStatus.PARTIALLY_COMPLETED -> {
511-
CodeTransformMessageListener.instance.onTransformResuming()
512-
notifyStickyInfo(
513-
message("codemodernizer.notification.info.modernize_failed.title"),
514-
message("codemodernizer.manager.job_failed_content", result.reason()),
515-
project,
516-
listOf(
517-
displayDiffNotificationAction(lastJobId),
518-
displaySummaryNotificationAction(lastJobId),
519-
displayFeedbackNotificationAction(),
520-
viewTransformationHubAction()
521-
)
522-
)
523510
resumeJob(session, lastJobId, result)
524511
setJobNotOngoing()
525512
}
526513

527514
TransformationStatus.UNKNOWN_TO_SDK_VERSION -> {
528-
CodeTransformMessageListener.instance.onTransformResuming()
529515
notifyStickyInfo(
530516
message("codemodernizer.notification.warn.on_resume.unknown_status_response.title"),
531517
message("codemodernizer.notification.warn.on_resume.unknown_status_response.content"),
@@ -534,13 +520,11 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
534520
}
535521

536522
TransformationStatus.STOPPED, TransformationStatus.STOPPING -> {
537-
CodeTransformMessageListener.instance.onTransformResuming()
523+
// If user stopped the last job, there is no need for us to resume the job
538524
setJobNotOngoing()
539525
}
540526

541527
else -> {
542-
isJobSuccessfullyResumed.set(true)
543-
CodeTransformMessageListener.instance.onTransformResuming()
544528
resumeJob(session, lastJobId, result)
545529
notifyStickyInfo(
546530
message("codemodernizer.manager.job_ongoing_title"),
@@ -561,10 +545,6 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
561545
}
562546
}
563547

564-
private fun viewTransformationHubAction() = NotificationAction.createSimple(message("codemodernizer.notification.info.modernize_complete.view_summary")) {
565-
getBottomToolWindow().show()
566-
}
567-
568548
private fun resumeJobNotificationAction(session: CodeModernizerSession, lastJobId: JobId, currentJobResult: TransformationJob) =
569549
NotificationAction.createSimple(message("codemodernizer.notification.info.modernize_ongoing.view_status")) {
570550
resumeJob(session, lastJobId, currentJobResult)
@@ -593,9 +573,24 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
593573
result.failureReason
594574
)
595575

596-
is CodeModernizerJobCompletedResult.ZipUploadFailed -> notifyJobFailure(
597-
message("codemodernizer.notification.warn.upload_failed", result.failureReason.toString()),
598-
)
576+
is CodeModernizerJobCompletedResult.ZipUploadFailed -> {
577+
if (result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
578+
setJobNotOngoing()
579+
CodeTransformMessageListener.instance.onCheckAuth()
580+
notifyJobFailure(
581+
message("codemodernizer.notification.warn.upload_failed_expired_credentials.content"),
582+
listOf(
583+
NotificationAction.createSimpleExpiring(message("codemodernizer.notification.warn.action.reauthenticate")) {
584+
CodeTransformMessageListener.instance.onReauthStarted()
585+
}
586+
)
587+
)
588+
} else {
589+
notifyJobFailure(
590+
message("codemodernizer.notification.warn.upload_failed", result.failureReason.toString()),
591+
)
592+
}
593+
}
599594

600595
is CodeModernizerJobCompletedResult.RetryableFailure -> notifyJobFailure(
601596
result.failureReason
@@ -902,4 +897,17 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo
902897

903898
return true
904899
}
900+
901+
/**
902+
* When customer attempts to download an artifact and it fails for some reason (credential expiry etc)
903+
* we need to be able to resume the job in order for customers to be able to reattempt the download.
904+
* This sets the job as ongoing in the persistent state so that when tryResumeJob is triggered the
905+
* IDE attempts to resume the job.
906+
*/
907+
fun handleResumableDownloadArtifactFailure(job: JobId) {
908+
// handle the case when user clicks long living notification but has a new job running
909+
val session = this.codeTransformationSession ?: return
910+
if (session.getActiveJobId() != job) return
911+
setJobOngoing(job, session.sessionContext)
912+
}
905913
}

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Transformation
1919
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationStatus
2020
import software.amazon.awssdk.services.codewhispererruntime.model.TransformationUserActionStatus
2121
import software.amazon.awssdk.services.codewhispererstreaming.model.TransformationDownloadArtifactType
22+
import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
2223
import software.aws.toolkits.core.utils.error
2324
import software.aws.toolkits.core.utils.exists
2425
import software.aws.toolkits.core.utils.getLogger
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModerni
3132
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerSessionContext
3233
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeModernizerStartJobResult
3334
import software.aws.toolkits.jetbrains.services.codemodernizer.model.CodeTransformHilDownloadArtifact
35+
import software.aws.toolkits.jetbrains.services.codemodernizer.model.DownloadArtifactResult
3436
import software.aws.toolkits.jetbrains.services.codemodernizer.model.JobId
3537
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenCopyCommandsResult
3638
import software.aws.toolkits.jetbrains.services.codemodernizer.model.MavenDependencyReportCommandsResult
@@ -42,6 +44,7 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_AFTE
4244
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.STATES_AFTER_STARTED
4345
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getModuleOrProjectNameForFile
4446
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.getPathToHilDependencyReportDir
47+
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isValidCodeTransformConnection
4548
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.pollTransformationStatusAndPlan
4649
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toTransformationLanguage
4750
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanSession
@@ -146,6 +149,10 @@ class CodeModernizerSession(
146149
val payload: File?
147150

148151
// Generate zip file
152+
if (!isValidCodeTransformConnection(sessionContext.project)) {
153+
// Creating zip can take some time, so quit early
154+
return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.CREDENTIALS_EXPIRED)
155+
}
149156
try {
150157
if (isDisposed.get()) {
151158
LOG.warn { "Disposed when about to create zip to upload" }
@@ -181,6 +188,9 @@ class CodeModernizerSession(
181188
}
182189

183190
// Create upload url and upload zip
191+
if (!isValidCodeTransformConnection(sessionContext.project)) {
192+
return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.CREDENTIALS_EXPIRED)
193+
}
184194
var uploadId = ""
185195
try {
186196
if (shouldStop.get()) {
@@ -218,6 +228,10 @@ class CodeModernizerSession(
218228
state.currentJobStatus = TransformationStatus.FAILED
219229
return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.OTHER(e.localizedMessage.toString()))
220230
}
231+
} catch (e: SsoOidcException) {
232+
state.putJobHistory(sessionContext, TransformationStatus.FAILED)
233+
state.currentJobStatus = TransformationStatus.FAILED
234+
return CodeModernizerStartJobResult.ZipUploadFailed(UploadFailureReason.CREDENTIALS_EXPIRED)
221235
} catch (e: SdkClientException) {
222236
// Errors from code whisperer client will always be thrown as SdkClientException
223237
state.putJobHistory(sessionContext, TransformationStatus.FAILED)
@@ -486,7 +500,7 @@ class CodeModernizerSession(
486500
// This is a short term solution to check if build log is available by attempting to download it.
487501
// In the long term, we should check if build log is available from transformation metadata.
488502
val downloadArtifactResult = artifactHandler.downloadArtifact(jobId, TransformationDownloadArtifactType.LOGS, true)
489-
if (downloadArtifactResult.artifact != null) {
503+
if (downloadArtifactResult is DownloadArtifactResult.Success) {
490504
val failureReason = result.jobDetails?.reason() ?: message("codemodernizer.notification.warn.maven_failed.content")
491505
return CodeModernizerJobCompletedResult.JobFailedInitialBuild(jobId, failureReason, true)
492506
} else {

0 commit comments

Comments
 (0)