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

Optimize file_tree ext_pillar and update file.managed to allow for binary contents #30268

Merged
merged 5 commits into from Jan 12, 2016

Conversation

Projects
None yet
4 participants
@terminalmage
Member

terminalmage commented Jan 11, 2016

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.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 11, 2016

Contributor

@terminalmage Could you please rebase and fix some lint? Thanks.

Contributor

cachedout commented Jan 11, 2016

@terminalmage Could you please rebase and fix some lint? Thanks.

@terminalmage

This comment has been minimized.

Show comment
Hide comment
@terminalmage

terminalmage Jan 11, 2016

Member

@cachedout Still a lot of test failures, are these familiar? They don't seem related, but I'm looking deeper into it now.

Member

terminalmage commented Jan 11, 2016

@cachedout Still a lot of test failures, are these familiar? They don't seem related, but I'm looking deeper into it now.

Show outdated Hide outdated salt/modules/file.py Outdated

terminalmage added some commits Jan 11, 2016

salt.modules.file: Improve docstrings
This also changes a few exceptions to match common usage (passive voice
instead of imperative).
salt.pillar.file_tree: Optimizations, deprecate raw_data
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'.
salt.states.file.managed: Allow for binary contents
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.
Remove old FAQ item referencing gitfs bug in 0.16.x
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.
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 12, 2016

Contributor

@terminalmage That was my bad. A rebase wouldn't have fixed this. Apologies.

Contributor

cachedout commented Jan 12, 2016

@terminalmage That was my bad. A rebase wouldn't have fixed this. Apologies.

@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 12, 2016

Contributor

@terminalmage A little lint to be fixed up here, please.

Contributor

cachedout commented Jan 12, 2016

@terminalmage A little lint to be fixed up here, please.

cachedout added a commit that referenced this pull request Jan 12, 2016

Merge pull request #30268 from terminalmage/issue9569
Optimize file_tree ext_pillar and update file.managed to allow for binary contents

@cachedout cachedout merged commit 4a6b53f into saltstack:2015.8 Jan 12, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11213 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8705 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12624 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12323 — SUCCESS
Details

@terminalmage terminalmage deleted the terminalmage:issue9569 branch Feb 3, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment