Fix a Data.Yaml deprecation warning

codedownio · Jun 18, 2024 · f2b0fa5 · f2b0fa5
1 parent daf54bf
commit f2b0fa5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/kubernetes-client/kubernetes-client.cabal b/kubernetes-client/kubernetes-client.cabal
@@ -199,7 +199,7 @@ test-suite spec
     , tls >=1.4.1
     , typed-process >=0.2
     , uri-bytestring >=0.3
-    , yaml
+    , yaml >=0.8.4
   default-language: Haskell2010
   if impl(ghc >= 9.6)
     build-depends:

diff --git a/kubernetes-client/package.yaml b/kubernetes-client/package.yaml
@@ -26,7 +26,7 @@ tests:
       - hspec
       - hspec-attoparsec
       - hspec-megaparsec
-      - yaml
+      - yaml >= 0.8.4
       - file-embed
   example:
     main: App.hs

diff --git a/kubernetes-client/test/Kubernetes/Client/KubeConfigSpec.hs b/kubernetes-client/test/Kubernetes/Client/KubeConfigSpec.hs
@@ -4,8 +4,8 @@ module Kubernetes.Client.KubeConfigSpec where
 
 import           Data.Aeson                   (decode, encode, parseJSON,
                                                toJSON)
-import           Data.Maybe                   (fromJust)
-import           Data.Yaml                    (decodeFile)
+import           Data.Either                  (fromRight)
+import           Data.Yaml                    (decodeFileEither)
 import           Kubernetes.Client.KubeConfig (AuthInfo (..), Cluster (..),
                                                Config, Context (..),
                                                getAuthInfo, getCluster,
@@ -15,11 +15,13 @@ import           Test.Hspec
 spec :: Spec
 spec = do
   let getConfig :: IO Config
-      getConfig = fromJust <$> decodeFile "test/testdata/kubeconfig.yaml"
+      getConfig = fromRight (error "Couldn't decode config") <$> decodeFileEither "test/testdata/kubeconfig.yaml"
+
   describe "FromJSON and ToJSON instances" $ do
     it "roundtrips successfully" $ do
       config <- getConfig
       decode (encode (toJSON config)) `shouldBe` Just config
+
   describe "getContext" $ do
     it "returns the correct context" $ do
       config <- getConfig