refactor: refactor AWS provider module

vst · May 9, 2024 · f4834c2 · f4834c2
1 parent e5dab16
commit f4834c2
Show file tree

Hide file tree

Showing 7 changed files with 595 additions and 513 deletions.
diff --git a/src/Clompse/Programs/ListObjectBuckets.hs b/src/Clompse/Programs/ListObjectBuckets.hs
@@ -65,11 +65,11 @@ listObjectBucketsForCloudConnection
   => CloudConnection
   -> m [Types.ObjectBucket]
 listObjectBucketsForCloudConnection (CloudConnectionAws conn) = do
-  eBucketsS3 <- runExceptT (Providers.Aws.awsListAllS3Buckets conn)
+  eBucketsS3 <- runExceptT (Providers.Aws.listBucketsS3 conn)
   bucketsS3 <- case eBucketsS3 of
     Left e -> _log ("    ERROR (AWS S3): " <> Z.Text.tshow e) >> pure []
     Right buckets -> pure (fmap (\(n, c) -> Types.ObjectBucket n Types.ProviderAws "s3" (Just c)) buckets)
-  eBucketsLightsail <- runExceptT (Providers.Aws.awsListAllLightsailBuckets conn)
+  eBucketsLightsail <- runExceptT (Providers.Aws.listBucketsLightsail conn)
   bucketsLightsail <- case eBucketsLightsail of
     Left e -> _log ("    ERROR (AWS Lightsail): " <> Z.Text.tshow e) >> pure []
     Right buckets -> pure (fmap (\(n, c) -> Types.ObjectBucket n Types.ProviderAws "lightsail" (Just c)) buckets)

diff --git a/src/Clompse/Programs/ListServers.hs b/src/Clompse/Programs/ListServers.hs
@@ -7,7 +7,6 @@ module Clompse.Programs.ListServers where
 
 import qualified Autodocodec as ADC
 import Clompse.Config (CloudConnection (..), CloudProfile (..), Config (..))
-import qualified Clompse.Providers.Aws as Providers
 import qualified Clompse.Providers.Aws as Providers.Aws
 import qualified Clompse.Providers.Do as Providers.Do
 import qualified Clompse.Providers.Hetzner as Providers.Hetzner
@@ -70,15 +69,15 @@ listServersForCloudConnection
   => CloudConnection
   -> m [Server]
 listServersForCloudConnection (CloudConnectionAws conn) = do
-  eServersEc2 <- runExceptT (Providers.Aws.awsEc2ListAllInstances conn)
+  eServersEc2 <- runExceptT (Providers.Aws.listServersEc2 conn)
   serversEc2 <- case eServersEc2 of
     Left e -> _log ("    ERROR (AWS EC2): " <> Z.Text.tshow e) >> pure []
     Right servers -> pure servers
-  eServersLightsail <- runExceptT (Providers.Aws.awsLightsailListAllInstances conn)
+  eServersLightsail <- runExceptT (Providers.Aws.listServersLightsail conn)
   serversLightsail <- case eServersLightsail of
     Left e -> _log ("    ERROR (AWS Lightsail): " <> Z.Text.tshow e) >> pure []
     Right servers -> pure servers
-  pure (fmap Providers.ec2InstanceToServer serversEc2 <> fmap (uncurry Providers.lightsailInstanceToServer) serversLightsail)
+  pure (serversEc2 <> serversLightsail)
 listServersForCloudConnection (CloudConnectionDo conn) = do
   eServers <- runExceptT (Providers.Do.listServers conn)
   case eServers of