Make cargohold use amazonka instead of aws (#1157)

* squash #483 * remove all usages of aws * support s3DownloadEndpoint config * stack.yaml: pin updated fork of amazonka The update to stack.yaml just takes all amazonka packages from the pinned fork. They depend on core, so need to be rebuilt anyways. We also drop elb, redshift, route53 * depend on OpenSSL again This is mostly done for consistency with the other services. If we want to change it, we should change it everywhere. * remove unnecessary dependencies on binary and blaze-builder * Add comment on how to use cloudfront Co-authored-by: Tiago Loureiro <[email protected]>
wireapp · Jul 14, 2020 · e5fefd6 · e5fefd6
1 parent ee3f808
commit e5fefd6
Show file tree

Hide file tree

Showing 31 changed files with 607 additions and 1,057 deletions.
diff --git a/libs/ropes/package.yaml b/libs/ropes/package.yaml
@@ -18,7 +18,6 @@ library:
   source-dirs: src
   dependencies:
   - aeson >=0.6
-  - aws >=0.10.2
   - base ==4.*
   - exceptions >=0.6
   - http-client >=0.5
@@ -31,34 +30,3 @@ library:
   - time >=1.1
   - tinylog >=0.10.2
   - yaml >=0.8.22
-executables:
-  ropes-aws-auth-test:
-    main: Main.hs
-    source-dirs: test/integration-aws-auth
-    ghc-options:
-    - -threaded
-    dependencies:
-    - base >=4 && <5
-    - aws
-    - http-client
-    - ropes
-    - time
-    - tinylog
-  ropes-aws-test:
-    main: Main.hs
-    source-dirs: test/integration-aws
-    ghc-options:
-    - -threaded
-    dependencies:
-    - base >=4 && <5
-    - aws
-    - exceptions
-    - http-client
-    - http-client-tls
-    - resourcet
-    - ropes
-    - tasty >=0.2
-    - tasty-hunit >=0.2
-    - text >=0.11.3
-    - transformers
-    - tinylog
diff --git a/libs/ropes/ropes.cabal b/libs/ropes/ropes.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 8e1fc11eb8dfecf6b35bf33c8cd612ed3e50f371781a549f8728286a79acb547
+-- hash: d24f5fff02a52bee31f4c44250bf1b220b95113bb66026289808204f560ad4bd
 
 name:           ropes
 version:        0.4.20
@@ -19,8 +19,6 @@ build-type:     Simple
 
 library
   exposed-modules:
-      Ropes.Aws
-      Ropes.Aws.Ses
       Ropes.Nexmo
       Ropes.Twilio
   other-modules:
@@ -31,7 +29,6 @@ library
   ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path
   build-depends:
       aeson >=0.6
-    , aws >=0.10.2
     , base ==4.*
     , bytestring >=0.9
     , errors >=2.0
@@ -50,54 +47,3 @@ library
     , transformers >=0.3
     , yaml >=0.8.22
   default-language: Haskell2010
-
-executable ropes-aws-auth-test
-  main-is: Main.hs
-  other-modules:
-      Paths_ropes
-  hs-source-dirs:
-      test/integration-aws-auth
-  default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns
-  ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded
-  build-depends:
-      aws
-    , base >=4 && <5
-    , bytestring >=0.9
-    , errors >=2.0
-    , http-client
-    , imports
-    , mime-mail >=0.4
-    , ropes
-    , semigroups >=0.11
-    , time
-    , tinylog
-  default-language: Haskell2010
-
-executable ropes-aws-test
-  main-is: Main.hs
-  other-modules:
-      Tests.Ropes.Aws.Ses
-      Paths_ropes
-  hs-source-dirs:
-      test/integration-aws
-  default-extensions: AllowAmbiguousTypes BangPatterns ConstraintKinds DataKinds DefaultSignatures DerivingStrategies DeriveFunctor DeriveGeneric DeriveLift DeriveTraversable EmptyCase FlexibleContexts FlexibleInstances FunctionalDependencies GADTs InstanceSigs KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns NoImplicitPrelude OverloadedStrings PackageImports PatternSynonyms PolyKinds QuasiQuotes RankNTypes ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeFamilies TypeFamilyDependencies TypeOperators UndecidableInstances ViewPatterns
-  ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path -threaded
-  build-depends:
-      aws
-    , base >=4 && <5
-    , bytestring >=0.9
-    , errors >=2.0
-    , exceptions
-    , http-client
-    , http-client-tls
-    , imports
-    , mime-mail >=0.4
-    , resourcet
-    , ropes
-    , semigroups >=0.11
-    , tasty >=0.2
-    , tasty-hunit >=0.2
-    , text >=0.11.3
-    , tinylog
-    , transformers
-  default-language: Haskell2010
diff --git a/libs/ropes/src/Ropes/Aws.hs b/libs/ropes/src/Ropes/Aws.hs
diff --git a/libs/ropes/src/Ropes/Aws/Ses.hs b/libs/ropes/src/Ropes/Aws/Ses.hs