Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Use relative state include #74

Conversation

ypid-geberit
Copy link
Contributor

@ypid-geberit ypid-geberit commented Jun 11, 2021

My use case is that I actually have to rename this formula because the SUSE Manager ships with its own packages formula that it uses internally. But I still want to use this formula in combination. So one of them has to be renamed. This change makes that way easier.

Applied with datalad run, see this record:

{
 "chain": [],
 "cmd": "git ls-files -z packages | xargs --null -I '()' find '()' -type f -print0 | xargs --null sed --in-place --regexp-extended 's#packages/#./#g;s#- packages\\.#- .#;'",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}

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

Describe the changes you're proposing

Use relative state include.

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

My use case is that I actually have to rename this formula because the
SUSE Manager ships with its own `packages` formula that it uses
internally. But I still want to use this formula in combination. So one
of them has to be renamed. This change makes that way easier.

=== Do not change lines below ===
{
 "chain": [],
 "cmd": "git ls-files -z packages | xargs --null -I '()' find '()' -type f -print0 | xargs --null sed --in-place --regexp-extended 's#packages/#./#g;s#- packages\\.#- .#;'",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
@myii
Copy link
Member

myii commented Jun 14, 2021

While discussing this with @javierbertoli, I realised that we had considered relative imports before:

However, we had to wait until all supported versions of Salt had it available:

Since we're well clear of v2018.11, I think this is a useful improvement that could be made -- not just here, but probably across all formulas.


@saltstack-formulas/wg These relative paths should be something we discuss in the next working group meeting.

@javierbertoli javierbertoli merged commit abe8286 into saltstack-formulas:master Jun 14, 2021
@javierbertoli
Copy link
Member

@ypid-geberit thanks for this PR!

@saltstack-formulas-travis

🎉 This PR is included in version 0.13.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@myii myii mentioned this pull request Sep 21, 2021
14 tasks
ypid-geberit added a commit to ypid-geberit/firewalld-formula that referenced this pull request Oct 5, 2021
ypid-geberit added a commit to ypid-geberit/firewalld-formula that referenced this pull request Oct 5, 2021
Ref: saltstack-formulas/packages-formula#74

=== Do not change lines below ===
{
 "chain": [],
 "cmd": "git ls-files -z firewalld | xargs --null -I '()' find '()' -type f -print0 | xargs --null sed --in-place --regexp-extended 's#\"firewalld/#\"./#g;s#- firewalld\\.#- .#;'",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
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.

4 participants