Merge pull request haskell-github#419 from robbiemcmichael/samples-openssl-flag

phadej · web-flow · commit e4d0b9f2957d · 2019-12-14T18:25:03.000+02:00
Add openssl flag to samples
diff --git a/cabal.project b/cabal.project
@@ -8,3 +8,4 @@ constraints: hashable ^>=1.3
 constraints: semigroups ^>=0.19
 
 constraints: github +openssl
+constraints: github-samples +openssl
diff --git a/samples/Operational/Operational.hs b/samples/Operational/Operational.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE DataKinds         #-}
 {-# LANGUAGE GADTs             #-}
 {-# LANGUAGE OverloadedStrings #-}
@@ -9,11 +10,17 @@ import Prelude ()
 import Control.Monad.Operational
 import Control.Monad.Trans.Except  (ExceptT (..), runExceptT)
 import Network.HTTP.Client         (Manager, newManager, ManagerSettings)
+
+#ifdef MIN_VERSION_http_client_tls
+import Network.HTTP.Client.TLS (tlsManagerSettings)
+#else
 import Network.HTTP.Client.OpenSSL (opensslManagerSettings, withOpenSSL)
 
-import qualified GitHub                   as GH
 import qualified OpenSSL.Session          as SSL
 import qualified OpenSSL.X509.SystemStore as SSL
+#endif
+
+import qualified GitHub                   as GH
 
 data R a where
     R :: FromJSON a => GH.Request 'GH.RA a -> R a
@@ -42,6 +49,10 @@ main = withOpenSSL $ do
                 githubRequest $ GH.ownerInfoForR (GH.simpleOwnerLogin . GH.repoOwner $ repo)
             print owner
 
+#ifdef MIN_VERSION_http_client_tls
+withOpenSSL :: IO a -> IO a
+withOpenSSL = id
+#else
 tlsManagerSettings :: ManagerSettings
 tlsManagerSettings = opensslManagerSettings $ do
     ctx <- SSL.context
@@ -52,3 +63,4 @@ tlsManagerSettings = opensslManagerSettings $ do
     SSL.contextLoadSystemCerts ctx
     SSL.contextSetVerificationMode ctx $ SSL.VerifyPeer True True Nothing
     return ctx
+#endif
diff --git a/samples/github-samples.cabal b/samples/github-samples.cabal
@@ -17,6 +17,11 @@ tested-with:
    || ==8.6.5
    || ==8.8.1
 
+flag openssl
+  description: "Use http-client-openssl"
+  manual:  True
+  default: False
+
 library
   hs-source-dirs:   src
   ghc-options:      -Wall
@@ -38,15 +43,22 @@ executable github-operational
     , base-compat-batteries
     , github
     , github-samples
-    , HsOpenSSL
-    , HsOpenSSL-x509-system
     , http-client
-    , http-client-openssl
     , operational
     , text
     , transformers
     , transformers-compat
 
+  if flag(openssl)
+    build-depends:
+        HsOpenSSL
+      , HsOpenSSL-x509-system
+      , http-client-openssl
+
+  else
+    build-depends:
+        http-client-tls
+
   default-language: Haskell2010
 
 common deps

Original file line number	Diff line number	Diff line change
`@@ -8,3 +8,4 @@ constraints: hashable ^>=1.3`
`8`	`8`	`constraints: semigroups ^>=0.19`
`9`	`9`
`10`	`10`	`constraints: github +openssl`
	`11`	`+constraints: github-samples +openssl`