Merge pull request #104 from codedownio/modernize

Fix build for GHC 9.4 and enable GitHub Actions CI

.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+on: [push]
+name: CI
+jobs:
+  cabal:
+    name: Cabal / GHC ${{ matrix.ghc }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ghc:
+        - "8.10.7"
+        - "9.0.2"
+        - "9.2.8"
+        - "9.4.5"
+    steps:
+    - uses: actions/checkout@v3
+    - uses: haskell/actions/setup@v2
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        cabal-version: '3.8.1.0'
+    - run: cabal build all --enable-tests
+    - run: cabal test all
+
+  stack:
+    name: Stack / GHC ${{ matrix.ghc }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ghc: "8.10.7"
+          yaml: "stack-8.10.7.yaml"
+        - ghc: "9.0.2"
+          yaml: "stack-9.0.2-aeson1.yaml"
+        - ghc: "9.0.2"
+          yaml: "stack-9.0.2-aeson2.yaml"
+        - ghc: "9.2.8"
+          yaml: "stack-9.2.8.yaml"
+        - ghc: "9.4.5"
+          yaml: "stack.yaml"
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: haskell/actions/setup@v2
+      with:
+        ghc-version: ${{ matrix.ghc }}
+        enable-stack: true
+        stack-version: "latest"
+
+    - uses: actions/cache@v3
+      name: Cache ~/.stack
+      with:
+        path: ~/.stack
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.yaml }}
+
+    - name: Build
+      run: |
+        stack build --stack-yaml ${{matrix.yaml}} --system-ghc --test --bench --no-run-tests --no-run-benchmarks
+
+    - name: Test
+      run: |
+        stack test --stack-yaml ${{matrix.yaml}} --system-ghc

README.md

@@ -1,5 +1,6 @@
 # Kubernetes Haskell Client
 
