Almost there with Stackage lts-21.0

Author: thomasjm

Diff for: 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.1.
+-- This file has been generated from package.yaml by hpack version 0.35.2.
 --
 -- see: https://github.com/sol/hpack
 
@@ -61,16 +61,16 @@ library
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
-    , jsonpath >=0.1 && <0.3
+    , jsonpath >=0.1 && <0.4
     , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
     , mtl >=2.2
     , oidc-client >=0.4
     , pem >=0.2
     , safe-exceptions >=0.1.0.0
     , stm >=2.4
-    , streaming-bytestring >=0.1 && <0.3
-    , text >=0.11 && <1.3
+    , streaming-bytestring >=0.1 && <0.4
+    , text >=0.11 && <3
     , time >=1.8
     , timerep >=2.0
     , tls >=1.4.1
@@ -107,7 +107,7 @@ test-suite example
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
-    , jsonpath >=0.1 && <0.3
+    , jsonpath >=0.1 && <0.4
     , kubernetes-client
     , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
@@ -116,8 +116,8 @@ test-suite example
     , pem >=0.2
     , safe-exceptions >=0.1.0.0
     , stm >=2.4
-    , streaming-bytestring >=0.1 && <0.3
-    , text >=0.11 && <1.3
+    , streaming-bytestring >=0.1 && <0.4
+    , text >=0.11 && <3
     , time >=1.8
     , timerep >=2.0
     , tls >=1.4.1
@@ -162,7 +162,7 @@ test-suite spec
     , http-client >=0.5 && <0.8
     , http-client-tls >=0.3
     , jose-jwt >=0.8
-    , jsonpath >=0.1 && <0.3
+    , jsonpath >=0.1 && <0.4
     , kubernetes-client
     , kubernetes-client-core ==0.4.3.0
     , microlens >=0.4
@@ -171,8 +171,8 @@ test-suite spec
     , pem >=0.2
     , safe-exceptions >=0.1.0.0
     , stm >=2.4
-    , streaming-bytestring >=0.1 && <0.3
-    , text >=0.11 && <1.3
+    , streaming-bytestring >=0.1 && <0.4
+    , text >=0.11 && <3
     , time >=1.8
     , timerep >=2.0
     , tls >=1.4.1

Diff for: kubernetes-client/package.yaml

@@ -41,7 +41,7 @@ dependencies:
   - bytestring >=0.10
   - aeson >=1.2 && <3
   - attoparsec >=0.13
-  - jsonpath >=0.1 && <0.3
+  - jsonpath >=0.1 && <0.4
   - connection >=0.2
   - containers >= 0.5
   - data-default-class >=0.1
@@ -58,8 +58,8 @@ dependencies:
   - pem >=0.2
   - safe-exceptions >=0.1.0.0
   - stm >=2.4
-  - streaming-bytestring >= 0.1 && < 0.3
-  - text >=0.11 && <1.3
+  - streaming-bytestring >= 0.1 && < 0.4
+  - text >=0.11 && <3
   - time >=1.8
   - timerep >=2.0
   - tls >=1.4.1

Diff for: kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs

@@ -60,9 +60,14 @@ instance AuthMethod OIDCAuth where
       $ setHeader req [("Authorization", "Bearer " <> (Text.encodeUtf8 token))]
       & L.set rAuthTypesL []
 
-data OIDCGetTokenException = OIDCOAuthException (OAuth2Error OAuth2TokenRequest.Errors)
-                           | OIDCURIException URIParseError
-                           | OIDCGetTokenException String
+data OIDCGetTokenException =
+#if MIN_VERSION_hoauth2(2,8,0)
+  OIDCOAuthException TokenRequestError
+#else
+  OIDCOAuthException (OAuth2Error OAuth2TokenRequest.Errors)
+#endif
+  | OIDCURIException URIParseError
+  | OIDCGetTokenException String
   deriving Show
 instance Exception OIDCGetTokenException
 

Diff for: kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs

@@ -1,16 +1,17 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
 module Kubernetes.Data.K8sJSONPath where
 
+import Control.Applicative  ((<|>))
 import Data.Aeson
 import Data.Aeson.Text
+import Data.Attoparsec.Text ( many1, char, takeWhile1, Parser )
 import Data.JSONPath
 import Data.Monoid     ((<>))
 import Data.Text       as Text
-
-import Control.Applicative  ((<|>))
-import Data.Attoparsec.Text
 import Data.Text.Lazy       (toStrict)
 
+
 data K8sPathElement = PlainText Text
                     | JSONPath [JSONPathElement]
   deriving  (Show, Eq)
@@ -25,7 +26,11 @@ plainTextParser :: Parser K8sPathElement
 plainTextParser = PlainText <$> takeWhile1 (/= '{')
 
 jsonpathParser :: Parser K8sPathElement
+#if MIN_VERSION_jsonpath(0,3,0)
+jsonpathParser = JSONPath <$> (char '{' *> jsonPath undefined <* char '}')
+#else
 jsonpathParser = JSONPath <$> (char '{' *> jsonPath <* char '}')
+#endif
 
 runJSONPath :: [K8sPathElement] -> Value -> Either String Text
 runJSONPath [] _ = pure ""
@@ -38,10 +43,15 @@ runPathElement :: K8sPathElement -> Value -> Either String Text
 runPathElement (PlainText t) _ = pure t
 runPathElement (JSONPath p) v  = encodeResult $ executeJSONPath p v
 
+#if MIN_VERSION_jsonpath(0,3,0)
+encodeResult :: [Value] -> Either String Text
+encodeResult  vals = return $ (intercalate " " $ Prelude.map jsonToText vals)
+#else
 encodeResult :: ExecutionResult Value -> Either String Text
 encodeResult (ResultValue val) = return $ jsonToText val
 encodeResult (ResultList vals) = return $ (intercalate " " $ Prelude.map jsonToText vals)
 encodeResult (ResultError err) = Left err
+#endif
 
 jsonToText :: Value -> Text
 jsonToText (String t) = t

Diff for: kubernetes/kubernetes-client-core.cabal

@@ -43,7 +43,7 @@ library
     , containers >=0.5.0.0 && <0.8
     , deepseq >= 1.4 && <1.6
     , exceptions >= 0.4
-    , http-api-data >= 0.3.4 && <0.5
+    , http-api-data >= 0.3.4 && <0.6
     , http-client >=0.5 && <0.8
     , http-client-tls
     , http-media >= 0.4 && < 0.9
@@ -54,11 +54,11 @@ library
     , network >=2.6.2 && <3.9
     , random >=1.1
     , safe-exceptions <0.2
-    , text >=0.11 && <1.3
+    , text >=0.11 && <3
     , time >=1.5
     , transformers >=0.4.0.0
     , unordered-containers
-    , vector >=0.10.9 && <0.13
+    , vector >=0.10.9 && <0.14
   other-modules:
       Paths_kubernetes_client_core
       Kubernetes.OpenAPI.ImportMappings

Diff for: stack.yaml

@@ -1,9 +1,4 @@
-resolver: lts-20.11
-compiler: ghc-9.2.5
-
-extra-deps:
-- jsonpath-0.2.1.0
-- oidc-client-0.7.0.1
+resolver: lts-21.0
 
 packages:
 - kubernetes

Diff for: stack.yaml.lock

@@ -3,24 +3,10 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages:
-- completed:
-    hackage: jsonpath-0.2.1.0@sha256:0a16677ca023ce46344d0f4812e076578f7b21fc0bec6a21fda227b7b33e1447,1929
-    pantry-tree:
-      sha256: b477413421c0856e2ac2ba85f7308fe1192d7a9f9ec7c1f4be3de3c0d4cf6de5
-      size: 1097
-  original:
-    hackage: jsonpath-0.2.1.0
-- completed:
-    hackage: oidc-client-0.7.0.1@sha256:557341f7521e62c09abddf0d06c8e8acce119d3a9a4c4ffac1ab8ca3fc0e5067,3382
-    pantry-tree:
-      sha256: 51cfcd6c170923db24ba297ac9937961f6b26e041ceec8ff09500e61017b433b
-      size: 1298
-  original:
-    hackage: oidc-client-0.7.0.1
+packages: []
 snapshots:
 - completed:
-    sha256: adbc602422dde10cc330175da7de8609e70afc41449a7e2d6e8b1827aa0e5008
-    size: 649342
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/11.yaml
-  original: lts-20.11
+    sha256: 1867d84255dff8c87373f5dd03e5a5cb1c10a99587e26c8793e750c54e83ffdc
+    size: 639139
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/0.yaml
+  original: lts-21.0