Optional region

.circleci/config.yml

@@ -6,19 +6,17 @@ orbs:
   hackage: haskell-works/hackage@1.4.2
   merge-point: haskell-works/merge-point@1.0.0
 
+executors:
+  ghc-8_10_7:
+    docker:
+      - image: quay.io/haskell_works/ghc-8.10.7:ubuntu-18.04
+
 workflows:
   multiple-ghc-build:
     jobs:
       - haskell/build-with-binary-cache:
-          name: GHC 8.4.4
-          executor: haskell/ghc-8_4_4
-          context: haskell-ci
-          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
-          build-components: all
-
-      - haskell/build-with-binary-cache:
-          name: GHC 8.6.5
-          executor: haskell/ghc-8_6_5
+          name: GHC 8.10.7
+          executor: ghc-8_10_7
           context: haskell-ci
           binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
           build-components: all
@@ -32,21 +30,10 @@ workflows:
           build-dependencies-first: true
           build-components-separately: true
 
-      - haskell/build-with-binary-cache:
-          name: GHC 8.8.2
-          executor: haskell/ghc-8_8_2
-          context: haskell-ci
-          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
-          build-components: antiope-athena antiope-contract antiope-core antiope-dynamodb antiope-es antiope-messages antiope-optparse-applicative antiope-s3 antiope-shell antiope-sns antiope-sqs
-          build-dependencies-first: true
-          build-components-separately: true
-
       - merge-point/merge-point:
           name: Build Ok
           requires:
-            - GHC 8.4.4
-            - GHC 8.6.5
-            - GHC 8.8.2
+            - GHC 8.10.7
             - GHC 8.8.3
 
       - github/release-cabal:

antiope-athena/antiope-athena.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-athena
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-contract/antiope-contract.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-contract
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-core/antiope-core.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-core
-version:                7.5.3
+version:                7.5.4
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 category:               Services

antiope-core/src/Antiope/Env.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Antiope.Env
   ( mkEnv
+  , mkEnv'
   , AWS.Env
   , AWS.HasEnv(..)
   , AWS.LogLevel(..)
@@ -17,14 +18,18 @@ import qualified Data.ByteString.Lazy          as L
 import qualified Data.ByteString.Lazy.Internal as LBS
 import qualified Network.AWS                   as AWS
 
-mkEnv :: Region -> (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env
-mkEnv region lg = do
+-- | A version of mkEnv that is allowed to discover the region.
+mkEnv' :: (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env
+mkEnv' lg = do
   lgr <- newAwsLogger lg
   newEnv Discover
     <&> envLogger .~ lgr
-    <&> envRegion .~ region
     <&> envRetryCheck .~ retryPolicy 5
 
+mkEnv :: Region -> (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env
+mkEnv region lg =
+  mkEnv' lg <&> envRegion .~ region
+
 newAwsLogger :: Monad m => (AWS.LogLevel -> LBS.ByteString -> IO ()) -> m AWS.Logger
 newAwsLogger lg = return $ \y b ->
   let lazyMsg = toLazyByteString b

antiope-dynamodb/antiope-dynamodb.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-dynamodb
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-es/antiope-es.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-es
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services
@@ -40,7 +40,6 @@ library
                       , bytestring
                       , json-stream
                       , lens
-                      , thyme
                       , unordered-containers
                       , vector
 

antiope-messages/antiope-messages.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-messages
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-optparse-applicative/antiope-optparse-applicative.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-optparse-applicative
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-s3/antiope-s3.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-s3
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-shell/antiope-shell.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-shell
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-sns/antiope-sns.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-sns
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services

antiope-sqs/antiope-sqs.cabal

@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:                   antiope-sqs
-version:                7.5.3
+version:                7.5.4
 synopsis:               Please see the README on Github at <https://github.com/arbor/antiope#readme>
 description:            Please see the README on Github at <https://github.com/arbor/antiope#readme>.
 category:               Services