shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-28 02:25:27 +03:00
Code Releases Activity

Improve help text for import and export

Browse Source
This commit is contained in:
Seth Foster 2022-04-13 14:46:08 -04:00
parent dfea9cc526
commit 65dfc424bc
No known key found for this signature in database
GPG Key ID: 86E90D96F7184028
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
awxkit/awxkit/cli/format.py
View File

@ -59,6 +59,30 @@ def add_authentication_arguments(parser, env):
)
def add_verbose(formatting, env):
formatting.add_argument(
'-v',
'--verbose',
dest='conf.verbose',
help='print debug-level logs, including requests made',
default=strtobool(env.get('CONTROLLER_VERBOSE', env.get('TOWER_VERBOSE', 'f'))),
action="store_true",
)
def add_formatting_import_export(parser, env):
formatting = parser.add_argument_group('input/output formatting')
formatting.add_argument(
'-f',
'--conf.format',
dest='conf.format',
choices=['json', 'yaml'],
default=env.get('CONTROLLER_FORMAT', env.get('TOWER_FORMAT', 'json')),
help=('specify a format for the input and output'),
)
add_verbose(formatting, env)
def add_output_formatting_arguments(parser, env):
formatting = parser.add_argument_group('input/output formatting')
@ -84,14 +108,7 @@ def add_output_formatting_arguments(parser, env):
default=env.get('CONTROLLER_COLOR', env.get('TOWER_COLOR', 't')),
type=strtobool,
)
formatting.add_argument(
'-v',
'--verbose',
dest='conf.verbose',
help='print debug-level logs, including requests made',
default=strtobool(env.get('CONTROLLER_VERBOSE', env.get('TOWER_VERBOSE', 'f'))),
action="store_true",
)
add_verbose(formatting, env)
def format_response(response, fmt='json', filter='.', changed=False):

10
awxkit/awxkit/cli/resource.py
View File

@ -7,7 +7,7 @@ from awxkit.exceptions import ImportExportError
from awxkit.utils import to_str
from awxkit.api.pages import Page
from awxkit.api.pages.api import EXPORTABLE_RESOURCES
from awxkit.cli.format import FORMATTERS, format_response, add_authentication_arguments
from awxkit.cli.format import FORMATTERS, format_response, add_authentication_arguments, add_formatting_import_export
from awxkit.cli.utils import CustomRegistryMeta, cprint
@ -125,6 +125,10 @@ class Import(CustomCommand):
help_text = 'import resources into Tower'
def handle(self, client, parser):
if parser:
parser.usage = 'awx import < exportfile'
parser.description = 'import resources from stdin'
add_formatting_import_export(parser, {})
if client.help:
parser.print_help()
raise SystemExit()
@ -159,7 +163,9 @@ class Export(CustomCommand):
def handle(self, client, parser):
self.extend_parser(parser)
parser.usage = 'awx export > exportfile'
parser.description = 'export resources to stdout'
add_formatting_import_export(parser, {})
if client.help:
parser.print_help()
raise SystemExit()