lint

Author: rli

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/QRegionProfileManagerTest.kt

@@ -15,7 +15,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
@@ -201,10 +200,14 @@ class QRegionProfileManagerTest {
             this.connectionIdToActiveProfile[activeConn.id] = fooProfile
             this.connectionIdToActiveProfile[anotherConn.id] = barProfile
         }
-        resourceCache.addEntry(activeConn.getConnectionSettings(), QProfileResources.LIST_REGION_PROFILES, listOf(
-            QRegionProfile("foo", "foo-arn-v2"),
-            QRegionProfile("bar", "bar-arn"),
-        ))
+        resourceCache.addEntry(
+            activeConn.getConnectionSettings(),
+            QProfileResources.LIST_REGION_PROFILES,
+            listOf(
+                QRegionProfile("foo", "foo-arn-v2"),
+                QRegionProfile("bar", "bar-arn"),
+            )
+        )
 
         sut.loadState(state)
         assertThat(sut.activeProfile(project)).isEqualTo(fooProfile)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

@@ -16,6 +16,7 @@ import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.xmlb.annotations.MapAnnotation
 import com.intellij.util.xmlb.annotations.Property
 import software.amazon.awssdk.core.SdkClient
+import software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedException
 import software.aws.toolkits.core.TokenConnectionSettings
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -68,14 +69,19 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
         val selected = activeProfile(project) ?: return
         val profiles = try {
             listRegionProfiles(project)
-        } catch (_: Exception) {
-            // if we can't list profiles assume it is valid
-            LOG.warn { "Continuing with $selected since listAvailableProfiles failed" }
-            return
+        } catch (e: Exception) {
+            if (e is AccessDeniedException) {
+                null
+            } else {
+                // if we can't list profiles assume it is valid
+                LOG.warn { "Continuing with $selected since listAvailableProfiles failed" }
+                return
+            }
         }
 
         // succeeded in listing profiles, but none match selected
-        if (profiles?.none { it.arn == selected.arn } == true) {
+        // profiles should be null if access denied or connection is not IdC
+        if (profiles == null || profiles.none { it.arn == selected.arn }) {
             invalidateProfile(selected.arn)
             switchProfile(project, null, intent = QProfileSwitchIntent.Reload)
             Telemetry.amazonq.profileState.use { span ->