Be stricter about allowed missing substitutions
Change-Id: Idb36c3521d878e72c5afd158e91841bea6e58ec9
This commit is contained in:
parent
86c3c11ba4
commit
cfa3dffc5c
@ -31,7 +31,10 @@ def build_all(*, config_files, output_dir, validators):
|
|||||||
debug = _debug()
|
debug = _debug()
|
||||||
try:
|
try:
|
||||||
c = config.Configuration.from_streams(
|
c = config.Configuration.from_streams(
|
||||||
debug=debug, streams=config_files)
|
debug=debug,
|
||||||
|
substitute=True,
|
||||||
|
allow_missing_substitutions=False,
|
||||||
|
streams=config_files)
|
||||||
b = builder.Builder(c, validators=validators)
|
b = builder.Builder(c, validators=validators)
|
||||||
b.build_all(output_dir=output_dir)
|
b.build_all(output_dir=output_dir)
|
||||||
except exceptions.PromenadeException as e:
|
except exceptions.PromenadeException as e:
|
||||||
@ -52,7 +55,11 @@ def genereate_certs(*, config_files, output_dir):
|
|||||||
debug = _debug()
|
debug = _debug()
|
||||||
try:
|
try:
|
||||||
c = config.Configuration.from_streams(
|
c = config.Configuration.from_streams(
|
||||||
debug=debug, streams=config_files, substitute=True, validate=False)
|
debug=debug,
|
||||||
|
streams=config_files,
|
||||||
|
substitute=True,
|
||||||
|
allow_missing_substitutions=True,
|
||||||
|
validate=False)
|
||||||
g = generator.Generator(c)
|
g = generator.Generator(c)
|
||||||
g.generate(output_dir)
|
g.generate(output_dir)
|
||||||
except exceptions.PromenadeException as e:
|
except exceptions.PromenadeException as e:
|
||||||
|
@ -18,6 +18,7 @@ class Configuration:
|
|||||||
documents,
|
documents,
|
||||||
debug=False,
|
debug=False,
|
||||||
substitute=True,
|
substitute=True,
|
||||||
|
allow_missing_substitutions=True,
|
||||||
validate=True):
|
validate=True):
|
||||||
LOG.info("Parsing document schemas.")
|
LOG.info("Parsing document schemas.")
|
||||||
schema_set = validation.load_schemas_from_docs(documents)
|
schema_set = validation.load_schemas_from_docs(documents)
|
||||||
@ -29,11 +30,11 @@ class Configuration:
|
|||||||
deckhand_eng = layering.DocumentLayering(
|
deckhand_eng = layering.DocumentLayering(
|
||||||
documents,
|
documents,
|
||||||
substitution_sources=documents,
|
substitution_sources=documents,
|
||||||
fail_on_missing_sub_src=False)
|
fail_on_missing_sub_src=not allow_missing_substitutions)
|
||||||
documents = [dict(d) for d in deckhand_eng.render()]
|
documents = [dict(d) for d in deckhand_eng.render()]
|
||||||
except dh_errors.DeckhandException as e:
|
except dh_errors.DeckhandException as e:
|
||||||
LOG.exception(str(e))
|
LOG.exception(
|
||||||
LOG.error('An unknown Deckhand exception occurred while trying'
|
'An unknown Deckhand exception occurred while trying'
|
||||||
' to render documents.')
|
' to render documents.')
|
||||||
raise exceptions.DeckhandException(str(e))
|
raise exceptions.DeckhandException(str(e))
|
||||||
|
|
||||||
|
@ -43,7 +43,8 @@ class JoinScriptsResource(BaseResource):
|
|||||||
join_ip = _get_join_ip()
|
join_ip = _get_join_ip()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
config = Configuration.from_design_ref(design_ref)
|
config = Configuration.from_design_ref(
|
||||||
|
design_ref, allow_missing_substitutions=False)
|
||||||
except exceptions.DeckhandException as e:
|
except exceptions.DeckhandException as e:
|
||||||
raise falcon.HTTPInternalServerError(description=str(e))
|
raise falcon.HTTPInternalServerError(description=str(e))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user