Merge remote-tracking branch 'origin/master'

Author: peterpeterparker

infra/default.nix

@@ -7,9 +7,9 @@ rec
         cp ${./main.js} 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
+        cp ${deckdeckgo-starter-dist}/dist.zip dist.zip
         mkdir $out
-        ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs dist.tar
+        ${pkgs.zip}/bin/zip -r $out/function.zip main.js main_hs dist.zip
       '';
 
   # TODO: move all other builders to this
@@ -62,7 +62,7 @@ rec
   deckdeckgo-starter-dist =
     with
       { napalm = import pkgs.sources.napalm { inherit pkgs;} ; };
-    pkgs.runCommand "deckdeckgo-starter" { buildInputs = [ pkgs.nodejs ]; }
+    pkgs.runCommand "deckdeckgo-starter" { buildInputs = [ pkgs.nodejs pkgs.zip ]; }
       ''
         cp -r ${napalm.buildPackage pkgs.sources.deckdeckgo-starter {}}/* .
         chmod +w -R _napalm-install
@@ -71,7 +71,7 @@ rec
         npm run build
         mkdir -p $out
         pushd dist
-        tar -cvf $out/dist.tar *
+        zip -r $out/dist.zip *
         popd
       '';
 
@@ -147,7 +147,7 @@ rec
             AWS_DEFAULT_REGION=us-east-1 \
               AWS_ACCESS_KEY_ID=dummy \
               AWS_SECRET_ACCESS_KEY=dummy_key \
-              DECKGO_STARTER_DIST=${deckdeckgo-starter-dist}/dist.tar \
+              DECKGO_STARTER_DIST=${deckdeckgo-starter-dist}/dist.zip \
               ghci -Wall handler/app/Test.hs handler/src/**/*.hs
          }
 
@@ -228,7 +228,7 @@ rec
         AWS_DEFAULT_REGION=us-east-1 \
         AWS_ACCESS_KEY_ID=dummy \
         AWS_SECRET_ACCESS_KEY=dummy_key \
-        DECKGO_STARTER_DIST=${deckdeckgo-starter-dist}/dist.tar \
+        DECKGO_STARTER_DIST=${deckdeckgo-starter-dist}/dist.zip \
         TEST_TOKEN_PATH=${./token} ${handler}/bin/test
       echo "Tests were run"
 

infra/handler/package.yaml

@@ -44,7 +44,7 @@ dependencies:
     - wai
     - wai-cors
     - wai-lambda
-    - tar
+    - zip-archive
 
 ghc-options:
     - -Wall

infra/handler/src/DeckGo/Handler.hs

@@ -54,7 +54,7 @@ import System.Environment
 import System.FilePath
 import UnliftIO
 import qualified Cases
-import qualified Codec.Archive.Tar as Tar
+import qualified Codec.Archive.Zip as Zip
 import qualified Crypto.Hash as Hash
 import qualified Data.Aeson as Aeson
 import qualified Data.Aeson.Types as Aeson
@@ -1235,6 +1235,11 @@ listPresentationObjects
 listPresentationObjects env bucket pprefix =
     listObjects env bucket (Just $ unPresentationPrefix pprefix)
 
+zipExtract :: FilePath -> FilePath -> IO ()
+zipExtract dest archivePath = do
+    archive <- Zip.toArchive <$> BL.readFile archivePath
+    Zip.extractFilesFromArchive [ Zip.OptDestination dest ] archive
+
 withPresentationFiles
   :: Username
   -> PresShortname
@@ -1244,7 +1249,7 @@ withPresentationFiles
 withPresentationFiles uname psname presentationInfo act = do
     deckgoStarterDist <- getEnv "DECKGO_STARTER_DIST"
     Temp.withSystemTempDirectory "dist" $ \dir -> do
-      Tar.extract dir deckgoStarterDist
+      zipExtract dir deckgoStarterDist
 
       -- Here we deal with workbox' precache by updating index.html and then
       -- propagate the new etag (md5) through precache-manifest.js and

infra/lambda.tf

@@ -24,7 +24,7 @@ resource "aws_lambda_function" "api" {
       DECKGO_PRESENTATIONS_URL = aws_route53_record.www_site_beta.fqdn
       META_BUCKET_NAME         = aws_s3_bucket.meta.bucket
       BUCKET_NAME         = aws_s3_bucket.presentations.bucket
-      DECKGO_STARTER_DIST = "dist.tar"
+      DECKGO_STARTER_DIST = "dist.zip"
     }
   }
 }

infra/nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://deckdeckgo.com",
         "owner": "deckgo",
         "repo": "deckdeckgo-starter",
-        "rev": "c92dad40ce2b0009477767f1f9b6ac227a551a6e",
-        "sha256": "0cgp41pc68qsnx7dmqilpv3jf98j1q3k6fi3qqp14b2djzr71cr2",
+        "rev": "9afca4a201d35a22b94cec9d56a9244cd7099832",
+        "sha256": "022md776ab1hxxxq27n15807n6pwgcv6gd2wmiiyxklmvfiv70ib",
         "type": "tarball",
-        "url": "https://github.com/deckgo/deckdeckgo-starter/archive/c92dad40ce2b0009477767f1f9b6ac227a551a6e.tar.gz",
+        "url": "https://github.com/deckgo/deckdeckgo-starter/archive/9afca4a201d35a22b94cec9d56a9244cd7099832.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "elasticmq": {