diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-06-16 20:24:44 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-06-16 20:24:44 +0200 |
| commit | 51e6b967b1216853c2bd3bc3298639bd3382b5bc (patch) | |
| tree | e119cd4c862132a6b6f73b2ed8eeeb069bdfc049 | |
| parent | 132133e9be4289b44e14393d39225a42eea6f34b (diff) | |
| download | vyos-1x-51e6b967b1216853c2bd3bc3298639bd3382b5bc.tar.gz vyos-1x-51e6b967b1216853c2bd3bc3298639bd3382b5bc.zip | |
template: T8923: fix typo in function argument "formater" -> "formatter"
| -rwxr-xr-x | python/vyos/template.py | 12 | ||||
| -rwxr-xr-x | src/conf_mode/container.py | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces_openvpn.py | 4 | ||||
| -rwxr-xr-x | src/conf_mode/system_login.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/python/vyos/template.py b/python/vyos/template.py index 9d309370e..8a624d989 100755 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -124,12 +124,12 @@ def register_clever_function(name, func=None): _CLEVER_FUNCTIONS[name] = func return func -def render_to_string(template, content, formater=None, location=None): +def render_to_string(template, content, formatter=None, location=None): """Render a template from the template directory, raise on any errors. :param template: the path to the template relative to the template folder :param content: the dictionary of variables to put into rendering context - :param formater: + :param formatter: if given, it has to be a callable the rendered string is passed through The parsed template files are cached, so rendering the same file multiple times @@ -141,8 +141,8 @@ def render_to_string(template, content, formater=None, location=None): """ template = _get_environment(location).get_template(template) rendered = template.render(content) - if formater is not None: - rendered = formater(rendered) + if formatter is not None: + rendered = formatter(rendered) return rendered @@ -150,7 +150,7 @@ def render( destination, template, content, - formater=None, + formatter=None, permission=None, user=None, group=None, @@ -171,7 +171,7 @@ def render( # As we are opening the file with 'w', we are performing the rendering before # calling open() to not accidentally erase the file if rendering fails - rendered = render_to_string(template, content, formater, location) + rendered = render_to_string(template, content, formatter, location) # Remove any trailing character and always add a new line at the end rendered = rendered.rstrip() + "\n" diff --git a/src/conf_mode/container.py b/src/conf_mode/container.py index 499097a12..6c5385dfa 100755 --- a/src/conf_mode/container.py +++ b/src/conf_mode/container.py @@ -633,7 +633,7 @@ def generate(container): file_path = os.path.join(systemd_unit_path, f'vyos-container-{name}.service') run_args = generate_run_arguments(name, container_config, host_ident) render(file_path, 'container/systemd-unit.j2', {'name': name, 'run_args': run_args, }, - formater=lambda _: _.replace(""", '"').replace("'", "'")) + formatter=lambda _: _.replace(""", '"').replace("'", "'")) return None diff --git a/src/conf_mode/interfaces_openvpn.py b/src/conf_mode/interfaces_openvpn.py index ea5cdd839..f2a49327a 100755 --- a/src/conf_mode/interfaces_openvpn.py +++ b/src/conf_mode/interfaces_openvpn.py @@ -802,11 +802,11 @@ def generate(openvpn): # we need to support quoting of raw parameters from OpenVPN CLI # see https://vyos.dev/T1632 render(cfg_file.format(**openvpn), 'openvpn/server.conf.j2', openvpn, - formater=lambda _: _.replace(""", '"'), user=user, group=group) + formatter=lambda _: _.replace(""", '"'), user=user, group=group) # Render 20-override.conf for OpenVPN service render(service_file.format(**openvpn), 'openvpn/service-override.conf.j2', openvpn, - formater=lambda _: _.replace(""", '"'), user=user, group=group) + formatter=lambda _: _.replace(""", '"'), user=user, group=group) # Reload systemd services config to apply an override call(f'systemctl daemon-reload') diff --git a/src/conf_mode/system_login.py b/src/conf_mode/system_login.py index 8ae2bc19a..fec4cfa6d 100755 --- a/src/conf_mode/system_login.py +++ b/src/conf_mode/system_login.py @@ -401,14 +401,14 @@ def apply(login): # always re-render SSH keys with appropriate permissions render(f'{home_dir}/.ssh/authorized_keys', 'login/authorized_keys.j2', user_config, permission=0o600, - formater=lambda _: _.replace(""", '"'), + formatter=lambda _: _.replace(""", '"'), user=user, group='users') principals_file = f'{home_dir}/.ssh/authorized_principals' if dict_search('authentication.principal', user_config): render(principals_file, 'login/authorized_principals.j2', user_config, permission=0o600, - formater=lambda _: _.replace(""", '"'), + formatter=lambda _: _.replace(""", '"'), user=user, group='users') else: if os.path.exists(principals_file): |
