lazyLog

Author: samgst-amazon

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

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import software.aws.toolkits.core.utils.createParentDirectories
 import software.aws.toolkits.core.utils.deleteIfExists
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.inputStreamIfExists
 import software.aws.toolkits.core.utils.outputStream
 import software.aws.toolkits.core.utils.toHexString
@@ -95,16 +96,16 @@ class DiskCache(
         }
 
     override fun invalidateClientRegistration(ssoRegion: String) {
-        LOG.info("invalidateClientRegistration for $ssoRegion")
+        LOG.info { "invalidateClientRegistration for $ssoRegion" }
         clientRegistrationCache(ssoRegion).tryDeleteIfExists()
     }
 
     override fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey): ClientRegistration? {
-        LOG.info("loadClientRegistration for $cacheKey")
+        LOG.info { "loadClientRegistration for $cacheKey" }
         val inputStream = clientRegistrationCache(cacheKey).tryInputStreamIfExists()
         if (inputStream == null) {
             val stage = LoadCredentialStage.ACCESS_FILE
-            LOG.info("Failed to load Client Registration: cache file does not exist")
+            LOG.info { "Failed to load Client Registration: cache file does not exist" }
             AuthTelemetry.modifyConnection(
                 action = "Load cache file",
                 source = "loadClientRegistration",
@@ -118,15 +119,15 @@ class DiskCache(
     }
 
     override fun saveClientRegistration(cacheKey: ClientRegistrationCacheKey, registration: ClientRegistration) {
-        LOG.info("saveClientRegistration for $cacheKey")
+        LOG.info { "saveClientRegistration for $cacheKey" }
         val registrationCache = clientRegistrationCache(cacheKey)
         writeKey(registrationCache) {
             objectMapper.writeValue(it, registration)
         }
     }
 
     override fun invalidateClientRegistration(cacheKey: ClientRegistrationCacheKey) {
-        LOG.info("invalidateClientRegistration for $cacheKey")
+        LOG.info { "invalidateClientRegistration for $cacheKey" }
         try {
             clientRegistrationCache(cacheKey).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -142,7 +143,7 @@ class DiskCache(
     }
 
     override fun invalidateAccessToken(ssoUrl: String) {
-        LOG.info("invalidateAccessToken for $ssoUrl")
+        LOG.info { "invalidateAccessToken for $ssoUrl" }
         try {
             accessTokenCache(ssoUrl).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -158,7 +159,7 @@ class DiskCache(
     }
 
     override fun loadAccessToken(cacheKey: AccessTokenCacheKey): AccessToken? {
-        LOG.info("loadAccessToken for $cacheKey")
+        LOG.info { "loadAccessToken for $cacheKey" }
         val cacheFile = accessTokenCache(cacheKey)
         val inputStream = cacheFile.tryInputStreamIfExists() ?: return null
 
@@ -168,15 +169,15 @@ class DiskCache(
     }
 
     override fun saveAccessToken(cacheKey: AccessTokenCacheKey, accessToken: AccessToken) {
-        LOG.info("saveAccessToken for $cacheKey")
+        LOG.info { "saveAccessToken for $cacheKey" }
         val accessTokenCache = accessTokenCache(cacheKey)
         writeKey(accessTokenCache) {
             objectMapper.writeValue(it, accessToken)
         }
     }
 
     override fun invalidateAccessToken(cacheKey: AccessTokenCacheKey) {
-        LOG.info("invalidateAccessToken for $cacheKey")
+        LOG.info { "invalidateAccessToken for $cacheKey" }
         try {
             accessTokenCache(cacheKey).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -201,7 +202,7 @@ class DiskCache(
             val sha = sha1(cacheNameMapper.writeValueAsString(it))
 
             cacheDir.resolve("$sha.json").also {
-                LOG.info("$cacheKey resolves to $it")
+                LOG.info { "$cacheKey resolves to $it" }
             }
         }
 
@@ -223,7 +224,7 @@ class DiskCache(
             if (clientRegistration.expiresAt.isNotExpired()) {
                 return clientRegistration
             } else {
-                LOG.info("Client Registration is expired")
+                LOG.info { "Client Registration is expired" }
                 AuthTelemetry.modifyConnection(
                     action = "Validate Credentials",
                     source = "loadClientRegistration",
@@ -234,7 +235,7 @@ class DiskCache(
                 return null
             }
         } catch (e: Exception) {
-            LOG.info("Client Registration could not be read")
+            LOG.info { "Client Registration could not be read" }
             AuthTelemetry.modifyConnection(
                 action = "Validate Credentials",
                 source = "loadClientRegistration",
@@ -267,7 +268,7 @@ class DiskCache(
     }
 
     private fun writeKey(path: Path, consumer: (OutputStream) -> Unit) {
-        LOG.info("writing to $path")
+        LOG.info { "writing to $path" }
         try {
             path.tryDirOp(LOG) { createParentDirectories() }
 

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

@@ -18,6 +18,7 @@ import software.amazon.awssdk.services.ssooidc.model.InvalidClientException
 import software.amazon.awssdk.services.ssooidc.model.InvalidRequestException
 import software.amazon.awssdk.services.ssooidc.model.SlowDownException
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.credentials.sso.pkce.PKCE_CLIENT_NAME
@@ -498,7 +499,7 @@ class SsoAccessTokenProvider(
                 requestId = requestId,
                 result = Result.Failed
             )
-            LOG.info("RefreshAccessTokenFailed: ${e.message}")
+            LOG.info { "RefreshAccessTokenFailed: ${e.message}" }
             throw e
         }
     }