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.

Sign up for GitHub

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

Jump to bottom

Port #52001 to master #56841

Closed
wants to merge 4 commits into from
Closed

Port #52001 to master #56841

wants to merge 4 commits into from

Commits on Feb 23, 2021

  1. Add tests for syncing extmods 

    According to saltstack#52001 we need to add the mod_dir to sys.path if we have
any `utils_dirs`. These tests ensure that happens.
    @waynew
    waynew committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    4106121 View commit details
    Browse the repository at this point in the history

  2. extmods: add utils directories in sys.path 

    When the minion start clean and there are not utils directory in
the extmods cache, any import from a module to any code inside the
utils directory will fail. A second run of the highstate will fix
this issue, as the utils directories are added into sys.path inside
config/__init__.py, as part of the master and minion startup.

This commit add the utils directories during the synchronization of
the custom modules.

Fixes saltstack#51958
    @aplanas @waynew
    aplanas authored and waynew committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    f2d27b4 View commit details
    Browse the repository at this point in the history

  3. drop py2 code

    @waynew
    waynew committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    14d4b64 View commit details
    Browse the repository at this point in the history

  4. Fix potential bug 

    In the original PR it assumed paths would be well-formed. This fix uses
pathlib to split out the paths, which should be much more robust, as
well as ensuring that the mod_dir actually does end with the dir in
utils_dirs.
    @waynew
    waynew committed Feb 23, 2021
    Configuration menu
    Copy the full SHA
    5c9115f View commit details
    Browse the repository at this point in the history