Add regression test for EDT freeze when Q creds are expired

rli · rli · commit c0865ba4cf88 · 2024-09-19T11:26:36.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .gradle
 .intellijPlatform
+.kotlin
 out/
 target/
 .idea
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -34,8 +34,6 @@ dependencies {
     testImplementation(libs.junit4)
     testImplementation(libs.bundles.mockito)
     testImplementation(gradleTestKit())
-
-    testRuntimeOnly(libs.junit5.jupiterVintage)
 }
 
 tasks.test {
diff --git a/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-publishing-conventions.gradle.kts
@@ -66,3 +66,8 @@ tasks.verifyPlugin {
     // give each instance its own home dir
     systemProperty("plugin.verifier.home.dir", temporaryDir)
 }
+
+val pluginZip by configurations.creating
+artifacts {
+    add("pluginZip", tasks.buildPlugin)
+}
diff --git a/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts b/buildSrc/src/main/kotlin/toolkit-testing.gradle.kts
@@ -20,10 +20,9 @@ dependencies {
 
     // Everything uses junit4/5 except rider, which uses TestNG
     testFixturesApi(platform(versionCatalog.findLibrary("junit5-bom").get()))
-    testFixturesApi(versionCatalog.findLibrary("junit5-jupiterApi").get())
-    testFixturesApi(versionCatalog.findLibrary("junit5-jupiterParams").get())
+    testFixturesApi(versionCatalog.findLibrary("junit5-jupiter").get())
 
-    testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterEngine").get())
+    testRuntimeOnly(versionCatalog.findLibrary("junit-platform-launcher").get())
     testRuntimeOnly(versionCatalog.findLibrary("junit5-jupiterVintage").get())
 }
 
diff --git a/buildspec/linuxUiTests.yml b/buildspec/linuxUiTests.yml
@@ -45,10 +45,9 @@ phases:
         credential_source=EcsContainer"
         
       - chmod +x gradlew
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :sandbox-all:prepareTestIdeUiSandbox --console plain --info
 
       - ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:boxcolor=black@0.75:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
-      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME uiTestCore coverageReport --console plain --info
+      - ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
 
   post_build:
     commands:
diff --git a/detekt-rules/build.gradle.kts b/detekt-rules/build.gradle.kts
@@ -15,7 +15,6 @@ dependencies {
 
     // only used to make test work
     testRuntimeOnly(libs.slf4j.api)
-    testRuntimeOnly(libs.junit5.jupiterVintage)
 }
 
 tasks.test {
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ toolkitVersion=3.29-SNAPSHOT
 publishToken=
 publishChannel=
 
-ideProfileName=2024.1
+ideProfileName=2024.2
 
 remoteRobotPort=8080
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -87,11 +87,13 @@ jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xm
 jackson-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
 jacoco = { module = "org.jacoco:org.jacoco.core", version.ref = "jacoco" }
 jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
+
+# platfom launcher version selected by BOM
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+
 junit4 = { module = "junit:junit", version.ref = "junit4" }
 junit5-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
-junit5-jupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
-junit5-jupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
-junit5-jupiterParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
+junit5-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
 junit5-jupiterVintage = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutines" }
 kotlin-coroutinesDebug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kotlinCoroutines" }
diff --git a/plugins/core/core/build.gradle.kts b/plugins/core/core/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     implementation(libs.commonmark)
     testImplementation(libs.junit4)
 
-    testRuntimeOnly(libs.junit5.jupiterVintage)
     testRuntimeOnly(project(":plugin-core:resources"))
     testRuntimeOnly(project(":plugin-core:sdk-codegen"))
 }
diff --git a/plugins/core/jetbrains-community/resources/META-INF/aws.toolkit.core.xml b/plugins/core/jetbrains-community/resources/META-INF/aws.toolkit.core.xml
@@ -85,6 +85,7 @@
 
     <actions resource-bundle="software.aws.toolkits.resources.MessagesBundle">
         <action id="aws.toolkit.open.telemetry.viewer" class="software.aws.toolkits.jetbrains.services.telemetry.OpenTelemetryAction"/>
+        <action id="aws.toolkit.open.bearertoken.debug" class="BearerTokenDebug"/>
 
         <action class="software.aws.toolkits.jetbrains.core.credentials.CreateOrUpdateCredentialProfilesAction" id="aws.settings.upsertCredentials"/>
 
diff --git a/plugins/core/jetbrains-community/src/BearerTokenDebug.kt b/plugins/core/jetbrains-community/src/BearerTokenDebug.kt
@@ -0,0 +1,145 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.observable.properties.PropertyGraph
+import com.intellij.openapi.observable.util.transform
+import com.intellij.openapi.project.DumbAwareAction
+import com.intellij.openapi.ui.FrameWrapper
+import com.intellij.ui.SimpleListCellRenderer
+import com.intellij.ui.dsl.builder.bindItem
+import com.intellij.ui.dsl.builder.panel
+import com.intellij.util.text.DateFormatUtil
+import software.aws.toolkits.core.TokenConnectionSettings
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitAuthManager
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
+import software.aws.toolkits.jetbrains.core.credentials.sso.DeviceAuthorizationGrantToken
+import software.aws.toolkits.jetbrains.core.credentials.sso.PKCEAuthorizationGrantToken
+import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
+import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
+import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
+import software.aws.toolkits.jetbrains.isDeveloperMode
+import java.time.Instant
+
+class BearerTokenDebug : DumbAwareAction("BearerTokenDebug") {
+    override fun actionPerformed(event: AnActionEvent) {
+        BearerTokenDebugDebug().show()
+    }
+
+    override fun getActionUpdateThread() = ActionUpdateThread.BGT
+
+    override fun update(e: AnActionEvent) {
+        e.presentation.isEnabledAndVisible = isDeveloperMode()
+    }
+
+    private class BearerTokenDebugDebug : FrameWrapper(null), BearerTokenProviderListener {
+        private val graph = PropertyGraph()
+        private val connection = graph.property<ToolkitConnection?>(null)
+
+        init {
+            component = createContent()
+
+            ApplicationManager.getApplication().messageBus
+                .connect(this)
+                .subscribe(BearerTokenProviderListener.TOPIC, this)
+        }
+
+        override fun onChange(providerId: String, newScopes: List<String>?) {
+            redraw()
+        }
+
+        override fun invalidate(providerId: String) {
+            redraw()
+        }
+
+        private fun createContent() = panel {
+            row {
+                comboBox(
+                    ToolkitAuthManager.getInstance().listConnections() as List<ToolkitConnection?>,
+                    SimpleListCellRenderer.create("null") { it?.id }
+                )
+                    .bindItem(connection)
+            }
+
+            row {
+                text("Type")
+                text("")
+                    .applyToComponent {
+                        connection.afterChange {
+                            this.text = it?.let { it.getConnectionSettings()::class.java.simpleName } ?: "null"
+                        }
+                    }
+            }
+
+            row {
+                text("Expires at")
+                text("")
+                    .applyToComponent {
+                        connection.afterChange {
+                            val expiresAt = it?.tokenProvider()?.currentToken()?.expiresAt ?: run {
+                                this.text = "null"
+                                return@afterChange
+                            }
+
+                            this.text = DateFormatUtil.formatTime(expiresAt.toEpochMilli())
+                        }
+                    }
+            }
+
+            row("Force expire") {
+                button("Refresh Token") {
+                    val provider = (connection.get().tokenProvider() as InteractiveBearerTokenProvider)
+                    provider.lastToken.getAndUpdate {
+                        when (it) {
+                            null -> null
+                            is DeviceAuthorizationGrantToken -> it.copy(refreshToken = "INVALID_FOR_TESTING", expiresAt = Instant.MIN)
+                            is PKCEAuthorizationGrantToken -> it.copy(refreshToken = "INVALID_FOR_TESTING", expiresAt = Instant.MIN)
+                        }
+                    }
+                }
+
+                button("Access Token") {
+                    val provider = (connection.get().tokenProvider() as InteractiveBearerTokenProvider)
+                    provider.lastToken.getAndUpdate {
+                        when (it) {
+                            null -> null
+                            is DeviceAuthorizationGrantToken -> it.copy(accessToken = "INVALID_FOR_TESTING", expiresAt = Instant.MIN)
+                            is PKCEAuthorizationGrantToken -> it.copy(accessToken = "INVALID_FOR_TESTING", expiresAt = Instant.MIN)
+                        }
+                    }
+                }
+
+                button("Both") {
+                    val provider = (connection.get().tokenProvider() as InteractiveBearerTokenProvider)
+                    provider.lastToken.getAndUpdate {
+                        when (it) {
+                            null -> null
+                            is DeviceAuthorizationGrantToken -> it.copy(
+                                accessToken = "INVALID_FOR_TESTING",
+                                refreshToken = "INVALID_FOR_TESTING",
+                                expiresAt = Instant.MIN
+                            )
+                            is PKCEAuthorizationGrantToken -> it.copy(
+                                accessToken = "INVALID_FOR_TESTING",
+                                refreshToken = "INVALID_FOR_TESTING",
+                                expiresAt = Instant.MIN
+                            )
+                        }
+                    }
+                }
+
+                button("Both and fire message bus") {
+                    val provider = (connection.get().tokenProvider() as InteractiveBearerTokenProvider).invalidate()
+                }
+            }.visibleIf(connection.transform { it.tokenProvider() is InteractiveBearerTokenProvider })
+        }
+
+        private fun ToolkitConnection?.tokenProvider() = (this?.getConnectionSettings() as? TokenConnectionSettings)?.tokenProvider?.delegate as? BearerTokenProvider
+
+        private fun redraw() {
+            component = createContent()
+        }
+    }
+}
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt
@@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.core.credentials.sso.bearer
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.util.containers.orNull
+import org.jetbrains.annotations.ApiStatus.Internal
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider
 import software.amazon.awssdk.auth.token.credentials.SdkToken
 import software.amazon.awssdk.auth.token.credentials.SdkTokenProvider
@@ -48,6 +49,9 @@ interface BearerTokenProvider : SdkTokenProvider, SdkAutoCloseable, ToolkitBeare
      */
     fun currentToken(): AccessToken?
 
+    /**
+     * Not meant to be invoked outside the implementation
+     */
     fun refresh(): AccessToken
 
     /**
@@ -58,13 +62,13 @@ interface BearerTokenProvider : SdkTokenProvider, SdkAutoCloseable, ToolkitBeare
     /**
      * Request provider to interactively request user input to obtain a new [AccessToken]
      */
-    open fun reauthenticate() {
+    fun reauthenticate() {
         throw UnsupportedOperationException("Provider is not interactive and cannot reauthenticate")
     }
 
-    open fun supportsLogout() = this is BearerTokenLogoutSupport
+    fun supportsLogout() = this is BearerTokenLogoutSupport
 
-    open fun invalidate() {
+    fun invalidate() {
         throw UnsupportedOperationException("Provider is not interactive and cannot be invalidated")
     }
 
@@ -90,10 +94,9 @@ class InteractiveBearerTokenProvider(
     val startUrl: String,
     val region: String,
     val scopes: List<String>,
-    id: String,
+    override val id: String,
     cache: DiskCache = diskCache
 ) : BearerTokenProvider, BearerTokenLogoutSupport, Disposable {
-    override val id = id
     override val displayName = ToolkitBearerTokenProvider.ssoDisplayName(startUrl)
 
     private val ssoOidcClient: SsoOidcClient = buildUnmanagedSsoOidcClient(region)
@@ -107,7 +110,7 @@ class InteractiveBearerTokenProvider(
         )
 
     private val supplier = CachedSupplier.builder { refreshToken() }.prefetchStrategy(NonBlocking("AWS SSO bearer token refresher")).build()
-    private val lastToken = AtomicReference<AccessToken?>()
+    internal val lastToken = AtomicReference<AccessToken?>()
     val pendingAuthorization: PendingAuthorization?
         get() = accessTokenProvider.authorization
 
@@ -134,6 +137,7 @@ class InteractiveBearerTokenProvider(
         )
     }
 
+    // we need to seed CachedSupplier with an initial value, then subsequent calls need to hit the network
     private fun refreshToken(): RefreshResult<out SdkToken> {
         val lastToken = lastToken.get() ?: throw NoTokenInitializedException("Token refresh started before session initialized")
         val token = if (Duration.between(Instant.now(), lastToken.expiresAt) > Duration.ofMinutes(30)) {
@@ -148,6 +152,7 @@ class InteractiveBearerTokenProvider(
             .build()
     }
 
+    // how we expect consumers to obtain a token
     override fun resolveToken() = supplier.get()
 
     override fun close() {
@@ -159,6 +164,7 @@ class InteractiveBearerTokenProvider(
         close()
     }
 
+    // internal nonsense so we can query the token without triggering a refresh
     override fun currentToken() = lastToken.get()
 
     /**
@@ -189,7 +195,7 @@ class InteractiveBearerTokenProvider(
 
 class NoTokenInitializedException(message: String) : Exception(message)
 
-public enum class BearerTokenAuthState {
+enum class BearerTokenAuthState {
     AUTHORIZED,
     NEEDS_REFRESH,
     NOT_AUTHENTICATED
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
@@ -120,6 +120,7 @@ abstract class LoginBrowser(
     }
 
     protected val onPendingToken: (InteractiveBearerTokenProvider) -> Unit = { provider ->
+        provider.lastToken
         startBrowserOpenTimer(provider.startUrl, provider.region)
         projectCoroutineScope(project).launch {
             val authorization = pollForAuthorization(provider)
diff --git a/plugins/core/webview/src/q-ui/components/loginOptions.vue b/plugins/core/webview/src/q-ui/components/loginOptions.vue
@@ -37,7 +37,7 @@ export default defineComponent({
         login(type: LoginOption) {
             this.$emit('login', type)
         },
-        emitUiClickTelemetry(elementId: String) {
+        emitUiClickTelemetry(elementId: string) {
             this.$emit('emitUiClickTelemetry', elementId)
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -98,7 +98,10 @@ include("detekt-rules")
 include("ui-tests")
 include("sandbox-all")
 when (providers.gradleProperty("ideProfileName").get()) {
+    // FIX_WHEN_MIN_IS_242: `tmp-all` test module no longer needed in 242+
     "2023.3", "2024.1" -> include("tmp-all")
+    // available 242+
+    else -> include("ui-tests-starter")
 }
 
 /*
diff --git a/ui-tests-starter/.gitignore b/ui-tests-starter/.gitignore
@@ -0,0 +1 @@
+allure-results/
diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts
diff --git a/ui-tests-starter/tst/OfflineAmazonQInlineCompletionTest.kt b/ui-tests-starter/tst/OfflineAmazonQInlineCompletionTest.kt
diff --git a/ui-tests-starter/tstData/Hello/Example.java b/ui-tests-starter/tstData/Hello/Example.java
diff --git a/ui-tests-starter/tstData/config/options/aws.xml b/ui-tests-starter/tstData/config/options/aws.xml
diff --git a/ui-tests-starter/tstData/config/options/ide.general.xml b/ui-tests-starter/tstData/config/options/ide.general.xml
diff --git a/ui-tests-starter/tstData/config/options/proxy.settings.xml b/ui-tests-starter/tstData/config/options/proxy.settings.xml
diff --git a/ui-tests/build.gradle.kts b/ui-tests/build.gradle.kts

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 .gradle
 .intellijPlatform
 +.kotlin
 out/
 target/
 .idea
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ dependencies {`
`34`	`34`	`testImplementation(libs.junit4)`
`35`	`35`	`testImplementation(libs.bundles.mockito)`
`36`	`36`	`testImplementation(gradleTestKit())`
`37`		`-`
`38`		`- testRuntimeOnly(libs.junit5.jupiterVintage)`
`39`	`37`	`}`
`40`	`38`
`41`	`39`	`tasks.test {`
Original file line number	Diff line number	Diff line change
`@@ -66,3 +66,8 @@ tasks.verifyPlugin {`
`66`	`66`	`// give each instance its own home dir`
`67`	`67`	`systemProperty("plugin.verifier.home.dir", temporaryDir)`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+val pluginZip by configurations.creating`
	`71`	`+artifacts {`
	`72`	`+ add("pluginZip", tasks.buildPlugin)`
	`73`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ dependencies {`
`15`	`15`
`16`	`16`	`// only used to make test work`
`17`	`17`	`testRuntimeOnly(libs.slf4j.api)`
`18`		`- testRuntimeOnly(libs.junit5.jupiterVintage)`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`tasks.test {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ dependencies {`
`24`	`24`	`implementation(libs.commonmark)`
`25`	`25`	`testImplementation(libs.junit4)`
`26`	`26`
`27`		`- testRuntimeOnly(libs.junit5.jupiterVintage)`
`28`	`27`	`testRuntimeOnly(project(":plugin-core:resources"))`
`29`	`28`	`testRuntimeOnly(project(":plugin-core:sdk-codegen"))`
`30`	`29`	`}`