openstack
/
oslo.config
Code Issues Proposed changes

Add option for generate shell completion script 

Change-Id: I66d1b3a0f6b97d6894e0d921d15962f63fb4b5f7
This commit is contained in:
Philippe SERAPHIN 2024-01-24 10:57:01 +01:00
parent d313d6d65a
commit 39be3fcbb4
6 changed files with 282 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
oslo_config/bash-completion.template Normal file
View File

@ -0,0 +1,51 @@
#!/bin/bash completion for {scriptname}
_{scriptname}(){{
local cur prev
local -A ARGS MAP FORCE OPTS OPTS_SUB MULTI
COMPREPLY=()
cur="${{COMP_WORDS[COMP_CWORD]}}"
prev="${{COMP_WORDS[COMP_CWORD-1]}}"
OPTS=({opts})
OPTS_SUB=({opts_sub})
ARGS=({args})
MAP=({map})
MULTI=({multi})
if [ ! -z "$prev" ]; then
# if is an argument complete with list of choice if define
prev_key=${{MAP[$prev]}}
if [ ! -z $prev_key ] && [ ! -z "${{ARGS[$prev_key]}}" ]; then
COMPREPLY=($(compgen -W "${{ARGS[$prev_key]}}" -- "${{cur}}"))
return 0
fi
fi
for in_use in ${{COMP_WORDS[@]:1}}; do
key=${{MAP[$in_use]}}
IFS='|'
if [[ -v OPTS_SUB[$key] ]];then
# If is a subcommand redefine completion
unset OPTS
local -A OPTS
for el in ${{OPTS_SUB[$key]}}; do
IFS='='
read k v <<< ${{el}}
IFS='|'
OPTS+=( [${{k}}]="${{v}}" )
done
fi
unset IFS
# Unset option that is already use
if [[ -z "MULTI[$key]" ]]; then
unset OPTS[$key]
unset ARGS[$key]
fi
done
compl="${{OPTS[@]}}"
COMPREPLY=($(compgen -W "${{compl}}" -- "${{cur}}"))
return 0
}}
complete -F _{scriptname} {scriptname}

189
oslo_config/cfg.py
View File

