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

Return an empty dict for 'changes' instead of 'None'

Browse source 
Fixes #47059
This commit is contained in:
Orlando Richards 2018-04-13 17:20:23 +01:00
parent 5b7544eaa0
commit f115452653
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/states/boto_cfn.py
View file

@ -186,7 +186,7 @@ def present(name, template_body=None, template_url=None, parameters=None, notifi
ret['changes']['new'] = updated
return ret
ret['comment'] = 'Stack {0} exists.'.format(name)
ret['changes'] = None
ret['changes'] = {}
return ret
if __opts__['test']:
ret['comment'] = 'Stack {0} is set to be created.'.format(name)
@ -221,7 +221,7 @@ def absent(name, region=None, key=None, keyid=None, profile=None):
ret = {'name': name, 'result': True, 'comment': '', 'changes': {}}
if not __salt__['boto_cfn.exists'](name, region, key, keyid, profile):
ret['comment'] = 'Stack {0} does not exist.'.format(name)
ret['changes'] = None
ret['changes'] = {}
return ret
if __opts__['test']:
ret['comment'] = 'Stack {0} is set to be deleted.'.format(name)
@ -232,7 +232,7 @@ def absent(name, region=None, key=None, keyid=None, profile=None):
code, message = _get_error(deleted)
ret['comment'] = 'Stack {0} could not be deleted.\n{1}\n{2}'.format(name, code, message)
ret['result'] = False
ret['changes'] = None
ret['changes'] = {}
return ret
if deleted:
ret['comment'] = 'Stack {0} was deleted.'.format(name)

2
salt/states/boto_iam.py
View file

@ -1324,7 +1324,7 @@ def account_policy(name=None, allow_users_to_change_password=None,
region, key, keyid, profile):
return ret
ret['comment'] = 'Account policy is not changed.'
ret['changes'] = None
ret['changes'] = {}
ret['result'] = False
return ret

2
salt/states/boto_iot.py
View file

@ -727,7 +727,7 @@ def topic_rule_present(name, ruleName, sql, actions, description='',
if need_update:
if __opts__['test']:
msg = 'Rule {0} set to be modified.'.format(ruleName)
ret['changes'] = None
ret['changes'] = {}
ret['comment'] = msg
ret['result'] = None
return ret

6
salt/states/glassfish.py
View file

@ -250,7 +250,7 @@ def connection_factory_present(name,
ret['comment'] = 'Connection factory updated'
else:
ret['result'] = True
ret['changes'] = None
ret['changes'] = {}
ret['comment'] = 'Connection factory is already up-to-date'
else:
ret['result'] = False
@ -528,7 +528,7 @@ def jdbc_datasource_present(name,
ret['comment'] = 'JDBC Datasource updated'
else:
ret['result'] = True
ret['changes'] = None
ret['changes'] = {}
ret['comment'] = 'JDBC Datasource is already up-to-date'
else:
ret['result'] = False
@ -602,7 +602,7 @@ def system_properties_present(server=None, **kwargs):
ret['changes'] = kwargs
ret['coment'] = 'System properties would have been updated'
else:
ret['changes'] = None
ret['changes'] = {}
ret['result'] = True
ret['comment'] = 'System properties are already up-to-date'
return ret

2
salt/states/grafana_datasource.py
View file

@ -100,7 +100,7 @@ def present(name,
if ret['changes']['new'] or ret['changes']['old']:
ret['comment'] = 'Data source {0} updated'.format(name)
else:
ret['changes'] = None
ret['changes'] = {}
ret['comment'] = 'Data source {0} already up-to-date'.format(name)
else:
requests.post(

2
salt/states/influxdb_user.py
View file

@ -122,7 +122,7 @@ def present(name,
'following changes:'.format(name)
for k, v in ret['changes']:
ret['comment'] += '\n{0} => {1}'.format(k, v)
ret['changes'] = None
ret['changes'] = {}
else:
ret['comment'] = 'Updated user {0}'.format(name)