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

postgres_extension: report changes when an extension was installed (#36335)

Browse source 
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
This commit is contained in:
Denys Havrysh 2016-09-16 17:23:20 +03:00 • committed by Nicole Thomas
parent d2a583bc22
commit 3f308d7694
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
salt/states/postgres_extension.py
View file

@ -51,13 +51,13 @@ def present(name,
The name of the extension to manage
if_not_exists
Add a if_not_exists switch to the ddl statement
Add an `IF NOT EXISTS` parameter to the DDL statement
schema
Schema to install the extension into
ext_version
version to install
Version to install
from_version
Old extension version if already installed
@ -69,10 +69,10 @@ def present(name,
Database to act on
db_user
database username if different from config or default
Database username if different from config or default
db_password
user password if any password for a specified user
User password if any password for a specified user
db_host
Database host if different from config or default
@ -87,10 +87,10 @@ def present(name,
db_args = {
'maintenance_db': maintenance_db,
'runas': user,
'host': db_host,
'user': db_user,
'port': db_port,
'password': db_password,
'host': db_host,
'port': db_port,
}
# check if extension exists
mode = 'create'
@ -134,11 +134,11 @@ def present(name,
else:
suffix = 'ed'
ret['comment'] = 'The extension {0} has been {1}{2}'.format(name, mode, suffix)
ret['changes'][name] = '{0}{1}'.format(mode.capitalize(), suffix)
elif cret is not None:
ret['comment'] = 'Failed to {1} extension {0}'.format(name, mode)
ret['result'] = False
else:
ret['result'] = True
return ret

4
tests/unit/states/postgres_test.py
View file

@ -370,7 +370,7 @@ class PostgresExtensionTestCase(TestCase):
self.assertEqual(
ret,
{'comment': 'The extension foo has been installed',
'changes': {}, 'name': 'foo', 'result': True}
'changes': {'foo': 'Installed'}, 'name': 'foo', 'result': True}
)
ret = postgres_extension.present('foo')
self.assertEqual(
@ -382,7 +382,7 @@ class PostgresExtensionTestCase(TestCase):
self.assertEqual(
ret,
{'comment': 'The extension foo has been upgraded',
'changes': {}, 'name': 'foo', 'result': True}
'changes': {'foo': 'Upgraded'}, 'name': 'foo', 'result': True}
)
@patch.dict(OPTS, {'test': True})