@ -1955,10 +1955,13 @@ class ConfigOpts(abc.Mapping):
It has built-in support for :oslo.config:option:`config_file` and
:oslo.config:option:`config_dir` options.
.. versionchanged:: 9.3.0
Added shell-completion option for generate a shell completion script.
"""
disallow_names = ('project', 'prog', 'version',
'usage', 'default_config_files', 'default_config_dirs')
supported_shell_completion = ['bash', 'zsh']
# NOTE(dhellmann): This instance is reused by list_opts().
_config_source_opt = ListOpt(
'config_source',
@ -1968,6 +1971,12 @@ class ConfigOpts(abc.Mapping):
'details for accessing configuration settings '
'from locations other than local files.'),
)
# Add option for generate a shell completion script
_shell_completion_opt = StrOpt(
'shell_completion',
choices=supported_shell_completion,
help='Display a shell completion script'
)
def __init__(self):
"""Construct a ConfigOpts object."""
@ -1993,6 +2002,7 @@ class ConfigOpts(abc.Mapping):
self._env_driver = _environment.EnvironmentConfigurationSource()
self.register_opt(self._config_source_opt)
self.register_cli_opt(self._shell_completion_opt)
def _pre_setup(self, project, prog, version, usage, description, epilog,
default_config_files, default_config_dirs):
@ -2138,6 +2148,8 @@ class ConfigOpts(abc.Mapping):
:raises: SystemExit, ConfigFilesNotFoundError, ConfigFileParseError,
ConfigFilesPermissionDeniedError,
RequiredOptError, DuplicateOptError
.. versionchanged:: 9.3.0
Added shell-completion option for generate a shell completion script.
"""
self.clear()
@ -2150,8 +2162,18 @@ class ConfigOpts(abc.Mapping):
self._setup(project, prog, version, usage, default_config_files,
default_config_dirs, use_env)
self._namespace = self._parse_cli_opts(args if args is not None
else sys.argv[1:])
# This is necessary to analyse first args now,
# because if there are subcommands,
# these are mandatory even if you only want to use
# the --shell_completion option
argv = args if args is not None else sys.argv[1:]
if len(argv) > 1 and argv[0] == '--shell_completion' \
and args[1] in self.supported_shell_completion:
shell = argv[1]
self._print_shell_completion(shell)
sys.exit(0)
self._namespace = self._parse_cli_opts(argv)
if self._namespace._files_not_found:
raise ConfigFilesNotFoundError(self._namespace._files_not_found)
if self._namespace._files_permission_denied:
@ -2162,6 +2184,169 @@ class ConfigOpts(abc.Mapping):
self._check_required_opts()
def _print_shell_completion(self, shell):
"""Print shell completion Script
:param shell: name of shell to generate script, actually bash or zsh
"""
maps, descr, opts, opts_sub, args = {}, {}, {}, {}, {}
multi = []
path = f"/etc/oslo.config/{shell}-completion.template"
template = path if os.path.isfile(path) \
else os.path.join(os.path.dirname(os.path.abspath(__file__)),
f"{shell}-completion.template")
for o, g in self._all_cli_opts():
if type(o).__name__ == 'SubCommandOpt':
# If a subcommand, call _add_to_cli, for getting the subparser
o._add_to_cli(self._oparser, g)
else:
name = f"{g}_{o.dest}" \
if not (g is None and g != '') \
else f"{o.dest}"
if o.multi:
multi.append(name)
opts.setdefault(name, [])
opts[name] += [f"--{name}"]
descr[name] = o.help
maps[f"--{name}"] = name
if o.short:
opts[name] += [f"-{o.short}"]
maps[f"-{o.short}"] = name
if not (o.type is None or
o.type.__class__.__name__ == 'Boolean'):
if hasattr(o.type, 'choices') and o.type.choices:
args[name] = ' '.join(o.type.choices.keys())
else:
args[name] = ' '
for op in self._oparser._actions:
# Analyze parser for find subcommanf options and help option
if type(op).__name__ == '_SubParsersAction':
for k, v in op._name_parser_map.items():
descr[k] = v.description if v.description else ''
opts_sub.setdefault(k, {})
for opt in v._actions:
op_str = opt.option_strings
descr[f"{k}_{opt.dest}"] = opt.help
opts_sub[k][opt.dest] = op_str
for op in op_str:
maps[op] = opt.dest
elif type(op).__name__ == '_HelpAction':
opts.setdefault(op.dest, [])
opts[op.dest] += [f"--{op.dest}", '-h']
descr[op.dest] = op.help
if shell == 'bash':
output = self._generate_bash_completion(template,
maps=maps,
opts=opts,
descr=descr,
opts_sub=opts_sub,
multi=multi,
args=args)
elif shell == 'zsh':
output = self._generate_zsh_completion(template,
maps=maps,
opts=opts,
descr=descr,
opts_sub=opts_sub,
multi=multi,
args=args)
print(output)
def _generate_bash_completion(self,
template,
maps={},
opts={},
descr={},
opts_sub={},
multi=[],
args={}):
"""Generate a bash completaion script
:param template: tamplate for generate script
:param maps: a dict mapping short and long option name with destination
variable
:param opts: a dict of option (destination is key, short and long name
is in a list in value)
:param descr: dict of help message for option
:param opts_sub: dict of subcommand
:param multi: list of MultiOPt
:param args: dict of options with arguments
"""
b_opts_sub = ''
b_opts = ' '.join([f"[{k}]='{' '.join(v)}'"
for k, v in opts.items()])
b_args = ' '.join([f"[{k}]='{v}'" for k, v in args.items()])
for k, v in opts_sub.items():
b_opts += f" [{k}]='{k}'"
sub = '|'.join([f"{ik}=\"{' '.join(iv)}\""
for ik, iv in v.items()if iv != ''])
b_opts_sub += f"[{k}]='{sub}' "
b_map = ' '.join([f"[{k}]={v}" for k, v in maps.items()])
b_multi = ' '.join([f"[{k}]=true" for k in multi])
with open(template, "r") as input:
output = input.read().format(scriptname=self.prog,
opts=b_opts,
opts_sub=b_opts_sub,
args=b_args,
multi=b_multi,
map=b_map)
return output
def _generate_zsh_completion(self,
template,
maps={},
opts={},
descr={},
opts_sub={},
multi=[],
args={}):
"""Generate a zsh completaion script
:param template: tamplate for generate script
:param maps: a dict mapping short and long option name with destination
variable
:param opts: a dict of option (destination is key, short and long name
is in a list in value)
:param descr: dict of help message for option
:param opts_sub: dict of subcommand
:param multi: list of MultiOPt
:param args: dict of options with arguments
"""
p = self.prog
t = ' '
z_opts = ''
for k, v in opts.items():
repeat = '*' if k in multi else f"({' '.join(v)})"
o = f"{{{','.join(v)}}}" if len(v) > 1 else v[0]
d = descr[k]
c = f":choice:({args[k]})" if k in args else ''
z_opts += f"{t*2}'{repeat}'{o}'[{d}]{c}' \\\n"
if opts_sub:
z_opts += f"{t*2}'*::{p} command:_{p}_commands'\n"
c_list = ''
c_opts = ''
for k, v in opts_sub.items():
desc = descr[k] if descr[k] else ''
c_list += f"{t*2}'{k}:{desc}'\n"
c_opts += f"{t*3}{k})\n"
c_opts += f"{t*4}_arguments -s \\\n"
for ik, iv in v.items():
if len(iv) > 1:
c_opts += f"{t*4}'({' '.join(iv)})'{{{','.join(iv)}}}"
else:
c_opts += f"{t*4}{iv[0]}"
desc = descr[k+'_'+ik] if descr[k+'_'+ik] else ''
c_opts += f"'[{desc}]' \\\n"
c_opts += f"\n{t*4};;\n"
with open(template, "r") as input:
output = input.read().format(scriptname=p,
opts=z_opts,
commands_list=c_list,
commands_opts=c_opts)
return output
def _load_alternative_sources(self):
# Look for other sources of option data.
for source_group_name in self.config_source:

