Merge pull request #342 from deckgo/nm-update-starter

infra: update deckdeckgo starter

Author: nmattia

infra/default.nix

@@ -7,8 +7,9 @@ rec
         cp ${pkgs.wai-lambda.wai-lambda-js-wrapper} main.js
         # Can't be called 'main' otherwise lambda tries to load it
         cp "${handler}/bin/handler" main_hs
+        cp ${deckdeckgo-starter-dist}/dist.tar dist.tar
         mkdir $out
-        ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs
+        ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs dist.tar
       '';
 
   # TODO: move all other builders to this
@@ -17,6 +18,7 @@ rec
         (builtins.readDir function) "${function}/function.zip";
     } ;
 
+
   function-unsplash =
     pkgs.runCommand "build-lambda" {}
       ''
@@ -42,22 +44,6 @@ rec
         ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs
       '';
 
-  function-presenter-path =
-    { path = builtins.seq
-        (builtins.readDir function-presenter) "${function-presenter}/function.zip";
-    } ;
-
-  function-presenter =
-    pkgs.runCommand "build-lambda-presenter" {}
-      ''
-        cp ${pkgs.wai-lambda.wai-lambda-js-wrapper} main.js
-        # Can't be called 'main' otherwise lambda tries to load it
-        cp "${handler}/bin/presenter" main_hs
-        cp ${deckdeckgo-starter-dist}/dist.tar dist.tar
-        mkdir -p $out
-        ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs dist.tar
-      '';
-
   function-dirty-path =
     { path = builtins.seq
         (builtins.readDir function-dirty) "${function-dirty}/function.zip";
@@ -188,12 +174,6 @@ rec
 
   publicKey = builtins.readFile ./public.cer;
 
-  swaggerUi = pkgs.runCommand "swagger-ui" {}
-  ''
-    mkdir -p $out
-    ${handler}/bin/swagger $out
-  '';
-
   googleResp = { "key1" = publicKey ; };
 
   apiDir = pkgs.writeTextFile

infra/dynamo.tf

@@ -35,7 +35,10 @@ main = do
 
     putStrLn "Connection acquired, starting lambda..."
 
-    Lambda.run $ cors $ DeckGo.Handler.application settings env conn
+    Lambda.runSettings settings' $ cors $ DeckGo.Handler.application settings env conn
+  where
+    settings' = Lambda.defaultSettings
+      { Lambda.timeoutValue = 20 * 1000 * 1000 }
 
 -- TODO: factor out
 getFirebaseSettings :: AWS.Env -> IO Firebase.FirebaseLoginSettings