rds-data 0.0.0.2 → 0.0.0.3

raw patch · 5 files changed

+19/−23 lines, 5 files

Files

• app/App/Cli/Run/LocalStack.hs +1/−1
• integration/Test/Data/RdsData/Migration/ConnectionSpec.hs +8/−9
• rds-data.cabal +1/−1
• testlib/Data/RdsData/Polysemy/Test/Cluster.hs +3/−3
• testlib/Data/RdsData/Polysemy/Test/Workspace.hs +6/−9

@@ -111,7 +111,7 @@       STM.atomically $ STM.writeTVar tvRunning True        void $ runLocalTestEnv (pure container) do-        rdsClusterDetails <- createRdsDbCluster (pure container)+        rdsClusterDetails <- createRdsDbCluster "rds_data_migration" (pure container)          runReaderResourceAndSecretArnsFromResponses rdsClusterDetails do           lsEp <- getLocalStackEndpoint container

@@ -37,16 +37,15 @@ -- cabal test rds-data-test --test-options "--pattern \"/RDS integration test/\"" tasty_rds_integration_test :: Tasty.TestTree tasty_rds_integration_test =-  TC.withContainers setupContainers $ \getContainer ->-    H.testProperty "RDS integration test" $ propertyOnce $ localWorkspace $ runLocalTestEnv getContainer $ do-      rdsClusterDetails <- createRdsDbCluster getContainer+  TC.withContainers (setupContainers' "localstack/localstack-pro:3.1.0") $ \getContainer ->+    H.testProperty "RDS integration test" $ propertyOnce $ localWorkspace "rds-data" $ runLocalTestEnv getContainer $ do+      rdsClusterDetails <- createRdsDbCluster "rds_data_migration" getContainer        runReaderResourceAndSecretArnsFromResponses rdsClusterDetails $ do-        id $ do-          initialiseDb-            & trapFail @RdsDataError-            & trapFail @AWS.Error-            & jotShowDataLog @AwsLogEntry+        initialiseDb+          & trapFail @RdsDataError+          & trapFail @AWS.Error+          & jotShowDataLog @AwsLogEntry          migrateUp "db/migration.yaml"           & trapFail @AWS.Error@@ -85,7 +84,7 @@               [ "SELECT table_name"               , "  FROM information_schema.tables"               , "  WHERE table_schema = 'public'"-              , "    AND table_type = 'BASE TABLE';"+              , "    AND table_type = 'BASE TABLE'"               ]           )           & trapFail @AWS.Error

@@ -1,7 +1,7 @@ cabal-version: 3.6  name:                   rds-data-version:                0.0.0.2+version:                0.0.0.3 synopsis:               Codecs for use with AWS rds-data description:            Codecs for use with AWS rds-data. category:               Data

@@ -23,7 +23,6 @@ import           Data.Function import           Data.Generics.Product.Any import           Data.RdsData.Migration.Types              (RdsClusterDetails (RdsClusterDetails))-import           Data.RdsData.Polysemy.Test.Workspace import qualified Data.Text.Encoding                        as T import qualified Data.UUID                                 as UUID import qualified Data.UUID.V4                              as UUID@@ -42,9 +41,10 @@   => Member (Reader AWS.Env) r   => Member Hedgehog r   => Member Resource r-  => IO Container+  => Text+  -> IO Container   -> Sem r RdsClusterDetails-createRdsDbCluster getContainer = withFrozenCallStack do+createRdsDbCluster databaseName getContainer = withFrozenCallStack do   container <- embed getContainer   jotShowM_ $ getLocalStackEndpoint container   jotYamlM_ $ inspectContainer container

@@ -4,26 +4,23 @@ {-# LANGUAGE TypeOperators     #-}  module Data.RdsData.Polysemy.Test.Workspace-  ( databaseName,-    localWorkspace,+  ( localWorkspace,   ) where -import qualified Data.Text                      as Text+import qualified Data.Text                      as T  import           HaskellWorks.Polysemy import           HaskellWorks.Polysemy.Hedgehog import           HaskellWorks.Polysemy.Prelude import           Polysemy                       () -databaseName :: Text-databaseName = "rds_data_migration"- localWorkspace :: ()   => HasCallStack   => Member (Embed IO) r   => Member Hedgehog r   => Member Log r-  => Sem+  => Text+  -> Sem         ( Reader Workspace         : Reader ProjectRoot         : Reader PackagePath@@ -31,11 +28,11 @@         : r)         ()   -> Sem r ()-localWorkspace f =+localWorkspace prefix f =   withFrozenCallStack $ do     cabalProjectDir <- findCabalProjectDir "." -    f & moduleWorkspace (Text.unpack databaseName)+    f & moduleWorkspace (T.unpack prefix)       & runReader (ProjectRoot cabalProjectDir)       & runReader (PackagePath "rds-data")       & runResource