stackctl 1.7.3.6 → 1.7.3.7

raw patch · 3 files changed

+27/−4 lines, 3 files

Files

• src/Stackctl/AWS/Core.hs +19/−0
• src/Stackctl/CLI.hs +7/−3
• stackctl.cabal +1/−1

@@ -12,6 +12,7 @@   , withAssumedRole      -- * Error-handling+  , handlingAuthError   , handlingServiceError   , formatServiceError @@ -38,6 +39,7 @@   , serviceError_code   , serviceError_message   , serviceError_requestId+  , _AuthError   , _Sensitive   , _ServiceError   )@@ -49,6 +51,7 @@ import Amazonka.STS.AssumeRole import Control.Monad.AWS import Control.Monad.Logger (defaultLoc, toLogStr)+import qualified Data.Text as T import Data.Typeable (typeRep) import Stackctl.AWS.Orphans () import UnliftIO.Exception.Lens (handling)@@ -148,6 +151,22 @@   { unAccountId :: Text   }   deriving newtype (Eq, Ord, Show, ToJSON)++-- | Handle 'AuthError', log it and 'exitFailure'+handlingAuthError :: (MonadUnliftIO m, MonadLogger m) => m a -> m a+handlingAuthError =+  handling _AuthError $ \e -> do+    logError $ msg :# ["exception" .= displayException e]+    exitFailure+ where+  msg =+    "No AWS credentials were found in your environment."+      <> continuation "For details of where stackctl looks for credentials, see:"+      <> continuation+        "https://hackage.haskell.org/package/amazonka-2.0/docs/Amazonka-Auth.html#v:discover"++  -- Shift the continuation lines to line up with the first message line+  continuation x = "\n" <> T.replicate 32 " " <> x  -- | Handle 'ServiceError', log it and 'exitFailure' --

@@ -13,6 +13,7 @@ import Control.Monad.AWS.ViaReader as AWS import Control.Monad.Catch (MonadCatch) import Control.Monad.Trans.Resource (MonadResource, ResourceT, runResourceT)+import Stackctl.AWS.Core (handlingAuthError) import qualified Stackctl.AWS.Core as AWS import Stackctl.AWS.Scope import Stackctl.AutoSSO@@ -103,9 +104,12 @@           envLogSettings    withLogger logSettings $ \appLogger -> do-    appAwsEnv <- runWithLogger appLogger $ handleAutoSSO options $ do-      logDebug "Discovering AWS credentials"-      AWS.discover+    appAwsEnv <- runWithLogger appLogger+      $ handleAutoSSO options+      $ handlingAuthError+      $ do+        logDebug "Discovering AWS credentials"+        AWS.discover     appConfig <- runWithLogger appLogger loadConfigOrExit     appAwsScope <- AWS.runEnvT fetchAwsScope appAwsEnv 

@@ -1,6 +1,6 @@ cabal-version:   1.18 name:            stackctl-version:         1.7.3.6+version:         1.7.3.7 license:         MIT license-file:    LICENSE copyright:       2022 Renaissance Learning Inc