saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52526 from lomeroe/deserializer_opts_fix

Browse source 
Fix use of deserializer_opts in file.serialize
This commit is contained in:
Daniel Wozniak 2019-04-17 07:08:51 -07:00 • committed by GitHub
commit 21d63656c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/file.py
View file

@ -6846,7 +6846,7 @@ def serialize(name,
try:
existing_data = __serializers__[deserializer_name](
fhr,
**deserializer_options.get(serializer_name, {})
**deserializer_options.get(deserializer_name, {})
)
except (TypeError, DeserializationError) as exc:
ret['result'] = False

25
tests/integration/states/test_file.py
View file

@ -42,6 +42,7 @@ import salt.utils.json
import salt.utils.path
import salt.utils.platform
import salt.utils.stringutils
import salt.serializers.configparser
from salt.utils.versions import LooseVersion as _LooseVersion
HAS_PWD = True
@ -1710,16 +1711,16 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
'''
Test the serializer_opts and deserializer_opts options
'''
data1 = {'foo': {'bar': 'baz'}}
data1 = {'foo': {'bar': '%(x)s'}}
data2 = {'foo': {'abc': 123}}
merged = {'foo': {'bar': 'baz', 'abc': 123}}
merged = {'foo': {'y': 'not_used', 'x': 'baz', 'abc': 123, 'bar': u'baz'}}
ret = self.run_state(
'file.serialize',
name=name,
dataset=data1,
formatter='json',
deserializer_opts=[{'encoding': 'latin-1'}])
formatter='configparser',
deserializer_opts=[{'defaults': {'y': 'not_used'}}])
ret = ret[next(iter(ret))]
assert ret['result'], ret
# We should have warned about deserializer_opts being used when
@ -1727,25 +1728,31 @@ class FileTest(ModuleCase, SaltReturnAssertsMixin):
assert 'warnings' in ret
# Run with merge_if_exists, as well as serializer and deserializer opts
# deserializer opts will be used for string interpolation of the %(x)s
# that was written to the file with data1 (i.e. bar should become baz)
ret = self.run_state(
'file.serialize',
name=name,
dataset=data2,
formatter='json',
formatter='configparser',
merge_if_exists=True,
serializer_opts=[{'indent': 8}],
deserializer_opts=[{'encoding': 'latin-1'}])
serializer_opts=[{'defaults': {'y': 'not_used'}}],
deserializer_opts=[{'defaults': {'x': 'baz'}}])
ret = ret[next(iter(ret))]
assert ret['result'], ret
with salt.utils.files.fopen(name) as fp_:
serialized_data = salt.utils.json.load(fp_)
serialized_data = salt.serializers.configparser.deserialize(fp_)
# If this test fails, this debug logging will help tell us how the
# serialized data differs from what was serialized.
log.debug('serialized_data = %r', serialized_data)
log.debug('merged = %r', merged)
assert serialized_data == merged
# serializing with a default of 'y' will add y = not_used into foo
assert serialized_data['foo']['y'] == merged['foo']['y']
# deserializing with default of x = baz will perform interpolation on %(x)s
# and bar will then = baz
assert serialized_data['foo']['bar'] == merged['foo']['bar']
@with_tempdir()
def test_replace_issue_18841_omit_backup(self, base_dir):