refactor(libsaltcli): use `ssh` matching improvement (`__master_opts__`)

myii commented 4 years ago

PR progress checklist (to be filled in by reviewers)

[ ] Changes to documentation are appropriate (or tick if not required)
[ ] Changes to tests are appropriate (or tick if not required)
[ ] Reviews completed

What type of PR is this?

Primary type

[ ] [build] Changes related to the build system
[ ] [chore] Changes to the build process or auxiliary tools and libraries such as documentation generation
[ ] [ci] Changes to the continuous integration configuration
[ ] [feat] A new feature
[ ] [fix] A bug fix
[ ] [perf] A code change that improves performance
[x] [refactor] A code change that neither fixes a bug nor adds a feature
[ ] [revert] A change used to revert a previous commit
[ ] [style] Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc.)

Secondary type

[ ] [docs] Documentation changes
[ ] [test] Adding missing or correcting existing tests

Does this PR introduce a `BREAKING CHANGE`?

No.

Related issues and/or pull requests

https://github.com/saltstack-formulas/libvirt-formula/pull/71#issuecomment-604427395

Describe the changes you're proposing

@baby-gnu As discussed in the comment linked above. I've gone for the very simplest option so far, which we can discuss further if necessary.

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Documentation checklist

[ ] Updated the README (e.g. Available states).
[ ] Updated pillar.example.

Testing checklist

[ ] Included in Kitchen (i.e. under state_top).
[ ] Covered by new/existing tests (e.g. InSpec, Serverspec, etc.).
[ ] Updated the relevant test pillar.

Additional context

myii commented 4 years ago

I've kept it inside the {%- elif salt['config.get']('__cli') == 'salt-call' %} block, since that still evaluates as True for both ssh and local. What I'm protecting against is a future edit, where someone mistakenly believes they can reorder the block and introduce a regression, i.e.:

{%- if salt['config.get']('__cli') == 'salt-minion' %}
{%-   set cli = 'minion' %}
{%- elif salt['config.get']('__cli') == 'salt-call' %}
{%-    set cli = 'local' %}
{%- elif salt['config.get']('__master_opts__', {}).get('__cli') == 'salt-ssh' %}
{%-     set cli = 'ssh' %}
{%- else %}
{%-   set cli = 'unknown' %}
{%- endif %}

Where ssh never gets evaluated since it always gets caught by the local conditional.

myii commented 4 years ago

Thanks, @baby-gnu.

saltstack-formulas-travis commented 4 years ago

:tada: This PR is included in version 3.7.2 :tada:

The release is available on GitHub release

Your semantic-release bot :package::rocket:

saltstack-formulas / libvirt-formula