Skip to content

Commit 8c81830

Browse files
committed
fix(amazonq): handle scenario where user does not have access to all q endpoints
1 parent bdaa99f commit 8c81830

File tree

1 file changed

+16
-3
lines changed
  • plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile

1 file changed

+16
-3
lines changed

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ package software.aws.toolkits.jetbrains.services.amazonq.profile
55

66
import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
77
import software.aws.toolkits.core.ClientConnectionSettings
8+
import software.aws.toolkits.core.utils.debug
9+
import software.aws.toolkits.core.utils.getLogger
10+
import software.aws.toolkits.core.utils.warn
811
import software.aws.toolkits.jetbrains.core.AwsClientManager
912
import software.aws.toolkits.jetbrains.core.Resource
1013
import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
@@ -27,13 +30,23 @@ object QProfileResources {
2730
.getInstance()
2831
.getClient(CodeWhispererRuntimeClient::class, connectionSettings.withRegion(awsRegion))
2932

30-
client.listAvailableProfilesPaginator {}
31-
.profiles()
32-
.map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName() ?: "<no name>") }
33+
try {
34+
val profiles = client.listAvailableProfilesPaginator {}
35+
.profiles()
36+
.map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName() ?: "<no name>") }
37+
LOG.debug { "Found profiles for region $regionKey : $profiles" }
38+
39+
profiles
40+
} catch (e: Exception) {
41+
LOG.warn(e) { "Failed to list Q profiles for region $regionKey" }
42+
emptyList()
43+
}
3344
}
3445
return mappedProfiles
3546
}
3647

3748
override fun expiry(): Duration = Duration.ofSeconds(60)
3849
}
50+
51+
private val LOG = getLogger<QProfileResources>()
3952
}

0 commit comments

Comments
 (0)