ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-04 19:26:58 +00:00
Code Activity

modules s[a-e]*: use f-strings (#10976)

Browse source 
* modules s[a-e]*: use f-strings

* add changelog frag
This commit is contained in:
Alexei Znamensky 2025-10-26 22:34:24 +13:00 • committed by GitHub
parent 32dd5f04c5
commit 73452acf84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 243 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plugins/modules/sefcontext.py
View file

@ -138,7 +138,6 @@ RETURN = r"""
import traceback
from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_native
SELINUX_IMP_ERR = None
try:
@ -231,8 +230,8 @@ def semanage_fcontext_modify(module, result, target, ftype, setype, substitute,
if module._diff:
prepared_diff += '# Change to semanage file context mappings\n'
prepared_diff += '-%s %s %s:%s:%s:%s\n' % (target, ftype, orig_seuser, orig_serole, orig_setype, orig_serange)
prepared_diff += '+%s %s %s:%s:%s:%s\n' % (target, ftype, seuser, orig_serole, setype, serange)
prepared_diff += f'-{target} {ftype} {orig_seuser}:{orig_serole}:{orig_setype}:{orig_serange}\n'
prepared_diff += f'+{target} {ftype} {seuser}:{orig_serole}:{setype}:{serange}\n'
else:
# Add missing entry
if seuser is None:
@ -246,7 +245,7 @@ def semanage_fcontext_modify(module, result, target, ftype, setype, substitute,
if module._diff:
prepared_diff += '# Addition to semanage file context mappings\n'
prepared_diff += '+%s %s %s:%s:%s:%s\n' % (target, ftype, seuser, 'object_r', setype, serange)
prepared_diff += f'+{target} {ftype} {seuser}:object_r:{setype}:{serange}\n'
else:
exists = semanage_fcontext_substitute_exists(sefcontext, target)
if exists:
@ -260,8 +259,8 @@ def semanage_fcontext_modify(module, result, target, ftype, setype, substitute,
if module._diff:
prepared_diff += '# Change to semanage file context path substitutions\n'
prepared_diff += '-%s = %s\n' % (target, orig_substitute)
prepared_diff += '+%s = %s\n' % (target, substitute)
prepared_diff += f'-{target} = {orig_substitute}\n'
prepared_diff += f'+{target} = {substitute}\n'
else:
# Add missing path substitution entry
if not module.check_mode:
@ -269,10 +268,10 @@ def semanage_fcontext_modify(module, result, target, ftype, setype, substitute,
changed = True
if module._diff:
prepared_diff += '# Addition to semanage file context path substitutions\n'
prepared_diff += '+%s = %s\n' % (target, substitute)
prepared_diff += f'+{target} = {substitute}\n'
except Exception as e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, to_native(e)))
module.fail_json(msg=f"{e.__class__.__name__}: {e}\n")
if module._diff and prepared_diff:
result['diff'] = dict(prepared=prepared_diff)
@ -301,7 +300,7 @@ def semanage_fcontext_delete(module, result, target, ftype, setype, substitute,
if module._diff:
prepared_diff += '# Deletion to semanage file context mappings\n'
prepared_diff += '-%s %s %s:%s:%s:%s\n' % (target, ftype, exists[0], exists[1], exists[2], exists[3])
prepared_diff += f'-{target} {ftype} {exists[0]}:{exists[1]}:{exists[2]}:{exists[3]}\n'
if substitute_exists and setype is None and ((substitute is not None and substitute_exists == substitute) or substitute is None):
# Remove existing path substitution entry
orig_substitute = substitute_exists
@ -312,10 +311,10 @@ def semanage_fcontext_delete(module, result, target, ftype, setype, substitute,
if module._diff:
prepared_diff += '# Deletion to semanage file context path substitutions\n'
prepared_diff += '-%s = %s\n' % (target, orig_substitute)
prepared_diff += f'-{target} = {orig_substitute}\n'
except Exception as e:
module.fail_json(msg="%s: %s\n" % (e.__class__.__name__, to_native(e)))
module.fail_json(msg=f"{e.__class__.__name__}: {e}\n")
if module._diff and prepared_diff:
result['diff'] = dict(prepared=prepared_diff)
@ -375,7 +374,7 @@ def main():
elif state == 'absent':
semanage_fcontext_delete(module, result, target, ftype, setype, substitute, do_reload)
else:
module.fail_json(msg='Invalid value of argument "state": {0}'.format(state))
module.fail_json(msg=f'Invalid value of argument "state": {state}')
if __name__ == '__main__':