diff --git a/kubernetes-client/kubernetes-client.cabal b/kubernetes-client/kubernetes-client.cabal index e20efd3..c70bf74 100644 --- a/kubernetes-client/kubernetes-client.cabal +++ b/kubernetes-client/kubernetes-client.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.2. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack @@ -51,8 +51,12 @@ library , base >=4.7 && <5.0 , base64-bytestring , bytestring >=0.10 - , connection >=0.2 , containers >=0.5 + , crypton-connection + , crypton-x509 + , crypton-x509-store + , crypton-x509-system + , crypton-x509-validation , data-default-class >=0.1 , either >=5.0 , filepath >=1.4 @@ -78,10 +82,6 @@ library , typed-process >=0.2 , unordered-containers , uri-bytestring >=0.3 - , x509 >=1.7 - , x509-store >=1.6 - , x509-system >=1.6 - , x509-validation >=1.6 , yaml >=0.8.32 default-language: Haskell2010 @@ -98,8 +98,12 @@ test-suite example , base >=4.7 && <5.0 , base64-bytestring , bytestring >=0.10 - , connection >=0.2 , containers >=0.5 + , crypton-connection + , crypton-x509 + , crypton-x509-store + , crypton-x509-system + , crypton-x509-validation , data-default-class >=0.1 , either >=5.0 , filepath >=1.4 @@ -126,10 +130,6 @@ test-suite example , typed-process >=0.2 , unordered-containers , uri-bytestring >=0.3 - , x509 >=1.7 - , x509-store >=1.6 - , x509-system >=1.6 - , x509-validation >=1.6 , yaml >=0.8.32 default-language: Haskell2010 @@ -151,8 +151,12 @@ test-suite spec , base >=4.7 && <5.0 , base64-bytestring , bytestring >=0.10 - , connection >=0.2 , containers >=0.5 + , crypton-connection + , crypton-x509 + , crypton-x509-store + , crypton-x509-system + , crypton-x509-validation , data-default-class >=0.1 , either >=5.0 , file-embed @@ -182,9 +186,5 @@ test-suite spec , typed-process >=0.2 , unordered-containers , uri-bytestring >=0.3 - , x509 >=1.7 - , x509-store >=1.6 - , x509-system >=1.6 - , x509-validation >=1.6 , yaml default-language: Haskell2010 diff --git a/kubernetes-client/package.yaml b/kubernetes-client/package.yaml index 43238f0..63d01df 100644 --- a/kubernetes-client/package.yaml +++ b/kubernetes-client/package.yaml @@ -40,7 +40,7 @@ dependencies: - aeson >=1.2 && <3 - attoparsec >=0.13 - jsonpath >=0.1 && <0.3 - - connection >=0.2 + - crypton-connection - containers >= 0.5 - data-default-class >=0.1 - either >=5.0 @@ -66,8 +66,8 @@ dependencies: - typed-process >=0.2 - unordered-containers - uri-bytestring >=0.3 - - x509 >=1.7 - - x509-system >=1.6 - - x509-store >=1.6 - - x509-validation >=1.6 + - crypton-x509 + - crypton-x509-system + - crypton-x509-store + - crypton-x509-validation - yaml >=0.8.32 diff --git a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs index a24d4d3..f72f9bd 100644 --- a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs +++ b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs @@ -60,7 +60,7 @@ instance AuthMethod OIDCAuth where $ setHeader req [("Authorization", "Bearer " <> (Text.encodeUtf8 token))] & L.set rAuthTypesL [] -data OIDCGetTokenException = OIDCOAuthException TokenRequestError +data OIDCGetTokenException = OIDCOAuthException TokenResponseError | OIDCURIException URIParseError | OIDCGetTokenException String deriving Show diff --git a/stack.yaml b/stack.yaml index 8fe6d7e..a5ed0bc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,5 @@ -resolver: lts-21.9 -compiler: ghc-9.4.6 +resolver: lts-22.20 +compiler: ghc-9.6.4 extra-deps: - jsonpath-0.2.1.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index 35cffc2..53eb259 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -20,7 +20,7 @@ packages: hackage: oidc-client-0.7.0.1 snapshots: - completed: - sha256: 2fc12a405ab6f7eac73eb11a0ca5ccca0e956bd2848db780c140b7406ff9ebb5 - size: 640035 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/9.yaml - original: lts-21.9 + sha256: 4a0e5e187fbef423f9c60072bfb1dd56f2a01a07a2667eb1469bd79073cfceaf + size: 713340 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/20.yaml + original: lts-22.20