a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

become plugins: use f-strings (#9319) 

* become plugins: use f-strings

* add changelog frag
pull/8437/merge
Alexei Znamensky 2024-12-23 22:02:12 +13:00 committed by GitHub
parent d05d067f3b
commit c7edf0a87b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
changelogs/fragments/9319-fstr-become-plugins.yml Normal file
View File

@ -0,0 +1,10 @@
minor_changes:
- doas become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- dzdo become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- ksu become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- machinectl become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- pbrun become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- pfexec become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- pmrun become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- sesu become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).
- sudosu become plugin - use f-strings instead of interpolations or ``format`` (https://github.com/ansible-collections/community.general/pull/9319).

4
plugins/become/doas.py
View File

@ -125,9 +125,9 @@ class BecomeModule(BecomeBase):
flags += ' -n'
become_user = self.get_option('become_user')
user = '-u %s' % (become_user) if become_user else ''
user = f'-u {become_user}' if become_user else ''
success_cmd = self._build_success_command(cmd, shell, noexe=True)
executable = getattr(shell, 'executable', shell.SHELL_FAMILY)
return '%s %s %s %s -c %s' % (become_exe, flags, user, executable, success_cmd)
return f'{become_exe} {flags} {user} {executable} -c {success_cmd}'

8
plugins/become/dzdo.py
View File

@ -92,10 +92,10 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
if self.get_option('become_pass'):
self.prompt = '[dzdo via ansible, key=%s] password:' % self._id
flags = '%s -p "%s"' % (flags.replace('-n', ''), self.prompt)
self.prompt = f'[dzdo via ansible, key={self._id}] password:'
flags = f"{flags.replace('-n', '')} -p \"{self.prompt}\""
become_user = self.get_option('become_user')
user = '-u %s' % (become_user) if become_user else ''
user = f'-u {become_user}' if become_user else ''
return ' '.join([becomecmd, flags, user, self._build_success_command(cmd, shell)])
return f"{becomecmd} {flags} {user} {self._build_success_command(cmd, shell)}"

2
plugins/become/ksu.py
View File

@ -124,4 +124,4 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
user = self.get_option('become_user')
return '%s %s %s -e %s ' % (exe, user, flags, self._build_success_command(cmd, shell))
return f'{exe} {user} {flags} -e {self._build_success_command(cmd, shell)} '

2
plugins/become/machinectl.py
View File

@ -123,7 +123,7 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
user = self.get_option('become_user')
return '%s -q shell %s %s@ %s' % (become, flags, user, self._build_success_command(cmd, shell))
return f'{become} -q shell {flags} {user}@ {self._build_success_command(cmd, shell)}'
def check_success(self, b_output):
b_output = self.remove_ansi_codes(b_output)

4
plugins/become/pbrun.py
View File

@ -103,7 +103,7 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
become_user = self.get_option('become_user')
user = '-u %s' % (become_user) if become_user else ''
user = f'-u {become_user}' if become_user else ''
noexe = not self.get_option('wrap_exe')
return ' '.join([become_exe, flags, user, self._build_success_command(cmd, shell, noexe=noexe)])
return f"{become_exe} {flags} {user} {self._build_success_command(cmd, shell, noexe=noexe)}"

2
plugins/become/pfexec.py
View File

@ -106,4 +106,4 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
noexe = not self.get_option('wrap_exe')
return '%s %s %s' % (exe, flags, self._build_success_command(cmd, shell, noexe=noexe))
return f'{exe} {flags} {self._build_success_command(cmd, shell, noexe=noexe)}'

2
plugins/become/pmrun.py
View File

@ -78,4 +78,4 @@ class BecomeModule(BecomeBase):
become = self.get_option('become_exe')
flags = self.get_option('become_flags')
return '%s %s %s' % (become, flags, shlex_quote(self._build_success_command(cmd, shell)))
return f'{become} {flags} {shlex_quote(self._build_success_command(cmd, shell))}'

2
plugins/become/sesu.py
View File

@ -93,4 +93,4 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags')
user = self.get_option('become_user')
return '%s %s %s -c %s' % (become, flags, user, self._build_success_command(cmd, shell))
return f'{become} {flags} {user} -c {self._build_success_command(cmd, shell)}'

10
plugins/become/sudosu.py
View File

@ -98,16 +98,16 @@ class BecomeModule(BecomeBase):
flags = self.get_option('become_flags') or ''
prompt = ''
if self.get_option('become_pass'):
self.prompt = '[sudo via ansible, key=%s] password:' % self._id
self.prompt = f'[sudo via ansible, key={self._id}] password:'
if flags: # this could be simplified, but kept as is for now for backwards string matching
flags = flags.replace('-n', '')
prompt = '-p "%s"' % (self.prompt)
prompt = f'-p "{self.prompt}"'
user = self.get_option('become_user') or ''
if user:
user = '%s' % (user)
user = f'{user}'
if self.get_option('alt_method'):
return ' '.join([becomecmd, flags, prompt, "su -l", user, "-c", self._build_success_command(cmd, shell, True)])
return f"{becomecmd} {flags} {prompt} su -l {user} -c {self._build_success_command(cmd, shell, True)}"
else:
return ' '.join([becomecmd, flags, prompt, 'su -l', user, self._build_success_command(cmd, shell)])
return f"{becomecmd} {flags} {prompt} su -l {user} {self._build_success_command(cmd, shell)}"