Merge pull request #31 from haskell-works/newhoggy/fix-decoding-of-ba…

…se64 Fix decoding of base64
haskell-works · Jan 29, 2025 · 42fbfa4 · 42fbfa4
2 parents 54bc615 + d0ff169
commit 42fbfa4
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 7 deletions.
diff --git a/app/App/Cli/Run/LocalStack.hs b/app/App/Cli/Run/LocalStack.hs
@@ -21,7 +21,6 @@ import qualified App.Console                                       as T
 import qualified Control.Concurrent                                as IO
 import qualified Control.Concurrent.STM                            as IO
 import qualified Control.Exception                                 as IO
-import           Control.Monad.IO.Class                            (MonadIO (..))
 import qualified Control.Monad.Trans.Resource                      as IO
 import qualified Control.Monad.Trans.Resource.Internal             as IO
 import           Data.Acquire                                      (ReleaseType (ReleaseNormal))

diff --git a/polysemy/Data/RdsData/Polysemy/Core.hs b/polysemy/Data/RdsData/Polysemy/Core.hs
@@ -16,7 +16,6 @@ import           Amazonka.Env                           (Env)
 import qualified Amazonka.RDSData.BatchExecuteStatement as AWS
 import qualified Amazonka.RDSData.ExecuteStatement      as AWS
 import qualified Amazonka.Types                         as AWS
-import           Control.Monad.IO.Class                 (MonadIO)
 import           Data.Generics.Product.Any
 import           Data.RdsData.Aws
 import           Data.RdsData.Polysemy.Error

diff --git a/src/Data/RdsData/Decode/Value.hs b/src/Data/RdsData/Decode/Value.hs
@@ -58,7 +58,6 @@ import           Data.UUID                     (UUID)
 import           Data.Word
 import           Prelude                       hiding (fail, maybe, null)
 
-import qualified Amazonka.Data.ByteString      as AWS
 import qualified Data.Aeson                    as J
 import qualified Data.ByteString.Base64        as B64
 import qualified Data.ByteString.Base64.Lazy   as LB64
@@ -248,7 +247,7 @@ word64 =
 
 bytestring :: DecodeValue ByteString
 bytestring =
-  AWS.toBS <$> base64
+  unBase64 <$> base64
 
 lazyText :: DecodeValue LT.Text
 lazyText =

diff --git a/src/Data/RdsData/Encode/Param.hs b/src/Data/RdsData/Encode/Param.hs
@@ -60,7 +60,6 @@ import           Data.Word
 import           Lens.Micro
 import           Prelude                       hiding (maybe, null)
 
-import qualified Amazonka.Bytes                as AWS
 import qualified Amazonka.Data.Base64          as AWS
 import qualified Amazonka.RDSData              as AWS
 import qualified Data.Aeson                    as J
@@ -179,7 +178,7 @@ lazyText =
 
 bytestring :: EncodeParam ByteString
 bytestring =
-  (AWS.Base64 . AWS.encodeBase64) >$< base64
+  AWS.Base64 >$< base64
 
 lazyBytestring :: EncodeParam LBS.ByteString
 lazyBytestring =

diff --git a/test/Data/RdsDataSpec.hs b/test/Data/RdsDataSpec.hs
@@ -79,7 +79,7 @@ hprop_stub = H.propertyOnce $ do
       { TT.bigint             = 1234567890
       , TT.bigserial          = 1
       , TT.boolean            = True
-      , TT.bytea              = "EjQ="
+      , TT.bytea              = "\DC24"
       , TT.character          = "A"
       , TT.characters         = "AB"
       , TT.varyingCharacter   = "C"