From 91c9283c4abf73358befb1ac22ba873ed3368a69 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Dec 2014 16:53:25 -0400 Subject: Fix build with -f-S3. --- Remote/Helper/AWS.hs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'Remote/Helper') diff --git a/Remote/Helper/AWS.hs b/Remote/Helper/AWS.hs index d27f2aad1..17e1a2921 100644 --- a/Remote/Helper/AWS.hs +++ b/Remote/Helper/AWS.hs @@ -5,21 +5,19 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE OverloadedStrings, TupleSections #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TupleSections #-} module Remote.Helper.AWS where import Common.Annex import Creds -import qualified Aws -import qualified Aws.S3 as S3 import qualified Data.Map as M import qualified Data.ByteString as B import qualified Data.Text as T import Data.Text.Encoding (encodeUtf8) import Data.Text (Text) -import Data.IORef creds :: UUID -> CredPairStorage creds u = CredPairStorage @@ -28,13 +26,6 @@ creds u = CredPairStorage , credPairRemoteKey = Just "s3creds" } -genCredentials :: CredPair -> IO Aws.Credentials -genCredentials (keyid, secret) = Aws.Credentials - <$> pure (encodeUtf8 (T.pack keyid)) - <*> pure (encodeUtf8 (T.pack secret)) - <*> newIORef [] - <*> pure Nothing - data Service = S3 | Glacier deriving (Eq) @@ -82,7 +73,3 @@ s3HostName r = encodeUtf8 $ T.concat ["s3-", r, ".amazonaws.com"] s3DefaultHost :: String s3DefaultHost = "s3.amazonaws.com" - -mkLocationConstraint :: Region -> S3.LocationConstraint -mkLocationConstraint "US" = S3.locationUsClassic -mkLocationConstraint r = r -- cgit v1.2.3