memcachier · ScottSedgwick · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019 · Jul 23, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -25,28 +25,43 @@ matrix:
   include:
   # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
   # https://github.com/hvr/multi-ghc-travis
+
   #- env: BUILD=cabal GHCVER=7.0.4 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
   #  compiler: ": #GHC 7.0.4"
   #  addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
   #- env: BUILD=cabal GHCVER=7.2.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
   #  compiler: ": #GHC 7.2.2"
   #  addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
   #- env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
   #  compiler: ": #GHC 7.4.2"
   #  addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
   # - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16 HAPPYVER=1.19.5 ALEXVER=3.1.7
   #   compiler: ": #GHC 7.6.3"
   #   addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
-    compiler: ": #GHC 7.8.4"
-    addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
-    compiler: ": #GHC 7.10.3"
-    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
+  # - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18 HAPPYVER=1.19.5 ALEXVER=3.1.7
+  #   compiler: ": #GHC 7.8.4"
+  #   addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
+  # - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22 HAPPYVER=1.19.5 ALEXVER=3.1.7
+  #   compiler: ": #GHC 7.10.3"
+  #   addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
   - env: BUILD=cabal GHCVER=8.0.1 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
     compiler: ": #GHC 8.0.1"
     addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
 
+  - env: BUILD=cabal GHCVER=8.2.2 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
+    compiler: ": #GHC 8.2.2"
+    addons: {apt: {packages: [cabal-install-1.24,ghc-8.2.2,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
+  - env: BUILD=cabal GHCVER=8.4.4 CABALVER=1.24 HAPPYVER=1.19.5 ALEXVER=3.1.7
+    compiler: ": #GHC 8.4.4"
+    addons: {apt: {packages: [cabal-install-1.24,ghc-8.4.4,happy-1.19.5,alex-3.1.7], sources: [hvr-ghc]}}
+
   # Build with the newest GHC and cabal-install. This is an accepted failure,
   # see below.
   - env: BUILD=cabal GHCVER=head  CABALVER=head HAPPYVER=1.19.5 ALEXVER=3.1.7
@@ -57,19 +72,35 @@ matrix:
   # variable, such as using --stack-yaml to point to a different file.
   - env: BUILD=stack ARGS=""
     compiler: ": #stack default"
-    addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
+    addons: {apt: {packages: [ghc-8.6.5], sources: [hvr-ghc]}}
+
+  # - env: BUILD=stack ARGS="--resolver lts-2"
+  #   compiler: ": #stack 7.8.4"
+  #   addons: {apt: {packages: [ghc-7.8.4], sources: [hvr-ghc]}}
+
+  # - env: BUILD=stack ARGS="--resolver lts-3"
+  #   compiler: ": #stack 7.10.2"
+  #   addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
 
-  - env: BUILD=stack ARGS="--resolver lts-2"
-    compiler: ": #stack 7.8.4"
-    addons: {apt: {packages: [ghc-7.8.4], sources: [hvr-ghc]}}
+  # - env: BUILD=stack ARGS="--resolver lts-6"
+  #   compiler: ": #stack 7.10.3"
+  #   addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
 
-  - env: BUILD=stack ARGS="--resolver lts-3"
-    compiler: ": #stack 7.10.2"
-    addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
+  # - env: BUILD=stack ARGS="--resolver lts-7"
+  #   compiler: ": #stack 8.0.1"
+  #   addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}}
 
-  - env: BUILD=stack ARGS="--resolver lts-6"
-    compiler: ": #stack 7.10.3"
-    addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
+  - env: BUILD=stack ARGS="--resolver lts-11"
+    compiler: ": #stack 8.2.2"
+    addons: {apt: {packages: [ghc-8.2.2], sources: [hvr-ghc]}}
+
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.4"
+    addons: {apt: {packages: [ghc-8.4.4], sources: [hvr-ghc]}}
+
+  - env: BUILD=stack ARGS="--resolver lts-13"
+    compiler: ": #stack 8.6.5"
+    addons: {apt: {packages: [ghc-8.6.5], sources: [hvr-ghc]}}
 
   # Nightly builds are allowed to fail
   - env: BUILD=stack ARGS="--resolver nightly"
@@ -86,12 +117,28 @@ matrix:
   #   compiler: ": #stack 7.8.4 osx"
   #   os: osx
 
-  - env: BUILD=stack ARGS="--resolver lts-3"
-    compiler: ": #stack 7.10.2 osx"
+  # - env: BUILD=stack ARGS="--resolver lts-3"
+  #   compiler: ": #stack 7.10.2 osx"
+  #   os: osx
+
+  # - env: BUILD=stack ARGS="--resolver lts-6"
+  #   compiler: ": #stack 7.10.3 osx"
+  #   os: osx
+
+  # - env: BUILD=stack ARGS="--resolver lts-7"
+  #   compiler: ": #stack 8.0.1 osx"
+  #   os: osx
+
+  - env: BUILD=stack ARGS="--resolver lts-11"
+    compiler: ": #stack 8.2.2 osx"
+    os: osx
+
+  - env: BUILD=stack ARGS="--resolver lts-12"
+    compiler: ": #stack 8.4.4 osx"
     os: osx
 
-  - env: BUILD=stack ARGS="--resolver lts-6"
-    compiler: ": #stack 7.10.3 osx"
+  - env: BUILD=stack ARGS="--resolver lts-13"
+    compiler: ": #stack 8.6.5 osx"
     os: osx
 
   - env: BUILD=stack ARGS="--resolver nightly"

diff --git a/aws-ec2.cabal b/aws-ec2.cabal
@@ -1,5 +1,5 @@
 name: aws-ec2
-version: 0.3.7
+version: 0.3.8
 cabal-version: >=1.10
 build-type: Simple
 license: BSD3
@@ -13,14 +13,14 @@ description:
 category: Network, Web, AWS, Cloud, Distributed Computing
 author: Vladimir Kirillov; MemCachier, Inc
 
-source-repository this
-    type: git
-    location: https://github.com/memcachier/aws-ec2.git
-    tag: 0.3.7
+-- source-repository this
+--     type: git
+--     location: https://github.com/memcachier/aws-ec2.git
+--     tag: 0.3.8
 
-source-repository head
-    type: git
-    location: https://github.com/memcachier/aws-ec2.git
+-- source-repository head
+--     type: git
+--     location: https://github.com/memcachier/aws-ec2.git
 
 library
     exposed-modules:
@@ -88,61 +88,110 @@ library
         Aws.Elb.Commands.SetLoadBalancerPoliciesOfListener
         Aws.Elb.Commands.ConfigureHealthCheck
     build-depends:
-        base                  >=4.7        &&  <5,
-        template-haskell      >=2.9.0.0    &&  <2.12,
-        containers            >=0.5.5.1    &&  <0.6,
-        mtl                   >=2.1.3.1    &&  <2.3,
-        text                  >=1.2.0.6    &&  <1.3,
-        bytestring            >=0.10.4.0   &&  <0.11,
-        base16-bytestring     >=0.1.1.6    &&  <0.2,
-        base64-bytestring     >=1.0.0.1    &&  <1.1,
-        blaze-builder         >=0.4.0.1    &&  <0.5,
-        time                  >=1.4.2      &&  <1.7,
-        aeson                 >=0.8.0.2    &&  <0.12,
-        unordered-containers  >=0.2.5.1    &&  <0.3,
-        vector                >=0.10.12.3  &&  <0.12,
-        scientific            >=0.3.3.8    &&  <0.4,
-        exceptions            >=0.8.0.2    &&  <0.9,
-        resourcet             >=1.1.6      &&  <1.2,
-        byteable              >=0.1.1      &&  <0.2,
-        cryptohash            >=0.11.6     &&  <0.12,
-        http-types            >=0.8.6      &&  <0.10,
-        http-conduit          >=2.1.7.2    &&  <2.2,
-        conduit-extra         >=1.1.9.1    &&  <1.2,
-        blaze-markup          >=0.7.0.2    &&  <0.8,
-        xml-conduit           >=1.2.6      &&  <1.4,
-        iproute               >=1.3.2      &&  <1.8,
-        aws                   >=0.9.4      &&  <0.15
+        aeson
+        , aws
+        , base
+        , base16-bytestring
+        , base64-bytestring
+        , blaze-builder
+        , blaze-markup
+        , byteable
+        , bytestring
+        , conduit-extra
+        , containers
+        , cryptohash
+        , exceptions
+        , http-conduit
+        , http-types
+        , iproute
+        , mtl
+        , resourcet
+        , scientific
+        , template-haskell
+        , text
+        , time
+        , unordered-containers
+        , vector
+        , xml-conduit
+
+        -- aeson                 >=0.8.0.2    &&  <1.5,
+        -- aws                   >=0.9.4      &&  <0.22,
+        -- base                  >=4.7        &&  <5,
+        -- base16-bytestring     >=0.1.1.6    &&  <0.2,
+        -- base64-bytestring     >=1.0.0.1    &&  <1.1,
+        -- blaze-builder         >=0.4.0.1    &&  <0.5,
+        -- blaze-markup          >=0.7.0.2    &&  <0.9,
+        -- byteable              >=0.1.1      &&  <0.2,
+        -- bytestring            >=0.10.4.0   &&  <0.11,
+        -- conduit-extra         >=1.1.9.1    &&  <1.4,
+        -- containers            >=0.5.5.1    &&  <0.7,
+        -- cryptohash            >=0.11.6     &&  <0.12,
+        -- exceptions            >=0.8.0.2    &&  <0.11,
+        -- http-conduit          >=2.1.7.2    &&  <2.4,
+        -- http-types            >=0.8.6      &&  <0.13,
+        -- iproute               >=1.3.2      &&  <1.8,
+        -- mtl                   >=2.1.3.1    &&  <2.3,
+        -- resourcet             >=1.1.6      &&  <1.3,
+        -- scientific            >=0.3.3.8    &&  <0.4,
+        -- template-haskell      >=2.11       &&  <2.15,
+        -- text                  >=1.2.0.6    &&  <1.3,
+        -- time                  >=1.4.2      &&  <1.9,
+        -- unordered-containers  >=0.2.5.1    &&  <0.3,
+        -- vector                >=0.10.12.3  &&  <0.13,
+        -- xml-conduit           >=1.2.6      &&  <1.9
+
     default-language: Haskell2010
     hs-source-dirs: src
+    ghc-options: -Wall -fno-warn-orphans
 
 executable put-metric
     main-is: put-metric.hs
     build-depends:
-        base                  >=4.7.0.2    &&  <4.10,
-        bytestring            >=0.10.4.0   &&  <0.11,
-        text                  >=1.2.0.6    &&  <1.3,
-        optparse-applicative  >=0.11.0.2   &&  <0.13,
-        aws                   >=0.9.4      &&  <0.15,
-        aws-ec2               >=0.3.4      &&  <0.4
+        aws
+        , aws-ec2
+        , base
+        , bytestring
+        , optparse-applicative < 0.15
+        , text
+
+        -- aws                   >=0.9.4      &&  <0.22,
+        -- aws-ec2               >=0.3.8      &&  <0.4,
+        -- base                  >=4.7        &&  <5,
+        -- bytestring            >=0.10.4.0   &&  <0.11,
+        -- optparse-applicative  >=0.11.0.2   &&  <0.15,
+        -- text                  >=1.2.0.6    &&  <1.3
+
     default-language: Haskell2010
     hs-source-dirs: cmd
     ghc-options: -static
 
 executable run-inst
     main-is: run-inst.hs
     build-depends:
-        base                  >=4.7.0.2    &&  <4.10,
-        bytestring            >=0.10.4.0   &&  <0.11,
-        text                  >=1.2.0.6    &&  <1.3,
-        optparse-applicative  >=0.11.0.2   &&  <0.13,
-        aws                   >=0.9.4      &&  <0.15,
-        aws-ec2               >=0.3.4      &&  <0.4,
-        yaml                  >=0.8.12     &&  <0.9,
-        vector                >=0.10.12.3  &&  <0.12,
-        containers            >=0.5.5.1    &&  <0.6,
-        unordered-containers  >=0.2.5.1    &&  <0.3,
-        aeson                 >=0.8.0.2    &&  <0.12
+        aeson
+        , aws
+        , aws-ec2
+        , base
+        , bytestring
+        , containers
+        , optparse-applicative < 0.15
+        , text
+        , unordered-containers
+        , vector
+        , yaml
+
+        -- aeson                 >=0.8.0.2    &&  <1.5,
+        -- aws                   >=0.9.4      &&  <0.22,
+        -- aws-ec2               >=0.3.8      &&  <0.4,
+        -- base                  >=4.7        &&  <5,
+        -- bytestring            >=0.10.4.0   &&  <0.11,
+        -- containers            >=0.5.5.1    &&  <0.7,
+        -- optparse-applicative  >=0.11.0.2   &&  <0.15,
+        -- text                  >=1.2.0.6    &&  <1.3,
+        -- unordered-containers  >=0.2.5.1    &&  <0.3,
+        -- vector                >=0.10.12.3  &&  <0.13,
+        -- yaml                  >=0.8.12     &&  <0.12
+
     default-language: Haskell2010
     hs-source-dirs: cmd
     ghc-options: -static
diff --git a/cmd/put-metric.hs b/cmd/put-metric.hs
@@ -21,6 +21,7 @@ configuration useMetadata = do
       Just cr' -> return Configuration { timeInfo = Timestamp
                                        , credentials = cr'
                                        , logger = defaultLog Warning
+                                       , proxy = Nothing
                                        }
   where
     load = if useMetadata then loadCredentialsFromInstanceMetadata
@@ -57,6 +58,7 @@ main = join $ customExecParser prefs opts
     prefs = ParserPrefs { prefMultiSuffix = ""
                         , prefDisambiguate = True
                         , prefShowHelpOnError = True
+                        , prefShowHelpOnEmpty = True
                         , prefBacktrack = True
                         , prefColumns = 80
                         }

diff --git a/cmd/run-inst.hs b/cmd/run-inst.hs
@@ -27,6 +27,7 @@ configuration useMetadata = do
       Just cr' -> return Configuration { timeInfo = Timestamp
                                        , credentials = cr'
                                        , logger = defaultLog Warning
+                                       , proxy = Nothing
                                        }
   where
     load = if useMetadata then loadCredentialsFromInstanceMetadata
@@ -107,6 +108,7 @@ main = join $ customExecParser prefs opts
     prefs = ParserPrefs { prefMultiSuffix = ""
                         , prefDisambiguate = True
                         , prefShowHelpOnError = True
+                        , prefShowHelpOnEmpty = True
                         , prefBacktrack = True
                         , prefColumns = 80
                         }

diff --git a/src/Aws/Canonical.hs b/src/Aws/Canonical.hs
@@ -13,4 +13,5 @@ canonicalSigData = do
                          , signatureCredentials = Credentials "" "" emptyRef Nothing
                          }
 
