@ -337,16 +337,19 @@ def config_import(verbose=0, secrets=False, quiet=False, color=False, update=Fal
"""
"""
# verbose
# verbose
# 0 : show number of changes
# 0 : only show number of changes
# 1 : also show changes
# 1 : also show detailed changes
# 2 : also show secrets
# 2 : also show input data
# 3 : also show input data
# 3 : also show sql queries (also needs -s, as sql may contain secrets)
# 4 : also show sql queries
# 4 : also show tracebacks (also needs -s, as tracebacks may contain secrets)
# 5 : also show tracebacks
if quiet :
if quiet :
verbose = - 1
verbose = - 1
if verbose > 2 and not secrets :
print ( ' [Warning] Verbosity level capped to 2. Specify --secrets to log sql and tracebacks. ' )
verbose = 2
color_cfg = {
color_cfg = {
' color ' : color or sys . stdout . isatty ( ) ,
' color ' : color or sys . stdout . isatty ( ) ,
' lexer ' : ' python ' ,
' lexer ' : ' python ' ,
@ -376,7 +379,7 @@ def config_import(verbose=0, secrets=False, quiet=False, color=False, update=Fal
fmt = f ' - {{ :< { max ( [ len ( loc ) for loc , msg in res ] ) } }} : {{ }} '
fmt = f ' - {{ :< { max ( [ len ( loc ) for loc , msg in res ] ) } }} : {{ }} '
res = [ fmt . format ( loc , msg ) for loc , msg in res ]
res = [ fmt . format ( loc , msg ) for loc , msg in res ]
num = f ' error { [ " s " , " " ] [ len ( res ) == 1 ] } '
num = f ' error { [ " s " , " " ] [ len ( res ) == 1 ] } '
res . insert ( 0 , f ' [ValidationError] { len ( res ) } { num } occur ed during input validation' )
res . insert ( 0 , f ' [ValidationError] { len ( res ) } { num } occur r ed during input validation' )
return ' \n ' . join ( res )
return ' \n ' . join ( res )
@ -484,7 +487,7 @@ def config_import(verbose=0, secrets=False, quiet=False, color=False, update=Fal
if backref is not None :
if backref is not None :
log ( ' Modified ' , item , ' {target!r} {key} : {before!r} -> {after!r} ' . format ( * * backref ) )
log ( ' Modified ' , item , ' {target!r} {key} : {before!r} -> {after!r} ' . format ( * * backref ) )
return
return
# verbose ?
# show input data ?
if not verbose > = 2 :
if not verbose > = 2 :
return
return
# hide secrets in data
# hide secrets in data
@ -532,7 +535,7 @@ def config_import(verbose=0, secrets=False, quiet=False, color=False, update=Fal
except ValidationError as exc :
except ValidationError as exc :
raise click . ClickException ( format_errors ( exc . messages ) ) from exc
raise click . ClickException ( format_errors ( exc . messages ) ) from exc
except Exception as exc :
except Exception as exc :
if verbose > = 5 :
if verbose > = 3 :
raise
raise
# (yaml.scanner.ScannerError, UnicodeDecodeError, ...)
# (yaml.scanner.ScannerError, UnicodeDecodeError, ...)
raise click . ClickException (
raise click . ClickException (
@ -584,7 +587,7 @@ def config_export(full=False, secrets=False, color=False, dns=False, output=None
if only :
if only :
for spec in only :
for spec in only :
if spec . split ( ' . ' , 1 ) [ 0 ] not in MailuSchema . Meta . order :
if spec . split ( ' . ' , 1 ) [ 0 ] not in MailuSchema . Meta . order :
raise click . ClickException ( f ' [ ERROR ] Unknown section: { spec } ' )
raise click . ClickException ( f ' [ ValidationError ] Unknown section: { spec } ' )
else :
else :
only = MailuSchema . Meta . order
only = MailuSchema . Meta . order
@ -606,7 +609,7 @@ def config_export(full=False, secrets=False, color=False, dns=False, output=None
print ( colorize ( schema . dumps ( models . MailuConfig ( ) ) , * * color_cfg ) , file = output )
print ( colorize ( schema . dumps ( models . MailuConfig ( ) ) , * * color_cfg ) , file = output )
except ValueError as exc :
except ValueError as exc :
if spec := get_fieldspec ( exc ) :
if spec := get_fieldspec ( exc ) :
raise click . ClickException ( f ' [ ERROR ] Invalid filter: { spec } ' ) from exc
raise click . ClickException ( f ' [ ValidationError ] Invalid filter: { spec } ' ) from exc
raise
raise
Alexander Graf
4 years ago