Commit a3131417 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

fix: switch from input to inputs (according doc syntax)

parent 1acaaeb3

tbc/template_to_component.py

+7 −7
Original line number Diff line number Diff line
@@ -85,15 +85,15 @@ def _migrate_var(var: TbcVar, var_prefix: str, tpl: dict[str, any]) -> Optional[ 
        # secrets should not be inputs

        return None

    

    gl_input = var.to_gl(var_prefix)

    input_binding = f"$[[ input.{gl_input.name} ]]"

    gl_inputs = var.to_gl(var_prefix)

    inputs_binding = f"$[[ inputs.{gl_inputs.name} ]]"



    # check if default is defined and equals in template

    tpl_default = tpl["variables"].get(var.name)

    if isinstance(tpl_default, dict):

        # detailed variable form (value, options, description)

        tpl_default = tpl_default.get("value")

    if tpl_default and tpl_default != input_binding and var.default != tpl_default:

    if tpl_default and tpl_default != inputs_binding and var.default != tpl_default:

        print(f"WARN: variable {var.name} has different default values")

        print(f"| template: {tpl_default}")

        print(f"| kicker  : {var.default}")
@@ -101,12 +101,12 @@ def _migrate_var(var: TbcVar, var_prefix: str, tpl: dict[str, any]) -> Optional[ 
        # apply template default instead

        var.default = tpl_default

        # update input

        gl_input = var.to_gl(var_prefix)

        gl_inputs = var.to_gl(var_prefix)



    # migrate variable default value with interpolation format

    tpl["variables"][var.name] = input_binding

    tpl["variables"][var.name] = inputs_binding



    return gl_input

    return gl_inputs





def _migrate_tpl(tpl_desc, project_dir: Path, var_prefix: str):
@@ -137,7 +137,7 @@ def _migrate_tpl(tpl_desc, project_dir: Path, var_prefix: str): 
       for var in feat.get("variables", []):

            gl_inputs.append(_migrate_var(TbcVar.parse_obj(var), var_prefix, tpl))

    

    tpl_spec = {"spec": {"inputs": {input.name: input.to_json() for input in gl_inputs if input}}}

    tpl_spec = {"spec": {"inputs": {inputs.name: inputs.to_json() for inputs in gl_inputs if inputs}}}



    # rewrite template with inputs section

    # print(">> Rewrite template")