+[![Stack and Cabal](https://github.com/kubernetes-client/haskell/actions/workflows/ci.yml/badge.svg)](https://github.com/kubernetes-client/haskell/actions/workflows/ci.yml)
 [![Build Status](https://travis-ci.org/kubernetes-client/haskell.svg?branch=master)](https://travis-ci.org/kubernetes-client/haskell)
 
 Haskell client for the [kubernetes](http://kubernetes.io/) API.

cabal.project

@@ -0,0 +1,4 @@
+packages:
+  kubernetes
+  kubernetes-client
+  examples

examples/.gitignore

@@ -1,4 +1,3 @@
 dist
 dist-newstyle
-*.cabal
 .stack-work

examples/kubernetes-examples.cabal

@@ -0,0 +1,54 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.34.4.
+--
+-- see: https://github.com/sol/hpack
+
+name:           kubernetes-examples
+version:        0.1.0.1
+synopsis:       Kubernetes examples with Haskell
+description:    Examples to interact with Kubernetes using kubernetes-client and kubernetes-client-core
+category:       Examples, Kubernetes
+maintainer:     Shimin Guo <smguo2001@gmail.com>,
+                Akshay Mankar <itsakshaymankar@gmail.com>
+license:        Apache-2.0
+license-file:   LICENSE
+build-type:     Simple
+
+executable in-cluster
+  main-is: Main.hs
+  other-modules:
+      Paths_kubernetes_examples
+  hs-source-dirs:
+      in-cluster
+  ghc-options: -Wall
+  build-depends:
+      base <5
+    , containers
+    , http-client
+    , http-types
+    , kubernetes-client
+    , kubernetes-client-core
+    , safe-exceptions
+    , stm
+    , text
+  default-language: Haskell2010
+
+executable simple
+  main-is: Main.hs
+  other-modules:
+      Paths_kubernetes_examples
+  hs-source-dirs:
+      simple
+  ghc-options: -Wall
+  build-depends:
+      base <5
+    , containers
+    , http-client
+    , http-types
+    , kubernetes-client
+    , kubernetes-client-core
+    , safe-exceptions
+    , stm
+    , text
+  default-language: Haskell2010

examples/package.yaml

@@ -22,7 +22,7 @@ executables:
     ghc-options:
     - -Wall
 dependencies:
-- base
+- base < 5
 - containers
 - http-client
 - http-types

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
 
@@ -44,13 +44,15 @@ library
   hs-source-dirs:
       src
   ghc-options: -Wall
+  build-tool-depends:
+      hspec-discover:hspec-discover
   build-depends:
       aeson >=1.2 && <3
     , attoparsec >=0.13
     , base >=4.7 && <5.0
     , base64-bytestring
     , bytestring >=0.10
-    , connection >=0.2
+    , connection >=0.3
     , containers >=0.5
     , data-default-class >=0.1
     , either >=5.0
@@ -59,16 +61,17 @@ 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
+    , megaparsec ==9.*
     , 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
@@ -88,13 +91,15 @@ test-suite example
       Paths_kubernetes_client
   hs-source-dirs:
       example
+  build-tool-depends:
+      hspec-discover:hspec-discover
   build-depends:
       aeson >=1.2 && <3
     , attoparsec >=0.13
     , base >=4.7 && <5.0
     , base64-bytestring
     , bytestring >=0.10
-    , connection >=0.2
+    , connection >=0.3
     , containers >=0.5
     , data-default-class >=0.1
     , either >=5.0
@@ -103,17 +108,18 @@ 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
+    , megaparsec ==9.*
     , 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
@@ -138,13 +144,15 @@ test-suite spec
       Paths_kubernetes_client
   hs-source-dirs:
       test
+  build-tool-depends:
+      hspec-discover:hspec-discover
   build-depends:
       aeson >=1.2 && <3
     , attoparsec >=0.13
     , base >=4.7 && <5.0
     , base64-bytestring
     , bytestring >=0.10
-    , connection >=0.2
+    , connection >=0.3
     , containers >=0.5
     , data-default-class >=0.1
     , either >=5.0
@@ -153,20 +161,22 @@ test-suite spec
     , hoauth2 >=1.11 && <=3
     , hspec
     , hspec-attoparsec
+    , hspec-megaparsec
     , 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
+    , megaparsec ==9.*
     , 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

kubernetes-client/package.yaml

@@ -15,6 +15,8 @@ library:
   source-dirs: src
   ghc-options:
   - -Wall
+build-tools:
+  - hspec-discover
 tests:
   spec:
     main: Spec.hs
@@ -23,6 +25,7 @@ tests:
       - kubernetes-client
       - hspec
       - hspec-attoparsec
+      - hspec-megaparsec
       - yaml
       - file-embed
   example:
@@ -39,8 +42,8 @@ dependencies:
   - bytestring >=0.10
   - aeson >=1.2 && <3
   - attoparsec >=0.13
-  - jsonpath >=0.1 && <0.3
-  - connection >=0.2
+  - jsonpath >=0.1 && <0.4
+  - connection >=0.3
   - containers >= 0.5
   - data-default-class >=0.1
   - either >=5.0
@@ -50,14 +53,15 @@ dependencies:
   - http-client-tls >=0.3
   - jose-jwt >=0.8
   - kubernetes-client-core ==0.4.3.0
+  - megaparsec >=9 && <10
   - 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

kubernetes-client/src/Kubernetes/Client/Auth/GCP.hs

@@ -6,7 +6,6 @@ where
 
 import Control.Concurrent.STM
 import Control.Exception.Safe                (Exception, throwM)
-import Data.Attoparsec.Text
 import Data.Either.Combinators
 import Data.Function                         ((&))
 import Data.JSONPath
@@ -126,7 +125,6 @@ parseGCPAuthInfo authInfo = do
         Just expiryText -> Just <$> parseExpiryTime expiryText
     lookupEither key = Map.lookup key authInfo
                        & maybeToRight (GCPAuthMissingInformation $ Text.unpack key)
-    parseK8sJSONPath = parseOnly (k8sJSONPath <* endOfInput)
     readJSONPath key defaultPath =
       maybe (Right defaultPath) parseK8sJSONPath $ Map.lookup key authInfo
 

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