fix: change logic in bootstrap (option -d), PGPRO-4094

Author: Alexander Popov

mamonsu/lib/default_config.py

@@ -2,15 +2,15 @@
 
 import os
 import logging
-import getpass
+import os
 import mamonsu.lib.platform as platform
 
 
 class PgsqlConfig(object):
 
     @staticmethod
     def default_user():
-        user = os.environ.get('PGUSER') or getpass.getuser() or 'postgres'
+        user = os.environ.get('PGUSER') or os.getlogin() or 'postgres'
         return user
 
     @staticmethod
@@ -40,7 +40,7 @@ def default_app():
 
     @staticmethod
     def default_db():
-        database = os.environ.get('PGDATABASE') or os.environ.get('PGUSER') or getpass.getuser()
+        database = os.environ.get('PGDATABASE') or os.environ.get('PGUSER') or os.getlogin()
         database = database or 'postgres'
         return database
 

mamonsu/tools/bootstrap/start.py

@@ -26,8 +26,8 @@ def __init__(self):
         group.add_option(
             '-d', '--dbname',
             dest='dbname',
-            default=self.default_db(),
-            help='database name to connect to (default: %default)')
+            default=None,
+            help='database name to connect')
         group.add_option(
             '-h', '--host',
             dest='hostname',
@@ -76,6 +76,9 @@ def __init__(self):
             parser.print_help()
             sys.exit(1)
 
+        if not self.args.dbname:
+            self.args.dbname = self.args.username
+
         # apply env
         os.environ['PGUSER'] = self.args.username
         os.environ['PGPASSWORD'] = self.args.password
@@ -145,6 +148,7 @@ def test_db(self, host_pre):
 
 def run_deploy():
     args = Args()
+
     if not args.try_configure_connect_to_pg():
         sys.exit(1)