fix CI issues for 242-251

Author: samgst-amazon

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -75,7 +75,8 @@ object IdeVersions {
                 marketplacePlugins = listOf(
                     "org.toml.lang:243.21565.122",
                     "PythonCore:243.21565.211",
-                    "Docker:243.21565.204"
+                    "Docker:243.21565.204",
+                    "com.intellij.modules.json:243.26574.91"
                 )
             ),
             ultimate = ProductProfile(
@@ -90,6 +91,7 @@ object IdeVersions {
                     "org.toml.lang:243.21565.122",
                     "Pythonid:243.21565.211",
                     "org.jetbrains.plugins.go:243.21565.211",
+                    "com.intellij.modules.json:243.26574.91"
                 )
             ),
             rider = RiderProfile(
@@ -115,7 +117,8 @@ object IdeVersions {
                 ),
                 marketplacePlugins = listOf(
                     "PythonCore:251.23774.460",
-                    "Docker:251.23774.466"
+                    "Docker:251.23774.466",
+                    "com.intellij.modules.json:251.27812.12"
                 )
             ),
             ultimate = ProductProfile(
@@ -129,6 +132,7 @@ object IdeVersions {
                 marketplacePlugins = listOf(
                     "Pythonid:251.23774.460",
                     "org.jetbrains.plugins.go:251.23774.435",
+                    "com.intellij.modules.json:251.27812.12"
                 )
             ),
             rider = RiderProfile(

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/AwsResourceCacheTest.kt

@@ -9,7 +9,7 @@ import com.intellij.testFramework.RuleChain
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runBlockingTest
+import kotlinx.coroutines.test.runTest
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Before
@@ -484,7 +484,7 @@ class AwsResourceCacheTest {
         whenever(mockResource.fetch(any())).then {
             latch.await()
             // exception gets thrown fast enough where the second fetchIfNeeded check occurs after the first call throws
-            runBlockingTest {
+            runTest {
                 delay(500)
             }
             throw RuntimeException("Boom")

plugins/toolkit/jetbrains-gateway/build.gradle.kts

@@ -7,7 +7,6 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import org.jetbrains.kotlin.gradle.internal.ensureParentDirsCreated
 import software.aws.toolkits.gradle.intellij.IdeFlavor
-import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
 import kotlin.io.encoding.Base64
 
 plugins {

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt

@@ -52,16 +52,18 @@ class StartBackend(
                 LinkedClientManager.getInstance().startNewClient(
                     lifetime,
                     localLink,
-                    URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)
-                ) {
-                    CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
-                        project = null,
-                        userId = lazilyGetUserId(),
-                        result = TelemetryResult.Succeeded,
-                        duration = System.currentTimeMillis() - start.toDouble(),
-                        codecatalystDevEnvironmentWorkflowStep = "startThinClient",
-                    )
-                }
+                    URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8),
+                    onStarted = {
+                        CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
+                            project = null,
+                            userId = lazilyGetUserId(),
+                            result = TelemetryResult.Succeeded,
+                            duration = System.currentTimeMillis() - start.toDouble(),
+                            codecatalystDevEnvironmentWorkflowStep = "startThinClient",
+                        )
+                    },
+                    enableBeforeRunHooks = true
+                )
             } catch (e: Throwable) {
                 CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
                     project = null,