Refactor Configuration

Author: NickSeagull

package.yaml

@@ -79,3 +79,4 @@ ghc-options:
   - -Wpartial-fields
   - -fhide-source-paths
   - -freverse-errors
+  - -O2

src/Aws/Lambda/Configuration.hs

@@ -4,55 +4,21 @@ module Aws.Lambda.Configuration
   , Main.generate
   , Main.getRecord
   , configureLambda
-  , returnAndFail
-  , returnAndSucceed
-  , decodeObj
+  , IPC.returnAndFail
+  , IPC.returnAndSucceed
+  , Dispatch.decodeObj
   )
 where
 
-import Data.Aeson
-
-import qualified Data.ByteString.Lazy as LazyByteString
-import Data.Text (Text)
-import qualified Data.Text as Text
-import qualified Data.Text.Encoding as Encoding
-import Language.Haskell.TH
-import System.Exit (exitFailure, exitSuccess)
-import System.IO (hFlush, stderr, stdout)
+import qualified Language.Haskell.TH as Meta
 
 import qualified Aws.Lambda.Meta.Main as Main
 import qualified Aws.Lambda.Meta.Run as Run
+import qualified Aws.Lambda.Meta.Dispatch as Dispatch
+import qualified Aws.Lambda.Runtime.IPC as IPC
 
-putTextLn :: Text -> IO ()
-putTextLn = putStrLn . Text.unpack
-
-configureLambda :: Q [Dec]
+configureLambda :: Meta.DecsQ
 configureLambda = do
   main <- Main.generate
   run <- Run.generate
   return $ main <> [run]
-
-returnAndFail :: ToJSON a => Text -> a -> IO ()
-returnAndFail uuid v = do
-  hFlush stdout
-  putTextLn uuid
-  hFlush stdout
-  putTextLn (Encoding.decodeUtf8 $ LazyByteString.toStrict $ encode v)
-  hFlush stdout
-  hFlush stderr
-  exitFailure
-
-returnAndSucceed :: ToJSON a => Text -> a -> IO ()
-returnAndSucceed uuid v = do
-  hFlush stdout
-  putTextLn uuid
-  hFlush stdout
-  putTextLn (Encoding.decodeUtf8 $ LazyByteString.toStrict $ encode v)
-  hFlush stdout
-  exitSuccess
-
-decodeObj :: FromJSON a => Text -> a
-decodeObj x =
-  case (eitherDecode $ LazyByteString.fromStrict $ Encoding.encodeUtf8 x) of
-    Left e  -> error e
-    Right v -> v

src/Aws/Lambda/Meta/Discover.hs

@@ -31,7 +31,7 @@ handlerNames modules =
  where
   changeExtensionToHandler file =
     setFileExtension ".handler" file
-    & Maybe.fromJust
+    & Maybe.fromJust  -- The path will be always parsable, as we just replace the extension
 
 containsHandler :: Path Rel File -> IO Bool
 containsHandler file = do

src/Aws/Lambda/Meta/Dispatch.hs

@@ -1,22 +1,31 @@
 module Aws.Lambda.Meta.Dispatch
-  (generate) where
+  ( generate
+  , decodeObj
+  ) where
 
 import Data.Function ((&))
 import Data.Text (Text)
 import qualified Data.Text as Text
 
+import Data.Aeson
+import qualified Data.ByteString.Lazy.Char8 as LazyByteString
 import qualified Language.Haskell.TH as Meta
 
 import Aws.Lambda.Meta.Common
 
+decodeObj :: FromJSON a => String -> a
+decodeObj x =
+  case (eitherDecode $ LazyByteString.pack x) of
+    Left e  -> error e
+    Right v -> v
+
 generate :: [Text] -> Meta.ExpQ
 generate fileNames = do
   caseExp <- expressionName "functionHandler"
   matches <- traverse handlerCase fileNames
   unmatched <- unmatchedCase
   pure $ Meta.CaseE caseExp (matches <> [unmatched])
 
-
 handlerCase :: Text -> Meta.MatchQ
 handlerCase lambdaHandler = do
   let pat = Meta.LitP (Meta.StringL $ Text.unpack lambdaHandler)
@@ -31,7 +40,6 @@ handlerCase lambdaHandler = do
     & Text.drop 1
     & Text.replace "/" "."
 
-
 unmatchedCase :: Meta.MatchQ
 unmatchedCase = do
   let pattern = Meta.WildP

src/Aws/Lambda/Meta/Main.hs

@@ -4,7 +4,6 @@ module Aws.Lambda.Meta.Main
   , Options.getRecord
   ) where
 
-import Data.Text (Text)
 import GHC.Generics (Generic)
 
 import qualified Options.Generic as Options
@@ -13,10 +12,10 @@ import qualified Language.Haskell.TH as Meta
 import Aws.Lambda.Meta.Common
 
 data LambdaOptions = LambdaOptions
-  { eventObject     :: !Text
-  , contextObject   :: !Text
-  , functionHandler :: !Text
-  , executionUuid   :: !Text
+  { eventObject     :: !String
+  , contextObject   :: !String
+  , functionHandler :: !String
+  , executionUuid   :: !String
   } deriving (Generic, Options.ParseRecord)
 
 generate :: Meta.DecsQ

src/Aws/Lambda/Runtime/IPC.hs

@@ -1,5 +1,7 @@
 module Aws.Lambda.Runtime.IPC
   ( invoke
+  , returnAndFail
+  , returnAndSucceed
   ) where
 
 
@@ -21,6 +23,25 @@ import qualified Aws.Lambda.Runtime.Environment as Environment
 import qualified Aws.Lambda.Runtime.Error as Error
 import Aws.Lambda.Runtime.Result (LambdaResult (..))
 
+returnAndFail :: ToJSON a => String -> a -> IO ()
+returnAndFail uuid v = do
+  IO.hFlush IO.stdout
+  putStrLn uuid
+  IO.hFlush IO.stdout
+  putStrLn (ByteString.unpack $ encode v)
+  IO.hFlush IO.stdout
+  IO.hFlush IO.stderr
+  Exit.exitFailure
+
+returnAndSucceed :: ToJSON a => String -> a -> IO ()
+returnAndSucceed uuid v = do
+  IO.hFlush IO.stdout
+  putStrLn uuid
+  IO.hFlush IO.stdout
+  putStrLn (ByteString.unpack $ encode v)
+  IO.hFlush IO.stdout
+  Exit.exitSuccess
+
 invoke
   :: Throws Error.Invocation
   => Throws Error.Parsing