Fix some warnings

codedownio · Jul 25, 2024 · 0b96905 · 0b96905
1 parent f156da1
commit 0b96905
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 8 deletions.
diff --git a/...xts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/KindCluster/ServiceForwardIngress.hs b/...xts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/KindCluster/ServiceForwardIngress.hs
@@ -35,7 +35,6 @@ import UnliftIO.Timeout
 
 withForwardKubernetesService' :: (
   MonadUnliftIO m, MonadLoggerIO m
-  , MonadReader context m
   ) => KubernetesClusterContext -> FilePath -> Text -> Text -> (URI -> m a) -> m a
 withForwardKubernetesService' (KubernetesClusterContext {kubernetesClusterType=(KubernetesClusterKind {..}), ..}) kubectlBinary namespace service action = do
   baseEnv <- maybe getEnvironment return kindClusterEnvironment

diff --git a/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/MinikubeCluster.hs b/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/MinikubeCluster.hs
@@ -197,7 +197,7 @@ withNewMinikubeCluster minikubeBinary clusterName options@(MinikubeClusterOption
              )
 
 startMinikubeCluster :: (
-  MonadLoggerIO m, MonadReader context m
+  MonadLoggerIO m
   ) => FilePath -> Handle -> String -> String -> MinikubeClusterOptions -> m ProcessHandle
 startMinikubeCluster minikubeBinary logH clusterName minikubeKubeConfigFile (MinikubeClusterOptions {..}) = do
   baseEnv <- getEnvironment

diff --git a/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/Namespace.hs b/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/Namespace.hs
@@ -10,7 +10,6 @@ module Test.Sandwich.Contexts.Kubernetes.Namespace (
 import Control.Monad
 import Control.Monad.Catch (MonadThrow)
 import Control.Monad.IO.Unlift
-import Control.Monad.Trans.Control (MonadBaseControl)
 import qualified Data.List as L
 import Data.String.Interpolate
 import Relude
@@ -25,7 +24,7 @@ import UnliftIO.Process
 -- | Around-style node to create a Kubernetes namespace, and destroy it at the end.
 -- If you're installing something via Helm 3, you may not need this as you can just pass "--create-namespace".
 withKubernetesNamespace :: (
-  MonadUnliftIO m, HasLabel context "kubernetesCluster" KubernetesClusterContext, MonadBaseControl IO m, MonadThrow m
+  MonadUnliftIO m, HasLabel context "kubernetesCluster" KubernetesClusterContext, MonadThrow m
   )
   -- | Namespace to create
   => Text

diff --git a/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/Util/Container.hs b/sandwich-contexts-kubernetes/lib/Test/Sandwich/Contexts/Kubernetes/Util/Container.hs
@@ -19,7 +19,6 @@ module Test.Sandwich.Contexts.Kubernetes.Util.Container (
 import Control.Monad.Catch
 import Control.Monad.IO.Unlift
 import Control.Monad.Logger
-import Control.Monad.Trans.Control (MonadBaseControl)
 import Control.Retry
 import Data.Aeson as A
 import Data.Aeson.TH as A
@@ -57,7 +56,7 @@ isInContainer = do
     || ("systemd" `T.isInfixOf` output)
     || ("bwrap" `T.isInfixOf` output)
 
-waitForHealth :: forall m. (HasCallStack, MonadLoggerIO m, MonadBaseControl IO m, MonadMask m) => ContainerSystem -> Text -> m ()
+waitForHealth :: forall m. (HasCallStack, MonadLoggerIO m, MonadMask m) => ContainerSystem -> Text -> m ()
 waitForHealth containerSystem containerID = do
   let policy = limitRetriesByCumulativeDelay (60 * 1_000_000) $ capDelay 1_000_000 $ exponentialBackoff 1000
   recoverAll policy $ \_ -> do

diff --git a/sandwich-contexts-kubernetes/package.yaml b/sandwich-contexts-kubernetes/package.yaml
@@ -58,7 +58,6 @@ library:
   - kubernetes-client
   - kubernetes-client-core
   - minio-hs
-  - monad-control
   - monad-logger
   - network
   - network-uri

diff --git a/sandwich-contexts-kubernetes/sandwich-contexts-kubernetes.cabal b/sandwich-contexts-kubernetes/sandwich-contexts-kubernetes.cabal
@@ -77,7 +77,6 @@ library
     , kubernetes-client
     , kubernetes-client-core
     , minio-hs
-    , monad-control
     , monad-logger
     , network
     , network-uri