feat: aplify conn string for remote database

Author: blaggacao

metadata-store-postgres/src/Cardano/Metadata/Store/Postgres/Config.hs

@@ -8,7 +8,9 @@ import Options.Applicative
 data Opts = Opts
     { optDbName              :: String
     , optDbUser              :: String
-    , optDbHost              :: FilePath
+    , optDbPass              :: String
+    , optDbHost              :: String
+    , optDbPort              :: Warp.Port
     , optDbMetadataTableName :: String
     , optDbConnections       :: Int
     , optServerPort          :: Warp.Port
@@ -19,11 +21,13 @@ parseOpts :: Parser Opts
 parseOpts = Opts
   <$> strOption (long "db" <> metavar "DB_NAME" <> help "Name of the database to store and read metadata from")
   <*> strOption (long "db-user" <> metavar "DB_USER" <> help "User to connect to metadata database with")
+  <*> strOption (long "db-pass" <> metavar "DB_PASS" <> help "Password to connect to metadata database with")
   <*> strOption (long "db-host" <> metavar "DB_HOST" <> showDefault <> value "/run/postgresql" <> help "Host for the metadata database connection")
+  <*> strOption (long "db-port" <> metavar "DB_PORT" <> showDefault <> value 5432 <> help "Port for the metadata database connection")
   <*> strOption (long "db-table" <> metavar "DB_TABLE" <> showDefault <> value "metadata" <> help "Table in the database to store metadata")
   <*> option auto (long "db-conns" <> metavar "INT" <> showDefault <> value 1 <> help "Number of connections to open to the database")
   <*> option auto (short 'p' <> long "port" <> metavar "PORT" <> showDefault <> value 8080 <> help "Port to run the metadata web server on")
 
 pgConnectionString :: Opts -> ConnectionString
-pgConnectionString (Opts { optDbName = dbName, optDbUser = dbUser, optDbHost = dbHost }) =
-  BC.pack $ "host=" <> dbHost <> " dbname=" <> dbName <> " user=" <> dbUser
+pgConnectionString (Opts { optDbName = dbName, optDbUser = dbUser, optDbPass = dbPass, optDbHost = dbHost, optDbPort = dbPort }) =
+  BC.pack $ "host=" <> dbHost <> " dbname=" <> dbName <> " user=" <> dbUser " password=" <> dbPass " port=" <> dbPort

metadata-sync/src/Cardano/Metadata/Sync/Config.hs

@@ -12,6 +12,7 @@ import qualified Data.Text.Encoding as TE
 import Data.Time.Clock ( NominalDiffTime )
 import Database.PostgreSQL.Simple ( Connection )
 import qualified Database.PostgreSQL.Simple as Sql
+import qualified Network.Wai.Handler.Warp as Warp
 import Options.Applicative
     ( Parser
     , ParserInfo
@@ -33,7 +34,9 @@ import qualified Options.Applicative as Opt
 data Opts = Opts
     { optDbName              :: Text
     , optDbUser              :: Text
-    , optDbHost              :: FilePath
+    , optDbPass              :: Text
+    , optDbHost              :: String
+    , optDbPort              :: Warp.Port
     , optDbMetadataTableName :: Text
     , optDbConnections       :: Int
     , optGitURL              :: Text
@@ -45,7 +48,9 @@ parseOpts :: Parser Opts
 parseOpts = Opts
   <$> strOption (long "db" <> metavar "DB_NAME" <> help "Name of the database to store and read metadata from")
   <*> strOption (long "db-user" <> metavar "DB_USER" <> help "User to connect to metadata database with")
+  <*> strOption (long "db-pass" <> metavar "DB_PASS" <> help "Password to connect to metadata database with")
   <*> strOption (long "db-host" <> metavar "DB_HOST" <> showDefault <> value "/run/postgresql" <> help "Host for the metadata database connection")
+  <*> strOption (long "db-port" <> metavar "DB_PORT" <> showDefault <> value 5432 <> help "Port for the metadata database connection")
   <*> strOption (long "db-table" <> metavar "DB_TABLE" <> showDefault <> value "metadata" <> help "Table in the database to store metadata")
   <*> option auto (long "db-conns" <> metavar "INT" <> showDefault <> value 1 <> help "Number of connections to open to the database")
   <*> strOption (long "git-url" <> metavar "GIT_URL" <> help "URL of the metadata registry git repository")
@@ -61,8 +66,8 @@ opts =
     )
 
 pgConnectionString :: Opts -> BC.ByteString
-pgConnectionString (Opts { optDbName = dbName, optDbUser = dbUser, optDbHost = dbHost }) =
-  TE.encodeUtf8 $ "host=" <> T.pack dbHost <> " dbname=" <> dbName <> " user=" <> dbUser
+pgConnectionString (Opts { optDbName = dbName, optDbUser = dbUser, optDbPass = dbPass, optDbHost = dbHost, optDbPort = dbPort }) =
+  TE.encodeUtf8 $ "host=" <> T.pack dbHost <> " dbname=" <> dbName <> " user=" <> dbUser " password=" <> dbPass " port=" <> dbPort
 
 mkConnectionPool
   :: BC.ByteString