Merge main into feature/cw-proactive-scan

Author: aws-toolkit-automation

.changes/next-release/feature-7af4897f-efe2-4b02-b029-f1e9042b1b64.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Connection id is now shown beside CodeCatalyst dropdown"
+}

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManager.kt

@@ -224,7 +224,7 @@ class DefaultToolkitAuthManager : ToolkitAuthManager, PersistentStateComponent<T
         }
 
         is DetectedDiskSsoSessionProfile -> DetectedDiskSsoSessionConnection(
-            sessionProfileName = profile.profileName,
+            sessionName = profile.profileName,
             startUrl = profile.startUrl,
             region = profile.ssoRegion,
             scopes = profile.scopes

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt

@@ -41,6 +41,7 @@ interface AwsCredentialConnection : ToolkitConnection {
 }
 
 interface AwsBearerTokenConnection : ToolkitConnection {
+    val sessionName: String
     val startUrl: String
     val region: String
     val scopes: List<String>

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt

@@ -24,6 +24,7 @@ class ProfileSsoManagedBearerSsoConnection(
     scopes: List<String>,
     cache: DiskCache = diskCache,
 ) : ManagedBearerSsoConnection(
+    configSessionName,
     startUrl,
     region,
     scopes,
@@ -41,6 +42,7 @@ class LegacyManagedBearerSsoConnection(
     scopes: List<String>,
     cache: DiskCache = diskCache,
 ) : ManagedBearerSsoConnection(
+    "",
     startUrl,
     region,
     scopes,
@@ -50,6 +52,7 @@ class LegacyManagedBearerSsoConnection(
 )
 
 sealed class ManagedBearerSsoConnection(
+    override val sessionName: String,
     override val startUrl: String,
     override val region: String,
     override val scopes: List<String>,
@@ -78,19 +81,19 @@ sealed class ManagedBearerSsoConnection(
 }
 
 class DetectedDiskSsoSessionConnection(
-    val sessionProfileName: String,
+    override val sessionName: String,
     override val startUrl: String,
     override val region: String,
     override val scopes: List<String>,
     displayNameOverride: String? = null
 ) : AwsBearerTokenConnection, Disposable {
-    override val id = ToolkitBearerTokenProvider.diskSessionIdentifier(sessionProfileName)
-    override val label = displayNameOverride ?: ToolkitBearerTokenProvider.diskSessionDisplayName(sessionProfileName)
+    override val id = ToolkitBearerTokenProvider.diskSessionIdentifier(sessionName)
+    override val label = displayNameOverride ?: ToolkitBearerTokenProvider.diskSessionDisplayName(sessionName)
 
     private val provider =
         tokenConnection(
             ProfileSdkTokenProviderWrapper(
-                sessionName = sessionProfileName,
+                sessionName = sessionName,
                 region = region
             ),
             region

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

@@ -75,6 +75,7 @@ class DefaultToolkitAuthManagerTest {
 
         assertThat(connection).isInstanceOf<ManagedBearerSsoConnection>()
         connection as ManagedBearerSsoConnection
+        assertThat(connection.sessionName).isEqualTo("")
         assertThat(connection.region).isEqualTo(profile.ssoRegion)
         assertThat(connection.startUrl).isEqualTo(profile.startUrl)
         assertThat(connection.scopes).isEqualTo(profile.scopes)
@@ -111,6 +112,7 @@ class DefaultToolkitAuthManagerTest {
 
         assertThat(sut.listConnections()).singleElement().satisfies {
             assertThat(it).isInstanceOfSatisfying<ManagedBearerSsoConnection> { connection ->
+                assertThat(connection.sessionName).isEqualTo("")
                 assertThat(connection.region).isEqualTo(profile.ssoRegion)
                 assertThat(connection.startUrl).isEqualTo(profile.startUrl)
                 assertThat(connection.scopes).isEqualTo(profile.scopes)
@@ -138,6 +140,7 @@ class DefaultToolkitAuthManagerTest {
 
         assertThat(sut.listConnections()).singleElement().satisfies {
             assertThat(it).isInstanceOfSatisfying<ManagedBearerSsoConnection> { connection ->
+                assertThat(connection.sessionName).isEqualTo("")
                 assertThat(connection.region).isEqualTo(profile.ssoRegion)
                 assertThat(connection.startUrl).isEqualTo(profile.startUrl)
                 assertThat(connection.scopes).isEqualTo(profile.scopes)
@@ -163,6 +166,7 @@ class DefaultToolkitAuthManagerTest {
 
         assertThat(sut.listConnections()).singleElement().satisfies {
             assertThat(it).isInstanceOfSatisfying<ManagedBearerSsoConnection> { connection ->
+                assertThat(connection.sessionName).isEqualTo("add")
                 assertThat(connection.region).isEqualTo("us-east-1")
                 assertThat(connection.startUrl).isEqualTo("startUrl")
                 assertThat(connection.scopes).isEqualTo(scopes)
@@ -180,6 +184,7 @@ class DefaultToolkitAuthManagerTest {
 
         assertThat(sut.listConnections()).singleElement().satisfies {
             assertThat(it).isInstanceOfSatisfying<ManagedBearerSsoConnection> { connection ->
+                assertThat(connection.sessionName).isEqualTo("add")
                 assertThat(connection.region).isEqualTo("us-east-1")
                 assertThat(connection.startUrl).isEqualTo("startUrl2")
                 assertThat(connection.scopes).isEqualTo(scopes)

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/nodes/CawsRootNode.kt

@@ -45,16 +45,21 @@ class CawsRootNode(private val nodeProject: Project) : AbstractTreeNode<String>(
             is ActiveConnection.ValidBearer -> {
                 when (connection.connectionType) {
                     ActiveConnectionType.BUILDER_ID -> message("caws.connected.builder_id")
-                    else -> message("caws.connected.identity_center")
+                    else -> message(
+                        "caws.connected.identity_center",
+                        connection.activeConnectionBearer?.let { "(${it.sessionName})" }.orEmpty()
+                    )
                 }
             }
+
             is ActiveConnection.NotConnected -> null
             else -> message("caws.expired.connection")
         }
         presentation.addText(connectionText, SimpleTextAttributes.GRAY_ATTRIBUTES)
     }
 
     override fun feature() = CodeCatalystConnection.getInstance()
+
     companion object {
         const val CAWS_SIGNED_IN_ACTION_GROUP = "aws.caws.devtools.actions.loggedin"
         const val CAWS_SIGNED_OUT_ACTION_GROUP = "aws.caws.devtools.actions.loggedout"

plugins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -276,7 +276,7 @@ caws.configure_workspace_tab_save_button=Save and restart
 caws.configure_workspace_tab_title=Configure Dev Environment
 caws.configure_workspace_title=Configure Dev Environment: {0} in {1}
 caws.connected.builder_id=\   AWS Builder ID Connected
-caws.connected.identity_center=\   IAM Identity Center Connected
+caws.connected.identity_center=\   IAM Identity Center Connected {0}
 caws.connecting.checking=Checking state of Dev Environment
 caws.connecting.in_progress=Connecting to Dev Environment
 caws.connecting.waiting_for_environment=Launching Dev Environment (This may take a few minutes)