Try fixing more warnings

codedownio · Jun 17, 2024 · 24f1dd7 · 24f1dd7
1 parent 6c89286
commit 24f1dd7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/kubernetes-client/src/Kubernetes/Client/Auth/GCP.hs b/kubernetes-client/src/Kubernetes/Client/Auth/GCP.hs
@@ -72,8 +72,7 @@ data GCPGetTokenException = GCPCmdProducedInvalidJSON String
 instance Exception GCPGetTokenException
 
 getToken :: GCPAuth -> IO (Either GCPGetTokenException Text)
-getToken auth@(GCPAuth{..}) = getCurrentToken auth
-                              >>= maybe (fetchToken auth) (return . Right)
+getToken auth@(GCPAuth{}) = getCurrentToken auth >>= maybe (fetchToken auth) (return . Right)
 
 getCurrentToken :: GCPAuth -> IO (Maybe Text)
 getCurrentToken (GCPAuth{..}) = do

diff --git a/kubernetes-client/src/Kubernetes/Client/Internal/TLSUtils.hs b/kubernetes-client/src/Kubernetes/Client/Internal/TLSUtils.hs
@@ -7,11 +7,10 @@ import Data.ByteString            (ByteString)
 import Data.Default.Class         (def)
 import Data.Either                (rights)
 import Data.Either.Combinators    (mapLeft)
-import Data.Function              ((&))
 import Data.PEM                   (pemContent, pemParseBS)
 import Data.X509                  (SignedCertificate, decodeSignedCertificate)
 import Data.X509.CertificateStore (CertificateStore, makeCertificateStore)
-import Lens.Micro
+import Lens.Micro                 ((&), (.~), Lens', lens, set)
 import Network.TLS                (Credential, credentialLoadX509FromMemory, defaultParamsClient)
 import System.X509                (getSystemCertificateStore)
 

diff --git a/kubernetes-client/src/Kubernetes/Client/KubeConfig.hs b/kubernetes-client/src/Kubernetes/Client/KubeConfig.hs
@@ -20,13 +20,12 @@ This is a mostly straightforward translation into Haskell, with 'FromJSON' and '
 module Kubernetes.Client.KubeConfig where
 
 import           Data.Aeson     (FromJSON (..), Options, ToJSON (..),
-                                 Value (..), camelTo2, defaultOptions,
+                                 camelTo2, defaultOptions,
                                  fieldLabelModifier, genericParseJSON,
                                  genericToJSON, object, omitNothingFields,
                                  withObject, (.:), (.=))
 import qualified Data.Map       as Map
 import           Data.Proxy
-import           Data.Semigroup ((<>))
 import           Data.Text      (Text)
 import qualified Data.Text      as T
 import           Data.Typeable
@@ -37,6 +36,11 @@ import           GHC.TypeLits
 import qualified Data.Aeson.Key as A
 #endif
 
+#if !MIN_VERSION_base(4,11,0)
+import Data.Monoid                              ((<>))
+#endif
+
+
 camelToWithOverrides :: Char -> Map.Map String String -> Options
 camelToWithOverrides c overrides = defaultOptions
     { fieldLabelModifier = modifier