Merge pull request #47 from juhp/master

add CURATOR_AWS_OPTIONS

Author: juhp

curator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.1.
 --
 -- see: https://github.com/sol/hpack
 
@@ -57,7 +57,7 @@ executable casa-curator
       TypeOperators
   ghc-options: -optP-Wno-nonportable-include-path -threaded
   build-depends:
-      aeson
+      aeson <2.2
     , base >=4.10 && <5
     , bytestring
     , casa-client

package.yaml

@@ -56,7 +56,8 @@ executables:
       - text
       - optparse-simple
       - containers
-      - aeson
+      # aeson 2.2 needs attoparsec-aeson
+      - aeson < 2.2
       - http-conduit
       - syb
       - persistent-sqlite

src/Curator/UploadDocs.hs

@@ -17,6 +17,8 @@ import qualified RIO.ByteString.Lazy as BL
 import RIO.Process
 import RIO.FilePath ((</>))
 
+import System.Environment.Blank (getEnvDefault)
+
 import qualified Codec.Archive.Tar             as Tar
 import qualified Codec.Archive.Tar.Entry       as Tar
 
@@ -42,26 +44,26 @@ uploadDocs input' name bucket = do
     D.createDirectoryIfMissing True $ input </> "hoogle"
     BL.writeFile (input </> "hoogle" </> "orig.tar") hooglesLBS
 
+    -- maybe default to --quiet or "--only-show-errors"?
+    curator_AWS_OPTS <- liftIO $ fmap words $
+                        getEnvDefault "CURATOR_AWS_OPTIONS" ""
     logInfo "Shelling out to AWS CLI to upload docs"
     proc
       "time" -- added for https://github.com/commercialhaskell/stackage-infrastructure/issues/4
-      (
-      "aws"
-      : -- added for https://github.com/commercialhaskell/stackage-infrastructure/issues/4
-      [
-        "s3"
-      , "cp"
-      -- -- commented out to debug https://github.com/commercialhaskell/stackage-infrastructure/issues/4
-      --, "--only-show-errors"
-      , "--recursive"
-      , "--acl"
-      , "public-read"
-      , "--cache-control"
-      , "maxage=31536000"
-      , input
-      , T.unpack $ "s3://" <> bucket <> "/" <> name <> "/"
-      ]
-      ) -- added for https://github.com/commercialhaskell/stackage-infrastructure/issues/4
+      ( [ "aws"
+        , "s3"
+        , "cp"]
+        ++
+        curator_AWS_OPTS
+        ++
+        [ "--recursive"
+        , "--acl"
+        , "public-read"
+        , "--cache-control"
+        , "maxage=31536000"
+        , input
+        , T.unpack $ "s3://" <> bucket <> "/" <> name <> "/"
+        ] )
       runProcess_
 
 -- | Create a TAR entry for each Hoogle txt file. Unfortunately doesn't stream.