16
oslo_config/tests/test_cfg.py
View File

@ -143,8 +143,8 @@ class UsageTestCase(BaseTestCase):
self.conf([])
self.conf.print_usage(file=f)
self.assertIn(
'usage: test [-h] [--config-dir DIR] [--config-file PATH] '
'[--version]',
'usage: test [-h] [--config-dir DIR] [--config-file PATH]\n\
[--shell_completion SHELL_COMPLETION] [--version]',
f.getvalue())
self.assertNotIn('somedesc', f.getvalue())
self.assertNotIn('tepilog', f.getvalue())
@ -167,8 +167,8 @@ class UsageTestCase(BaseTestCase):
self.conf([])
self.conf.print_help(file=f)
self.assertIn(
'usage: test [-h] [--config-dir DIR] [--config-file PATH] '
'[--version]',
'usage: test [-h] [--config-dir DIR] [--config-file PATH]\n\
[--shell_completion SHELL_COMPLETION] [--version]',
f.getvalue())
self.assertIn('somedesc', f.getvalue())
self.assertIn('tepilog', f.getvalue())
@ -182,8 +182,8 @@ class HelpTestCase(BaseTestCase):
self.conf([])
self.conf.print_help(file=f)
self.assertIn(
'usage: test [-h] [--config-dir DIR] [--config-file PATH] '
'[--version]',
'usage: test [-h] [--config-dir DIR] [--config-file PATH]\n\
[--shell_completion SHELL_COMPLETION] [--version]',
f.getvalue())
# argparse may generate two different help messages:
# - In Python >=3.10: "options:\n --version"
@ -2629,7 +2629,7 @@ class MappingInterfaceTestCase(BaseTestCase):
self.assertIn('foo', self.conf)
self.assertIn('config_file', self.conf)
self.assertEqual(len(self.conf), 4)
self.assertEqual(len(self.conf), 5)
self.assertEqual('bar', self.conf['foo'])
self.assertEqual('bar', self.conf.get('foo'))
self.assertIn('bar', list(self.conf.values()))
@ -4036,6 +4036,7 @@ class OptDumpingTestCase(BaseTestCase):
"config_source = []",
"foo = this",
"passwd = ****",
"shell_completion = None",
"blaa.bar = that",
"blaa.key = ****",
"*" * 80,
@ -4061,6 +4062,7 @@ class OptDumpingTestCase(BaseTestCase):
"config files: []",
"=" * 80,
"config_source = []",
"shell_completion = None",
"*" * 80,
], logger.logged)

1
oslo_config/tests/test_generator.py
View File

@ -1132,6 +1132,7 @@ GENERATOR_OPTS = {'format_': 'yaml',
'namespace': ['test'],
'output_file': None,
'summarize': False,
'shell_completion': None,
'wrap_width': 70,
'config_source': []}

27
oslo_config/zsh-completion.template Normal file
View File

@ -0,0 +1,27 @@
#compdef _{scriptname} {scriptname}
_{scriptname}_commands(){{
#Script used only if subcommand
local -a _{scriptname}_cmds
# Add subcommands list
_{scriptname}_cmds=(
{commands_list}
)
if (( CURRENT == 1 )); then
_describe -t commands '{scriptname} command' _{scriptname}_cmds || compadd "$@"
else
local curcontext="$curcontext"
#Check if subcommand and redefine completion
case "$words[1]" in
{commands_opts}
esac
fi
}}
_{scriptname}(){{
local curcontext="$curcontext" state line
_arguments -s \
{opts}
}}

7
releasenotes/notes/add_option_for_shell_completion-47b1b47d41a490e8.yaml Normal file
View File

@ -0,0 +1,7 @@
---
prelude: >
Add option for generate shell completion script
features:
- |
Add generic options, methods in ConfigsOpts class and template files for
generate bash and zsh completion scripts