Skip to content

Commit 90d9303

Browse files
committed
refactor(yamllint): use existing Jinja variables wherever possible
1 parent 3e466a2 commit 90d9303

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ssf/files/default/.yamllint

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ rules:
6666
empty-values:
6767
{%- set yl_ev = yamllint.rules.get('empty-values') %}
6868
{{- format_ignore(yl_ev) }}
69-
forbid-in-block-mappings: {{ yamllint.rules.get('empty-values').get('forbid-in-block-mappings') }}
70-
forbid-in-flow-mappings: {{ yamllint.rules.get('empty-values').get('forbid-in-flow-mappings') }}
69+
forbid-in-block-mappings: {{ yl_ev.get('forbid-in-block-mappings') }}
70+
forbid-in-flow-mappings: {{ yl_ev.get('forbid-in-flow-mappings') }}
7171

7272
{%- if yamllint.rules.get('key-duplicates') %}
7373
key-duplicates:
@@ -79,15 +79,15 @@ rules:
7979
line-length:
8080
{%- set yl_ll = yamllint.rules.get('line-length') %}
8181
{{- format_ignore(yl_ll) }}
82-
{%- if yamllint.rules.get('line-length').max == yamllint.rules.get('line-length').bugbear %}
83-
# Increase from default of `{{ yamllint.rules.get('line-length').default }}`
82+
{%- if yl_ll.max == yl_ll.bugbear %}
83+
# Increase from default of `{{ yl_ll.default }}`
8484
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
8585
{%- endif %}
86-
max: {{ yamllint.rules.get('line-length').max }}
86+
max: {{ yl_ll.max }}
8787

8888
{#- Don't need the `if` here since we're always providing a `octal-values` setting #}
8989
octal-values:
9090
{%- set yl_ov = yamllint.rules.get('octal-values') %}
9191
{{- format_ignore(yl_ov) }}
92-
forbid-implicit-octal: {{ yamllint.rules.get('octal-values').get('forbid-implicit-octal') }}
93-
forbid-explicit-octal: {{ yamllint.rules.get('octal-values').get('forbid-explicit-octal') }}
92+
forbid-implicit-octal: {{ yl_ov.get('forbid-implicit-octal') }}
93+
forbid-explicit-octal: {{ yl_ov.get('forbid-explicit-octal') }}

0 commit comments

Comments
 (0)