Skip to content

fix(config): remove daemon.json in clean states#284

Merged
myii merged 1 commit intosaltstack-formulas:masterfrom
danny-smit:tests-for-daemon-json-file
Apr 23, 2021
Merged

fix(config): remove daemon.json in clean states#284
myii merged 1 commit intosaltstack-formulas:masterfrom
danny-smit:tests-for-daemon-json-file

Conversation

@danny-smit
Copy link
Contributor

@danny-smit danny-smit commented Apr 23, 2021

Remove the daemon.json when the clean states are called
Also extends tests to verify daemon.json content en cleanup.

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

#282
#283

Describe the changes you're proposing

Follow up on the previous pull requests #282 and #283 to:

  • Remove the daemon.json when the clean states are called
  • Extend tests to verify daemon.json content en cleanup.

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

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.

Thanks for the PR, @danny-smit. When fixing the rubocop violation, would you mind rebasing on the latest commit here? I was just in the process of adding the latest pre-salted images when you submitted this PR!

Remove the daemon.json when the clean states are called
Also extends tests to verify daemon.json content
@danny-smit danny-smit force-pushed the tests-for-daemon-json-file branch from 511d61b to 6967a98 Compare April 23, 2021 09:53
@danny-smit danny-smit requested a review from myii April 23, 2021 10:16
@myii myii merged commit 03250b4 into saltstack-formulas:master Apr 23, 2021
@myii
Copy link
Contributor

myii commented Apr 23, 2021

Nice work, thanks @danny-smit -- merged.

@saltstack-formulas-travis

🎉 This PR is included in version 2.0.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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