Stylistic changes

Author: NickSeagull

ChangeLog.md

@@ -1,4 +1,4 @@
-Copyright 2018 The Agile Monkeys
+Copyright 2019 The Agile Monkeys
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

LICENSE

@@ -9,7 +9,7 @@ This package provides a way of running Haskell projects on AWS Lambda.
 ## Sample lambda function
 
 ```
-stack new my-haskell-lambda https://github.com/theam/aws-lambda-haskell-runtime/raw/master/stack-template.hsfiles --resolver=lts-13.0 --omit-packages
+stack new my-haskell-lambda https://github.com/theam/aws-lambda-haskell-runtime/raw/master/stack-template.hsfiles --resolver=lts-13.25 --omit-packages
 cd my-haskell-lambda
 stack docker pull
 ```
@@ -21,7 +21,7 @@ packages:
 - .
 
 extra-deps:
-- aws-lambda-haskell-runtime-1.0.10
+- aws-lambda-haskell-runtime-2.0.0
 ```
 
 to your `stack.yaml`
@@ -34,15 +34,6 @@ make
 
 Now you should have a `build/function.zip` file that you can upload to your lambda.
 
-## Lambda function configuration
-
-When creating your lambda function you need to provide a layer with the Haskell runtime. We have deployed the layer to our AWS account, you can use it or deploy it to your own AWS account.
-
-The ARN of the runtime layer is:
-```
-arn:aws:lambda:<YOUR REGION>:785355572843:layer:aws-haskell-runtime:5
-````
-
 ## Full user guide
 
 Take a look at the [Getting Started with the Haskell AWS Lambda Runtime](https://medium.com/the-theam-journey/getting-started-with-the-haskell-aws-lambda-runtime-951b2322c7a3) guide.

Makefile

@@ -11,11 +11,11 @@ import Data.Aeson
 import qualified Data.ByteString.Lazy.Char8 as LazyByteString
 
 import qualified Aws.Lambda.Runtime.ApiInfo as ApiInfo
+import qualified Aws.Lambda.Runtime.Common as Runtime
 import qualified Aws.Lambda.Runtime.Context as Context
 import qualified Aws.Lambda.Runtime.Environment as Environment
 import qualified Aws.Lambda.Runtime.Error as Error
 import qualified Aws.Lambda.Runtime.Publish as Publish
-import qualified Aws.Lambda.Runtime.Common as Runtime
 
 -- | Runs the user @haskell_lambda@ executable and posts back the
 -- results. This is called from the layer's @main@ function.

README.md

@@ -20,4 +20,4 @@ data LambdaOptions = LambdaOptions
 
 -- | Wrapper type to handle the result of the user
 newtype LambdaResult =
-  LambdaResult String
+  LambdaResult String

src/Aws/Lambda/Runtime.hs

@@ -13,9 +13,9 @@ import qualified Data.ByteString.Char8 as ByteString
 import qualified Network.HTTP.Client as Http
 
 import qualified Aws.Lambda.Runtime.API.Endpoints as Endpoints
+import Aws.Lambda.Runtime.Common
 import Aws.Lambda.Runtime.Context (Context (..))
 import qualified Aws.Lambda.Runtime.Error as Error
-import Aws.Lambda.Runtime.Common
 
 -- | Publishes the result back to AWS Lambda
 result :: LambdaResult -> String -> Context -> Http.Manager -> IO ()

src/Aws/Lambda/Runtime/Common.hs

@@ -11,14 +11,14 @@ description:         Please see the README on GitHub at <https://github.com/{{gi
 
 dependencies:
 - base >= 4.7 && < 5
-- aws-lambda-haskell-runtime >= 1.0.9
+- aws-lambda-haskell-runtime >= 2.0.0
 - aeson
 
 library:
   source-dirs: src
 
 executables:
-  haskell_lambda:
+  bootstrap:
     main:                Main.hs
     source-dirs:         app
     ghc-options:
@@ -43,15 +43,16 @@ all:
 	@rm -rf ./build/*
 	@stack clean --docker
 	@stack build --docker
-	@cp `stack --docker path --local-install-root`/bin/haskell_lambda build
-	@cd build && zip function.zip haskell_lambda && rm haskell_lambda && cd ..
+	@cp `stack --docker path --local-install-root`/bin/bootstrap build
+	@cd build && zip function.zip bootstrap && rm bootstrap && cd ..
 {-# START_FILE src/Lib.hs #-}
 module Lib where
 
 import GHC.Generics
-import Aws.Lambda.Runtime
 import Data.Aeson
 
+import Aws.Lambda
+
 data Person = Person
   { personName :: String
   , personAge :: Int
@@ -69,8 +70,7 @@ handler person context =
 {-# START_FILE app/Main.hs #-}
 module Main where
 
-import Aws.Lambda.Configuration
-import Aws.Lambda.Runtime
+import Aws.Lambda
 
 import qualified Lib