Differential D2863

Parse .sls as YAML for nano syntax highlighting
ClosedPublic
Actions

Authored by dereckson on Mar 8 2023, 21:27.

Details

Reviewers

dereckson

Maniphest Tasks

T1759: SaltStack support for nano

Commits

rOPSebbf9b0558be: Parse .sls as YAML for nano syntax highlighting

Summary

As nano added YAML parsing syntax, it's possible to leverage this
to highlight .sls in addition to .yml and .yaml. Even if Jinja2
templates blocks are ignored, it's a great help, especially compared
to no syntax at all.

Fixes T1759.

Test Plan

Deploy on WindRiver

Diff Detail

Repository

rOPS Nasqueron Operations

Lint

Lint Passed

Unit

No Test Coverage

Branch

nano-syntax-sls

Build Status

Buildable 4518
Build 4785: arc lint + arc unit

Event Timeline

dereckson requested review of this revision.Mar 8 2023, 21:27

dereckson created this revision.

Harbormaster completed remote builds in B4518: Diff 7294.Mar 8 2023, 21:27

First run

WindRiver

$ salt-call --local state.sls_id nano_sls_support roles/shellserver/userland-software/base

local:
----------
          ID: nano_sls_support
    Function: file.replace
        Name: /usr/local/share/nano/yaml.nanorc
      Result: True
     Comment: Changes were made
     Started: 21:24:32.750903
    Duration: 9.754 ms
     Changes:
              ----------
              diff:
                  ---
                  +++
                  @@ -3,7 +3,7 @@
                   ## Original author:  Benno Schulenberg
                   ## License:  GPL version 3 or newer

                  -syntax yaml "\.ya?ml$"
                  +syntax yaml "\.(ya?ml|sls)$"
                   header "^%YAML |^---( |$)"

                   tabgives "  "

Summary for local
------------
Succeeded: 1 (changed=1)
Failed:    0
------------
Total states run:     1
Total run time:   9.754 ms

Idempotent test

WindRiver

$ salt-call --local state.sls_id nano_sls_support roles/shellserver/userland-software/base
local:
----------
          ID: nano_sls_support
    Function: file.replace
        Name: /usr/local/share/nano/yaml.nanorc
      Result: True
     Comment: No changes needed to be made
     Started: 21:24:57.605310
    Duration: 7.302 ms
     Changes:

Summary for local
------------
Succeeded: 1
Failed:    0
------------
Total states run:     1
Total run time:   7.302 ms