Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relax the upper bound of data default #115

Merged
merged 3 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tmp-proc-rabbitmq/tmp-proc-rabbitmq.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: tmp-proc-rabbitmq
version: 0.7.0.1
version: 0.7.0.2
synopsis: Launch RabbitMQ in docker using tmp-proc
description:
Demos how to use tmp-proc to run RabbitMQ in docker in a unittest.
Expand All @@ -27,7 +27,7 @@ library
exposed-modules: System.TmpProc.Docker.RabbitMQ
hs-source-dirs: src
build-depends:
, amqp >=0.22.1 && < 0.25
, amqp >=0.22.1 && < 0.24
, base >=4.11 && <5
, bytestring >=0.10.8.2 && <0.12.2
, text >=1.2.3 && <2.2
Expand Down
25 changes: 12 additions & 13 deletions tmp-proc/test/Test/NginxGateway.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ where

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
Expand Down Expand Up @@ -230,15 +229,15 @@ httpsGet handle urlPath = do

-- 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
-- }
2 changes: 1 addition & 1 deletion tmp-proc/tmp-proc.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ test-suite integration-test
, 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
Expand Down
Loading