mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

future proof AWS.Credentials generation

Browse source 
Avoid breaking when a field is added to the constructor.

Sponsored-by: Dartmouth College's DANDI project
This commit is contained in:
Joey Hess 2022-10-10 16:31:08 -04:00
parent 4a42c69092
commit 90f9671e00
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Remote/S3.hs
View file

@ -33,7 +33,6 @@ import Network.HTTP.Types
import Network.URI import Network.URI
import Control.Monad.Trans.Resource import Control.Monad.Trans.Resource
import Control.Monad.Catch import Control.Monad.Catch
import Data.IORef
import Control.Concurrent.STM (atomically) import Control.Concurrent.STM (atomically)
import Control.Concurrent.STM.TVar import Control.Concurrent.STM.TVar
import Data.Maybe import Data.Maybe
@ -1071,11 +1070,10 @@ genericPublicUrl baseurl p =
skipescape c = isUnescapedInURIComponent c skipescape c = isUnescapedInURIComponent c
genCredentials :: CredPair -> IO AWS.Credentials genCredentials :: CredPair -> IO AWS.Credentials
genCredentials (keyid, secret) = AWS.Credentials genCredentials (keyid, secret) = do
<$> pure (tobs keyid) cr <- AWS.makeCredentials (tobs keyid) (tobs secret)
<*> pure (tobs secret) tk <- fmap tobs <$> getEnv "AWS_SESSION_TOKEN"
<*> newIORef [] return (cr { AWS.iamToken = tk })
<*> (fmap tobs <$> getEnv "AWS_SESSION_TOKEN")
where where
tobs = T.encodeUtf8 . T.pack tobs = T.encodeUtf8 . T.pack