Skip to content

Conversation

@baby-gnu
Copy link
Contributor

@baby-gnu baby-gnu commented Sep 27, 2020

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
  • [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

#164

Describe the changes you're proposing

The debug output of test jobs don't show the use of TOFS as it should and the pillar.example show that tofs is under mine_functions instead of openssh.

Pillar / config required to test the proposed changes

Debug log showing how the proposed changes work

Before:

       sshd_config:
         file.managed:
           - name: /etc/ssh/sshd_config
           - source: 
             - salt://openssh/files/example.net/sshd_config
             - salt://openssh/files/Debian/sshd_config
             - salt://openssh/files/default/sshd_config
           - template: jinja

After:

       sshd_config:
         file.managed:
           - name: /etc/ssh/sshd_config
           - source: 
             - salt://openssh/files/example.net/alt_sshd_config
             - salt://openssh/files/example.net/sshd_config
             - salt://openssh/files/Debian/alt_sshd_config
             - salt://openssh/files/Debian/sshd_config
             - salt://openssh/files/default/alt_sshd_config
             - salt://openssh/files/default/sshd_config
           - template: jinja

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

The debug output of test jobs don't show the use of TOFS as it should
and the pillar.example show that `tofs` is under `mine_functions`
instead of `openssh`.

* pillar.example: move `tofs` under `openssh`.

* test/salt/pillar/default.sls: ditoo.
@pull-assistant
Copy link

Score: 1.00

Best reviewed: commit by commit


Optimal code review plan

     test(inspec): _mapdata files should have tofs configuration

     fix(pillar): tofs must not be under mine_functions

Powered by Pull Assistant. Last update 5e9033f ... c0d5052. Read the comment docs.

@baby-gnu baby-gnu changed the title Fix/tofs pillars fix(inspec): tofs must not be under mine_functions Sep 27, 2020
@baby-gnu baby-gnu changed the title fix(inspec): tofs must not be under mine_functions fix(pillar): tofs must not be under mine_functions Sep 27, 2020
@baby-gnu baby-gnu requested a review from myii September 27, 2020 18:52
Copy link
Contributor

@myii myii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

@myii myii merged commit 91bc8be into saltstack-formulas:master Sep 27, 2020
@myii
Copy link
Contributor

myii commented Sep 27, 2020

Merged, thanks for this @baby-gnu.

@saltstack-formulas-travis

🎉 This PR is included in version 2.0.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@baby-gnu baby-gnu deleted the fix/tofs-pillars branch September 27, 2020 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants