fix compilation

SiriusCourses · Nov 22, 2023 · 08d6eae · 08d6eae
1 parent bad3a5d
commit 08d6eae
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git 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.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -47,7 +47,7 @@ library
   build-tool-depends:
       hspec-discover:hspec-discover
   build-depends:
-      aeson >=2.0 && <3
+      aeson >=1.2 && <3
     , attoparsec >=0.13
     , base >=4.7 && <5.0
     , base64-bytestring
@@ -57,19 +57,20 @@ library
     , data-default-class >=0.1
     , either >=5.0
     , filepath >=1.4
-    , hoauth2 >=2.10
+    , hoauth2 >=1.11 && <=2.3.0
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
+    , jsonpath >=0.1 && <0.3
     , kubernetes-client-core ==0.5.0.0
     , microlens >=0.4
     , mtl >=2.2
-    , oidc-client >=0.7
+    , oidc-client >=0.4
     , pem >=0.2
     , safe-exceptions >=0.1.0.0
     , stm >=2.4
     , streaming-bytestring >=0.1 && <0.3
-    , text >=2.0 && <2.1
+    , text >=0.11 && <1.3
     , time >=1.8
     , timerep >=2.0
     , tls >=1.4.1
@@ -102,10 +103,11 @@ test-suite example
     , data-default-class >=0.1
     , either >=5.0
     , filepath >=1.4
-    , hoauth2 >=2.10.0
+    , hoauth2 >=1.11 && <=2.3.0
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
+    , jsonpath >=0.1 && <0.3
     , kubernetes-client
     , kubernetes-client-core ==0.5.0.0
     , microlens >=0.4
@@ -153,12 +155,13 @@ test-suite spec
     , either >=5.0
     , file-embed
     , filepath >=1.4
-    , hoauth2 >= 2.10
+    , hoauth2 >=1.11 && <=2.3.0
     , hspec
     , hspec-attoparsec
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
+    , jsonpath >=0.1 && <0.3
     , kubernetes-client
     , kubernetes-client-core ==0.5.0.0
     , microlens >=0.4

diff --git a/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs b/kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs
@@ -15,7 +15,6 @@ import Data.Either.Combinators
 import Data.Function                         ((&))
 import Data.Map                              (Map)
 import Data.Maybe
-import Data.Monoid                           ((<>))
 import Data.Text
 import Data.Text.Encoding                    (encodeUtf8)
 import Data.Time.Clock.POSIX                 (getPOSIXTime)
@@ -60,7 +59,7 @@ instance AuthMethod OIDCAuth where
       $ setHeader req [("Authorization", "Bearer " <> (Text.encodeUtf8 token))]
       & L.set rAuthTypesL []
 
-data OIDCGetTokenException = OIDCOAuthException (OAuth2Error OAuth2TokenRequest.Errors)
+data OIDCGetTokenException = OIDCOAuthException OAuth2TokenRequest.TokenResponseError
                            | OIDCURIException URIParseError
                            | OIDCGetTokenException String
   deriving Show

diff --git a/kubernetes/stack.yaml.lock b/kubernetes/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 524996
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml
-    sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0
-  original: lts-14.27
+    sha256: fb634b19f31da06684bb07ce02a20c75a3162138f279b388905b03ebd57bb50f
+    size: 618876
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/6.yaml
+  original: lts-19.6