exceptions

Author: samgst-amazon

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

@@ -3,14 +3,14 @@
 
 package software.aws.toolkits.jetbrains.core.credentials
 
-import com.intellij.ide.util.PropertiesComponent
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.service
 import com.intellij.openapi.extensions.ExtensionPointName
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
 import migration.software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import org.jetbrains.annotations.VisibleForTesting
+import software.amazon.awssdk.core.exception.SdkClientException
 import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
 import software.aws.toolkits.core.ClientConnectionSettings
 import software.aws.toolkits.core.ConnectionSettings
@@ -341,7 +341,7 @@ fun maybeReauthProviderIfNeeded(
                         onReauthRequired(e)
                         return true
                     }
-                    e is UnknownHostException || e is RuntimeException -> {
+                    e is UnknownHostException || e is SdkClientException -> {
                         getLogger<ToolkitAuthManager>().warn(e) { "Failed to refresh token" }
                         if (hasSeenFirstNetworkError.compareAndSet(false, true)) {
                             notifyInfo(
@@ -350,7 +350,7 @@ fun maybeReauthProviderIfNeeded(
                                 project
                             )
                         }
-                        return false
+                        return false// throw here?
                     }
                     else -> { return false }
                 }

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

@@ -31,6 +31,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.AwsCoreBundle.message
+import java.net.UnknownHostException
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 
@@ -60,7 +61,7 @@ class ToolkitAuthManagerTest {
     @Test
     fun `test NEEDS_REFRESH state with network error - first occurrence`() {
         whenever(tokenProvider.state()).thenReturn(BearerTokenAuthState.NEEDS_REFRESH)
-        doThrow(RuntimeException("Unable to execute HTTP request"))
+        doThrow(UnknownHostException("Unable to execute HTTP request"))
             .whenever(tokenProvider)
             .resolveToken()
 
@@ -84,7 +85,7 @@ class ToolkitAuthManagerTest {
     @Test
     fun `test NEEDS_REFRESH state with network error - subsequent occurrence`() {
         whenever(tokenProvider.state()).thenReturn(BearerTokenAuthState.NEEDS_REFRESH)
-        doThrow(RuntimeException("Unable to execute HTTP request"))
+        doThrow(UnknownHostException("Unable to execute HTTP request"))
             .`when`(tokenProvider)
             .resolveToken()
 
@@ -118,7 +119,7 @@ class ToolkitAuthManagerTest {
         whenever(tokenProvider.state()).thenReturn(BearerTokenAuthState.NEEDS_REFRESH)
 
         // First trigger a network error
-        doThrow(RuntimeException("Unable to execute HTTP request"))
+        doThrow(UnknownHostException("Unable to execute HTTP request"))
             .`when`(tokenProvider)
             .resolveToken()
 
@@ -150,7 +151,7 @@ class ToolkitAuthManagerTest {
         reset(tokenProvider)
         // Now trigger another network error - should show notification again
         whenever(tokenProvider.state()).thenReturn(BearerTokenAuthState.NEEDS_REFRESH)
-        doThrow(RuntimeException("Unable to execute HTTP request"))
+        doThrow(UnknownHostException("Unable to execute HTTP request"))
             .`when`(tokenProvider)
             .resolveToken()
         maybeReauthProviderIfNeeded(