tmp-proc 0.7.1.0 → 0.7.2.0

raw patch · 4 files changed

+21/−31 lines, 4 filesdep ~data-default

Dependency ranges changed: data-default

Files

• ChangeLog.md +4/−0
• test/Test/NginxGateway.hs +12/−13
• test/Test/SimpleServer.hs +3/−16
• tmp-proc.cabal +2/−2

@@ -2,6 +2,10 @@  `tmp-proc` uses [PVP Versioning][1]. +## 0.7.2.0 -- 2024-11-05++* Relax the upper version bounds of data-default+ ## 0.7.1.0 -- 2024-05-29  * Relax the upper version bounds of crypton-connection to allow 0.4

@@ -23,7 +23,6 @@  import qualified Data.ByteString.Char8 as C8 import Data.Data (Proxy (..))-import Data.Default (Default (..)) import Data.List (find) import Data.Text (Text) import qualified Data.Text as Text@@ -230,15 +229,15 @@  -- currently unused, since the server specified in ClientParams for SNI is -- overridden by Connection, which resets it to the connection hostname-_mkClientParams :: HostName -> IO ClientParams-_mkClientParams server = do-  cs <- getSystemCertificateStore-  pure $-    (defaultParamsClient server "")-      { clientSupported =-          def-            { supportedCiphers = ciphersuite_default-            }-      , clientShared = def {sharedCAStore = cs}-      , clientUseServerNameIndication = True-      }+-- _mkClientParams :: HostName -> IO ClientParams+-- _mkClientParams server = do+--   cs <- getSystemCertificateStore+--   pure $+--     (defaultParamsClient server "")+--       { clientSupported =+--           def+--             { supportedCiphers = ciphersuite_default+--             }+--       , clientShared = def {sharedCAStore = cs}+--       , clientUseServerNameIndication = True+--       }

@@ -10,20 +10,13 @@  import Data.Text (Text) import qualified Data.Text as Text-import qualified Network.Connection as HC+import Network.Connection.CPP (noCheckSettings) import qualified Network.HTTP.Client as HC import Network.HTTP.Client.TLS (mkManagerSettings) import Network.HTTP.Types.Status (statusCode) import qualified Network.Wai.Handler.Warp as Warp  --- -- | The settings used in the integration tests--- defaultTLSSettings :: IO Warp.TLSSettings--- defaultTLSSettings =---   Warp.tlsSettings---  <$> (getDataFileName "test_certs/certificate.pem")---  <*> (getDataFileName "test_certs/key.pem")- -- | Determine the status from a Get on localhost. statusOfGet :: Warp.Port -> Text -> IO Int statusOfGet p urlPath = do@@ -34,17 +27,11 @@   statusCode . HC.responseStatus <$> HC.httpLbs theReq manager  --- | Determine the status from a Get on localhost.+-- | Determine the status from a secure Get on localhost. statusOfGet' :: Warp.Port -> Text -> IO Int statusOfGet' p urlPath = do   let theUri = "GET https://localhost/" <> Text.dropWhile (== '/') urlPath-  manager <- mkSimpleTLSManager+  manager <- HC.newManager $ mkManagerSettings noCheckSettings Nothing   getReq <- HC.parseRequest $ Text.unpack theUri   let theReq = getReq {HC.port = p}   statusCode . HC.responseStatus <$> HC.httpLbs theReq manager---mkSimpleTLSManager :: IO HC.Manager-mkSimpleTLSManager =-  HC.newManager $-    mkManagerSettings (HC.TLSSettingsSimple True False False) Nothing

@@ -1,6 +1,6 @@ cabal-version:      3.0 name:               tmp-proc-version:            0.7.1.0+version:            0.7.2.0 synopsis:           Run 'tmp' processes in integration tests description:   @tmp-proc@ runs services in docker containers for use in integration tests.@@ -86,7 +86,7 @@     , bytestring     , crypton-connection    >=0.3 && <0.5     , crypton-x509-system   >=1.6 && <1.8-    , data-default          >=0.5 && <0.8+    , data-default          >=0.5 && <0.9     , directory             >=1.3 && <1.4     , filepath              >=1.4 && <1.6     , hspec                 >=2.7 && <2.12