Fix some remaining warnings

Author: thomasjm

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

@@ -1,14 +1,18 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards   #-}
 module Kubernetes.Client.Auth.Basic where
 
 import           Data.ByteString.Base64         ( encode )
 import           Data.Function                  ( (&) )
-import           Data.Monoid                    ( (<>) )
 import           Data.Text                      ( Text )
 import           Kubernetes.Client.Auth.Internal.Types
-import           Kubernetes.OpenAPI.Core
 import           Kubernetes.Client.KubeConfig
+import           Kubernetes.OpenAPI.Core
+
+#if !MIN_VERSION_base(4,11,0)
+import Data.Monoid                              ((<>))
+#endif
 
 import qualified Data.Text.Encoding            as T
 import qualified Lens.Micro                    as L

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

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards   #-}
 module Kubernetes.Client.Auth.GCP
@@ -10,7 +11,6 @@ import Data.Either.Combinators
 import Data.Function                         ((&))
 import Data.JSONPath
 import Data.Map                              (Map)
-import Data.Monoid                           ((<>))
 import Data.Text                             (Text)
 import Data.Time.Clock
 import Data.Time.LocalTime
@@ -21,6 +21,10 @@ import Kubernetes.Data.K8sJSONPath
 import Kubernetes.OpenAPI.Core
 import System.Process.Typed
 
+#if !MIN_VERSION_base(4,11,0)
+import Data.Monoid                           ((<>))
+#endif
+
 import qualified Data.Aeson         as Aeson
 import qualified Data.Map           as Map
 import qualified Data.Text          as Text

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

@@ -1,8 +1,8 @@
+{-# LANGUAGE CPP               #-}
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards   #-}
-{-# LANGUAGE LambdaCase        #-}
-{-# LANGUAGE CPP               #-}
 module Kubernetes.Client.Auth.OIDC
   (oidcAuth, OIDCCache, cachedOIDCAuth)
 where
@@ -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)
@@ -31,13 +30,21 @@ import Network.TLS                           as TLS
 import URI.ByteString
 import Web.OIDC.Client.Discovery             as OIDC
 
+#if !MIN_VERSION_base(4,11,0)
+import Data.Monoid                           ((<>))
+#endif
+
 import qualified Data.ByteString                   as BS
 import qualified Data.ByteString.Base64            as B64
 import qualified Data.Map                          as Map
 import qualified Data.Text                         as Text
 import qualified Data.Text.Encoding                as Text
 import qualified Lens.Micro                        as L
+
+#if !MIN_VERSION_hoauth2(2,8,0)
 import qualified Network.OAuth.OAuth2.TokenRequest as OAuth2TokenRequest
+#endif
+
 
 data OIDCAuth = OIDCAuth { issuerURL        :: Text
                          , clientID         :: Text

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

@@ -1,7 +1,7 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 module Kubernetes.Client.Auth.Token where
 
-import           Data.Monoid                    ( (<>) )
 import           Kubernetes.Client.Auth.Internal.Types
 import           Kubernetes.Client.KubeConfig   ( AuthInfo(..) )
 import           Kubernetes.OpenAPI.Core        ( AnyAuthMethod(..)
@@ -11,6 +11,11 @@ import           Kubernetes.OpenAPI.Model       ( AuthApiKeyBearerToken(..) )
 
 import qualified Data.Text                     as T
 
+#if !MIN_VERSION_base(4,11,0)
+import           Data.Monoid                    ( (<>) )
+#endif
+
+
 -- |Detects if token is specified in AuthConfig, if it is configures 'KubernetesClientConfig' with 'AuthApiKeyBearerToken'
 tokenAuth :: DetectAuth
 tokenAuth auth (tlsParams, cfg) = do

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

@@ -1,20 +1,24 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Kubernetes.Client.Auth.TokenFile where
 
 import           Control.Concurrent.STM
 import           Data.Function                  ( (&) )
-import           Data.Monoid                    ( (<>) )
 import           Data.Text                      ( Text )
+import qualified Data.Text                     as T
+import qualified Data.Text.IO                  as T
 import           Data.Time.Clock
 import           Kubernetes.Client.Auth.Internal.Types
+import           Kubernetes.Client.KubeConfig hiding ( token )
 import           Kubernetes.OpenAPI.Core
-import           Kubernetes.Client.KubeConfig
-                                         hiding ( token )
-import qualified Data.Text                     as T
-import qualified Data.Text.IO                  as T
 import qualified Lens.Micro                    as L
 
+#if !MIN_VERSION_base(4,11,0)
+import           Data.Monoid                    ( (<>) )
+#endif
+
+
 data TokenFileAuth = TokenFileAuth { token :: TVar(Maybe Text)
                                    , expiry :: TVar(Maybe UTCTime)
                                    , file :: FilePath

kubernetes-client/src/Kubernetes/Client/Internal/TLSUtils.hs

@@ -12,8 +12,7 @@ import Data.PEM                   (pemContent, pemParseBS)
 import Data.X509                  (SignedCertificate, decodeSignedCertificate)
 import Data.X509.CertificateStore (CertificateStore, makeCertificateStore)
 import Lens.Micro
-import Network.TLS                (Credential, defaultParamsClient)
-import Network.TLS
+import Network.TLS                (Credential, credentialLoadX509FromMemory, defaultParamsClient)
 import System.X509                (getSystemCertificateStore)
 
 import qualified Data.ByteString        as B

kubernetes-client/src/Kubernetes/Client/KubeConfig.hs

@@ -55,6 +55,7 @@ data Config = Config
   , currentContext :: Text
   } deriving (Eq, Generic, Show)
 
+configJSONOptions :: Options
 configJSONOptions = camelToWithOverrides
     '-'
     (Map.fromList [("apiVersion", "apiVersion"), ("authInfos", "users")])
@@ -128,6 +129,7 @@ data AuthInfo = AuthInfo
   , authProvider          :: Maybe AuthProviderConfig
   } deriving (Eq, Generic, Show, Typeable)
 
+authInfoJSONOptions :: Options
 authInfoJSONOptions = camelToWithOverrides
     '-'
     ( Map.fromList

kubernetes-client/src/Kubernetes/Data/K8sJSONPath.hs

@@ -1,16 +1,19 @@
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Kubernetes.Data.K8sJSONPath where
 
 import Control.Applicative  ((<|>))
 import Data.Aeson
 import Data.Aeson.Text
 import Data.Bifunctor
 import Data.JSONPath
-import Data.Monoid     ((<>))
 import Data.Text       as Text
 import Data.Text.Lazy       (toStrict)
 
+#if !MIN_VERSION_base(4,11,0)
+import Data.Monoid ((<>))
+#endif
+
 #if MIN_VERSION_jsonpath(0,3,0)
 import Data.Void (Void)
 import Text.Megaparsec ( Parsec, eof, runParser, some, takeWhile1P )