Skip to content

Commit 24f1dd7

Browse files
committed
Try fixing more warnings
1 parent 6c89286 commit 24f1dd7

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ data GCPGetTokenException = GCPCmdProducedInvalidJSON String
7272
instance Exception GCPGetTokenException
7373

7474
getToken :: GCPAuth -> IO (Either GCPGetTokenException Text)
75-
getToken auth@(GCPAuth{..}) = getCurrentToken auth
76-
>>= maybe (fetchToken auth) (return . Right)
75+
getToken auth@(GCPAuth{}) = getCurrentToken auth >>= maybe (fetchToken auth) (return . Right)
7776

7877
getCurrentToken :: GCPAuth -> IO (Maybe Text)
7978
getCurrentToken (GCPAuth{..}) = do

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ import Data.ByteString (ByteString)
77
import Data.Default.Class (def)
88
import Data.Either (rights)
99
import Data.Either.Combinators (mapLeft)
10-
import Data.Function ((&))
1110
import Data.PEM (pemContent, pemParseBS)
1211
import Data.X509 (SignedCertificate, decodeSignedCertificate)
1312
import Data.X509.CertificateStore (CertificateStore, makeCertificateStore)
14-
import Lens.Micro
13+
import Lens.Micro ((&), (.~), Lens', lens, set)
1514
import Network.TLS (Credential, credentialLoadX509FromMemory, defaultParamsClient)
1615
import System.X509 (getSystemCertificateStore)
1716

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ This is a mostly straightforward translation into Haskell, with 'FromJSON' and '
2020
module Kubernetes.Client.KubeConfig where
2121

2222
import Data.Aeson (FromJSON (..), Options, ToJSON (..),
23-
Value (..), camelTo2, defaultOptions,
23+
camelTo2, defaultOptions,
2424
fieldLabelModifier, genericParseJSON,
2525
genericToJSON, object, omitNothingFields,
2626
withObject, (.:), (.=))
2727
import qualified Data.Map as Map
2828
import Data.Proxy
29-
import Data.Semigroup ((<>))
3029
import Data.Text (Text)
3130
import qualified Data.Text as T
3231
import Data.Typeable
@@ -37,6 +36,11 @@ import GHC.TypeLits
3736
import qualified Data.Aeson.Key as A
3837
#endif
3938

39+
#if !MIN_VERSION_base(4,11,0)
40+
import Data.Monoid ((<>))
41+
#endif
42+
43+
4044
camelToWithOverrides :: Char -> Map.Map String String -> Options
4145
camelToWithOverrides c overrides = defaultOptions
4246
{ fieldLabelModifier = modifier

0 commit comments

Comments
 (0)