+baseTime :: UTCTime
 baseTime = UTCTime (toEnum 0) $ secondsToDiffTime 0
diff --git a/src/Aws/CloudWatch/Commands/PutMetricData.hs b/src/Aws/CloudWatch/Commands/PutMetricData.hs
@@ -10,7 +10,6 @@
 module Aws.CloudWatch.Commands.PutMetricData where
 
 import Data.Text (Text)
-import Data.Monoid
 import Data.Time.Clock (UTCTime)
 import Aws.CloudWatch.Core
 import Aws.CloudWatch.Types

diff --git a/src/Aws/CloudWatch/Types.hs b/src/Aws/CloudWatch/Types.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS -Wno-name-shadowing #-}
 {-# LANGUAGE TemplateHaskell  #-}
 
 module Aws.CloudWatch.Types where

diff --git a/src/Aws/Ec2/Commands/AttachInternetGateway.hs b/src/Aws/Ec2/Commands/AttachInternetGateway.hs
@@ -8,7 +8,7 @@
 
 module Aws.Ec2.Commands.AttachInternetGateway where
 
-import Data.Text (Text, pack, toLower)
+import Data.Text (Text)
 import Aws.Ec2.TH
 
 data AttachInternetGateway = AttachInternetGateway

diff --git a/src/Aws/Ec2/Commands/AttachVolume.hs b/src/Aws/Ec2/Commands/AttachVolume.hs
@@ -9,7 +9,6 @@
 module Aws.Ec2.Commands.AttachVolume where
 
 import Data.Text (Text)
-import Data.Monoid
 import Aws.Ec2.TH
 
 data AttachVolume = AttachVolume

diff --git a/src/Aws/Ec2/Commands/AuthorizeSecurityGroupIngress.hs b/src/Aws/Ec2/Commands/AuthorizeSecurityGroupIngress.hs
@@ -10,7 +10,6 @@ module Aws.Ec2.Commands.AuthorizeSecurityGroupIngress where
 
 import Data.Text (Text)
 import Aws.Ec2.TH
-import Aws.Ec2.Types
 
 data AuthorizeSecurityGroupIngress = AuthorizeSecurityGroupIngress
                { asi_groupId :: Text

diff --git a/src/Aws/Ec2/Commands/CreateTags.hs b/src/Aws/Ec2/Commands/CreateTags.hs
@@ -8,7 +8,7 @@
 
 module Aws.Ec2.Commands.CreateTags where
 
-import Data.Aeson (Value (..), FromJSON, parseJSON)
+import Data.Aeson (FromJSON, parseJSON)
 
 import Aws.Ec2.TH
 import qualified Network.HTTP.Types as HTTP