Optimize file_tree ext_pillar and update file.managed to allow for binary contents #30268
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@terminalmage Could you please rebase and fix some lint? Thanks. |
terminalmage
force-pushed
the
issue9569
branch
from
6bc0673 to
ce3935f
Compare
|
@cachedout Still a lot of test failures, are these familiar? They don't seem related, but I'm looking deeper into it now. |
| Replace occurrences of a pattern in a file | ||
| Replace occurrences of a pattern in a file. If ``show_changes`` is | ||
| ``True``, then a diff of what changed will be returned, otherwise a | ||
| ``True`` will be returnd when changes are made are made, and ``False`` when |
This also changes a few exceptions to match common usage (passive voice instead of imperative).
This modifies this ext_pillar to read in the file file_buffer_size bytes at a time. It also removes needlessly duplicated code for dictionary merging with salt.utils.dictupdate.merge(). Finally, the 'raw_data' argument is poorly-named and does not describe very well what it actually does, so I have renamed this option to 'keep_newline'.
This allows for binary contents to be used in file.managed when either contents, contents_pillar, or contents_grains is used. Prior to this commit, these options treated all of these options as only having string data. Additionally, documentation for this and a couple other states has been improved.
This release has been EOL for a long time, and is not even available from pretty much any distro. It is safe to remove this item.
terminalmage
force-pushed
the
issue9569
branch
from
ce3935f to
724b2f3
Compare
|
@terminalmage That was my bad. A rebase wouldn't have fixed this. Apologies. |
|
@terminalmage A little lint to be fixed up here, please. |
cachedout
added
the
pending-changes
cachedout
pushed a commit
that referenced
this pull request
Jan 12, 2016
Optimize file_tree ext_pillar and update file.managed to allow for binary contents
terminalmage
removed
the
pending-changes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The contents/contents_pillar/contents_grains options assume that the contents
are string data, this pull request allows binary contents to be deployed.
Additionally, some changes have been made to file_tree to make reading in each
file more efficient. Finally, a usage example has been added to the FAQ.
Resolves #9569.