Commit graph

114618 commits

Author SHA1 Message Date
Gareth J. Greenaway
b4617e8391
[merge jam] Master port 48609 - file.serialize (#58055)
* implement file.serialize dict diffing

* existing_data must always be set

* update changes.diff instead of changes

* Return the diff dict instead of the dictdiffer object

* Updating integration tests to reflect changes when diffinng and merge_if_exists is enabled.

* Adding changelog.

Co-authored-by: Andreas Lutro <anlutro@gmail.com>
Co-authored-by: Erik Johnson <palehose@gmail.com>
Co-authored-by: Megan Wilhite <mwilhite@vmware.com>
2022-10-06 16:00:22 -07:00
Megan Wilhite
764f182d7f add test to pytest and add changelog 2022-10-06 15:43:48 -07:00
Anton Bronnikov
ee969de055 [#61650] Strip spaces from ssh config parameters 2022-10-06 15:43:48 -07:00
Pablo Suárez Hernández
6a2cb1e1df Add changelog file 2022-10-06 13:51:34 -06:00
Pablo Suárez Hernández
637ded8741 Add unit test around linebuffering in binary mode 2022-10-06 13:51:34 -06:00
Pablo Suárez Hernández
d33366d9ae Do not drop buffering from kwargs to avoid errors 2022-10-06 13:51:34 -06:00
Ismael Luceno
ef320e7835 fopen: Workaround bad buffering for binary mode
A lot of code assumes Python 2.x behavior for buffering, in which 1 is a
special value meaning line buffered.

Python 3 makes this value unusable, so fallback to the default buffering
size, and report these calls to be fixed.

Fixes: https://github.com/saltstack/salt/issues/57584
2022-10-06 13:51:34 -06:00
Jerry Jones gajone3
7209fd5c89 typo fixes 2022-10-06 13:49:50 -06:00
Jerry Jones gajone3
fc3bf87ece remove dangling text 2022-10-06 13:49:50 -06:00
Alexander Graul
dcfe24fed7 state.apply: don't check for cached pillar errors
state.apply request new pillar data from the server. This done to always
have the most up-to-date pillar to work with. Previously, checking for
pillar errors looked at both the new pillar and the in-memory pillar.
The latter might contain pillar rendering errors even if the former does
not.

For this reason, only the new pillar should be checked, not both.
2022-10-06 13:27:19 -06:00
Leif Liddy
91efaea497 modified assert statements 2022-10-06 13:14:23 -06:00
Leif Liddy
18ee7cff5c modified comment 2022-10-06 13:14:23 -06:00
Leif Liddy
3f2f6286d8 change function name 2022-10-06 13:14:23 -06:00
Leif Liddy
39c347866f fixed formatting error v2 2022-10-06 13:14:23 -06:00
Leif Liddy
603afd9f99 fixed formatting error 2022-10-06 13:14:23 -06:00
Leif Liddy
bed96a944a add _get_flags tests 2022-10-06 13:14:23 -06:00
Leif Liddy
ddd057775e better summary 2022-10-06 13:14:23 -06:00
Leif Liddy
28669dd9bb remove unecessary check 2022-10-06 13:14:23 -06:00
Leif Liddy
8678adb7eb add changelog 2022-10-06 13:14:23 -06:00
Leif Liddy
53f8059cc3 remove tmp files 2022-10-06 13:14:23 -06:00
Leif Liddy
aaf6514db0 cleanup formating v3 2022-10-06 13:14:23 -06:00
Leif Liddy
3d087eaef6 cleanup formating v2 2022-10-06 13:14:23 -06:00
Leif Liddy
706230d94c general cleanup 2022-10-06 13:14:23 -06:00
Leif Liddy
4a7135b8fe rework _get_flags 2022-10-06 13:14:23 -06:00
Leif Liddy
cfed20d2a1 no need to populate _flags_acc
I don't see how an empty list could possibly be returned
Either getattr is going to return a value or its going to error
out.
2022-10-06 13:14:23 -06:00
Leif Liddy
00352ae6e0 _get_flags should return int 2022-10-06 13:14:23 -06:00
MKLeb
6d8ca439ce move roster unit tests to pytest 2022-10-06 12:37:57 -06:00
MKLeb
8112e8a445 changelog 2022-10-06 12:34:12 -06:00
MKLeb
2f2df11287 add and update tests 2022-10-06 12:34:12 -06:00
XelK
79bd783cff update formatting 2022-10-06 12:34:12 -06:00
XelK
f57c0929a1 add docs 2022-10-06 12:34:12 -06:00
xelk
13904ed5c9 [FEATURE REQUEST] #60700 - implemented autostart option 2022-10-06 12:34:12 -06:00
Alexander Graul
63cee6cd0f Add diff_attr parameter to zypper/yum upgrade
diff_attr works just like it does for pkg.install. Having the
option to return additional attributes can remove the need for a
follow-up list_pkgs call.

Fixes: https://github.com/saltstack/salt/issues/62031
2022-10-06 12:27:57 -06:00
Alexander Graul
84951f7cd6 Don't turn attr="all" into a list
pkg_resource.format_pkg_list expects its `attr` argument to be either a
list of attributes or the string "all" to indicate all available
attributes should be used for formatting.

Fixes: https://github.com/saltstack/salt/issues/62032
2022-10-06 12:27:57 -06:00
Alexander Graul
bb1fe9cf22 Add names and pkgs parameters to zypper.upgrade
Fixes https://github.com/saltstack/salt/issues/62030
2022-10-06 12:27:57 -06:00
Alexander Graul
4398d59c10 Migrate zypper.upgrade tests to pytest 2022-10-06 12:27:57 -06:00
Cesar Augusto Sanchez
c4c84ac403 fix: address review comments 2022-10-05 21:38:52 -07:00
Cesar Augusto Sanchez
de97822be5 fix: update cassandra_cql module to allow execution from CLI.
- add load_balancing_policy argument
2022-10-05 21:38:52 -07:00
Jan Zerebecki
5515989e84 Fix link to module zypperpkg in docs
Also change a few instances of the free standing name of yumpkg to yum
and aptpkg to apt, only the module has the postfix, not the package
manager.
2022-10-05 21:36:57 -07:00
MKLeb
fa2855abfe switch to explicit kwargs for headers and auth that are passed through to utils.http:query 2022-10-05 13:50:23 -07:00
MKLeb
39ee1d396c pre-commit and docs fixes 2022-10-05 13:50:23 -07:00
Alkivi
1e74b19ba9 fix(all) 2022-10-05 13:50:23 -07:00
Anthony Martinet
07b3c033a9 feat(http_pillar): added kwargs to handle extra option for http.query 2022-10-05 13:50:23 -07:00
jwyoungpm
8006ca52bb Apply suggestions from code review
more pythonic if/then/else on list

Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
2022-10-05 12:43:16 -06:00
James Young
72bd29cdc8 Add ability for wait_for_event to handle list event_id values 2022-10-05 12:43:16 -06:00
Gareth J. Greenaway
1c4beef6e0 removing tests/unit/files/rosters/sshknownhosts/known_hosts which is not longer needed. 2022-10-05 09:11:43 -07:00
Gareth J. Greenaway
2a9eb1895c Adding versionadded. 2022-10-05 09:11:43 -07:00
Gareth J. Greenaway
513b43b6ce moving test_sshknownhosts.py to pytest. 2022-10-05 09:11:43 -07:00
Gareth J. Greenaway
a3e5ba47d4 manually run pre-commit 2022-10-05 09:11:43 -07:00
Daniel A. Wozniak
60ccb9f5c0 Blacken changed files 2022-10-05 09:11:43 -07:00