issue with password field

This commit is contained in:
andrei 2022-03-24 15:41:15 +02:00
parent 14830bd4b7
commit 8b8caa6ad7
6 changed files with 17 additions and 18 deletions

View File

@ -17,7 +17,6 @@ logger = logging.getLogger(__name__)
def Connection(host: str = None, port: int = None, login: str = None, password: str = None, backend: str = None, def Connection(host: str = None, port: int = None, login: str = None, password: str = None, backend: str = None,
**kwargs): **kwargs):
# TODO To add parser for **kwargs, when mongodb is used
backend = backend backend = backend
if not backend and kwargs and kwargs["backend"]: if not backend and kwargs and kwargs["backend"]:
backend = kwargs["backend"] backend = kwargs["backend"]
@ -31,10 +30,11 @@ def Connection(host: str = None, port: int = None, login: str = None, password:
port = port or Config().get()['database']['port'] if not kwargs.get("port") else kwargs["port"] port = port or Config().get()['database']['port'] if not kwargs.get("port") else kwargs["port"]
login = login or Config().get()["database"]["login"] if not kwargs.get("login") else kwargs["login"] login = login or Config().get()["database"]["login"] if not kwargs.get("login") else kwargs["login"]
password = password or Config().get()["database"]["password"] password = password or Config().get()["database"]["password"]
if backend == "tarantool_db": if backend == "tarantool_db":
modulepath, _, class_name = BACKENDS[backend].rpartition('.') modulepath, _, class_name = BACKENDS[backend].rpartition('.')
Class = getattr(import_module(modulepath), class_name) Class = getattr(import_module(modulepath), class_name)
print("LOGIN " + str(login))
print("PASSWORD " + str(password))
return Class(host=host, port=port, user=login, password=password) return Class(host=host, port=port, user=login, password=password)
elif backend == "localmongodb": elif backend == "localmongodb":
modulepath, _, class_name = BACKENDS[backend].rpartition('.') modulepath, _, class_name = BACKENDS[backend].rpartition('.')

View File

@ -8,7 +8,7 @@
from functools import singledispatch from functools import singledispatch
import logging import logging
import planetmint from planetmint.config import Config
from planetmint.backend.connection import Connection from planetmint.backend.connection import Connection
from planetmint.common.exceptions import ValidationError from planetmint.common.exceptions import ValidationError
from planetmint.common.utils import validate_all_values_for_key_in_obj, validate_all_values_for_key_in_list from planetmint.common.utils import validate_all_values_for_key_in_obj, validate_all_values_for_key_in_list

View File

@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
class TarantoolDB: class TarantoolDB:
def __init__(self, host: str = "localhost", port: int = 3301, user: str = "guest", password: str = "", def __init__(self, host: str = None, port: int = None, user: str = None, password: str = None,
reset_database: bool = False): reset_database: bool = False):
self.host = host self.host = host
self.port = port self.port = port

View File

@ -35,6 +35,7 @@ from planetmint.tendermint_utils import public_key_from_base64
from planetmint.commands.election_types import elections from planetmint.commands.election_types import elections
from planetmint.version import __tm_supported_versions__ from planetmint.version import __tm_supported_versions__
from planetmint.config import Config from planetmint.config import Config
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -72,15 +73,15 @@ def run_configure(args):
if want != 'y': if want != 'y':
return return
Config().init_config( args.backend ) Config().init_config(args.backend)
conf = Config().get() conf = Config().get()
# select the correct config defaults based on the backend # select the correct config defaults based on the backend
print('Generating default configuration for backend {}' print('Generating default configuration for backend {}'
.format(args.backend), file=sys.stderr) .format(args.backend), file=sys.stderr)
database_keys = Config().get_db_key_map( args.backend ) database_keys = Config().get_db_key_map(args.backend)
if not args.yes: if not args.yes:
for key in ('bind', ): for key in ('bind',):
val = conf['server'][key] val = conf['server'][key]
conf['server'][key] = input_on_stderr('API Server {}? (default `{}`): '.format(key, val), val) conf['server'][key] = input_on_stderr('API Server {}? (default `{}`): '.format(key, val), val)
@ -244,9 +245,9 @@ def run_election_show(args, planet):
def _run_init(): def _run_init():
#bdb = planetmint.Planetmint() # bdb = planetmint.Planetmint()
#schema.init_database(connection=bdb.connection) # schema.init_database(connection=bdb.connection)
init_tarantool() init_tarantool()
@ -269,7 +270,6 @@ def run_drop(args):
drop_tarantool() drop_tarantool()
def run_recover(b): def run_recover(b):
rollback(b) rollback(b)
@ -324,7 +324,7 @@ def create_parser():
const='tarantool_db', const='tarantool_db',
nargs='?', nargs='?',
help='The backend to use. It can only be ' help='The backend to use. It can only be '
'"tarantool_db", currently.') '"tarantool_db", currently.')
# parser for managing elections # parser for managing elections
election_parser = subparsers.add_parser('election', election_parser = subparsers.add_parser('election',

View File

@ -66,8 +66,8 @@ class Config(metaclass=Singleton):
'port': 3301, 'port': 3301,
"connect_now": True, "connect_now": True,
"encoding": "utf-8", "encoding": "utf-8",
"login": "guest", "login": "planetmint",
'password': None, 'password': "planet_user",
"service": "tarantoolctl connect", "service": "tarantoolctl connect",
"init_config": self.__private_init_config, "init_config": self.__private_init_config,
"drop_config": self.__private_drop_config, "drop_config": self.__private_drop_config,
@ -99,7 +99,6 @@ class Config(metaclass=Singleton):
'port': 26657, 'port': 26657,
'version': 'v0.31.5', # look for __tm_supported_versions__ 'version': 'v0.31.5', # look for __tm_supported_versions__
}, },
# TODO Maybe remove hardcode configs for tarantool (review)
'database': self.__private_database_map, 'database': self.__private_database_map,
'log': { 'log': {
'file': log_config['handlers']['file']['filename'], 'file': log_config['handlers']['file']['filename'],

View File

@ -77,7 +77,7 @@ class Planetmint(object):
else: else:
self.validation = BaseValidationRules self.validation = BaseValidationRules
# planetmint.backend.tarantool.connection_tarantool.connect(**Config().get()['database']) # planetmint.backend.tarantool.connection_tarantool.connect(**Config().get()['database'])
self.connection = connection if connection else planetmint.backend.Connection().get_connection() self.connection = connection if connection is not None else planetmint.backend.Connection().get_connection()
def post_transaction(self, transaction, mode): def post_transaction(self, transaction, mode):
"""Submit a valid transaction to the mempool.""" """Submit a valid transaction to the mempool."""