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

[pre-commit.ci] pre-commit autoupdate (#290) 

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/add-trailing-comma: v2.5.1 → v3.0.0](https://github.com/asottile/add-trailing-comma/compare/v2.5.1...v3.0.0)
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.9-for-vscode → v3.0.0](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.9-for-vscode...v3.0.0)
- [github.com/psf/black: 23.3.0 → 23.7.0](https://github.com/psf/black/compare/23.3.0...23.7.0)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
pull/292/head^2
pre-commit-ci[bot] 2023-07-19 09:29:35 -04:00 committed by GitHub
parent 9e38baf8f2
commit 1c31436512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.pre-commit-config.yaml
View File

@ -16,12 +16,12 @@ repos:
- id: trailing-whitespace
- repo: https://github.com/asottile/add-trailing-comma
rev: v2.5.1
rev: v3.0.0
hooks:
- id: add-trailing-comma
- repo: https://github.com/pre-commit/mirrors-prettier
rev: "v3.0.0-alpha.9-for-vscode"
rev: "v3.0.0"
hooks:
- id: prettier
additional_dependencies:
@ -36,6 +36,6 @@ repos:
args: ["--filter-files"]
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black

6
plugins/action/cli_parse.py
View File

@ -113,7 +113,7 @@ class ActionModule(ActionBase):
self._display.warning(msg)
parserlib = "ansible_collections.{corg}.{cname}.plugins.sub_plugins.cli_parser.{plugin}_parser".format(
**cref
**cref,
)
try:
parsercls = getattr(import_module(parserlib), self.PARSER_CLS_NAME)
@ -135,7 +135,7 @@ class ActionModule(ActionBase):
]:
parserlib = (
"ansible_collections.{corg}.{cname}.plugins.cli_parsers.{plugin}_parser".format(
**cref
**cref,
)
)
try:
@ -281,7 +281,7 @@ class ActionModule(ActionBase):
DOCUMENTATION,
"cli_parse module",
schema_conditionals=ARGSPEC_CONDITIONALS,
**self._task.args
**self._task.args,
)
if not valid:
return argspec_result

2
plugins/action/fact_diff.py
View File

@ -75,7 +75,7 @@ class ActionModule(ActionBase):
cref.update(directory=directory)
parserlib = (
"ansible_collections.{corg}.{cname}.plugins.sub_plugins.{directory}.{plugin}".format(
**cref
**cref,
)
)
try:

2
plugins/action/validate.py
View File

@ -58,7 +58,7 @@ class ActionModule(ActionBase):
DOCUMENTATION,
"validate module",
schema_conditionals=ARGSPEC_CONDITIONALS,
**self._task.args
**self._task.args,
)
if not valid:
return argspec_result

5
plugins/filter/param_list_compare.py
View File

@ -176,7 +176,10 @@ def param_list_compare(*args, **kwargs):
)
valid, argspec_result, updated_params = check_argspec(
DOCUMENTATION, "param_list_compare filter", schema_conditionals=ARGSPEC_CONDITIONALS, **data
DOCUMENTATION,
"param_list_compare filter",
schema_conditionals=ARGSPEC_CONDITIONALS,
**data,
)
if not valid:
raise AnsibleFilterError(

5
plugins/filter/validate.py
View File

@ -94,7 +94,10 @@ def validate(*args, **kwargs):
params.update({"engine": kwargs["engine"]})
valid, argspec_result, updated_params = check_argspec(
DOCUMENTATION, "validate filter", schema_conditionals=ARGSPEC_CONDITIONALS, **params
DOCUMENTATION,
"validate filter",
schema_conditionals=ARGSPEC_CONDITIONALS,
**params,
)
if not valid:
raise AnsibleFilterError(

2
plugins/lookup/validate.py
View File

@ -112,7 +112,7 @@ class LookupModule(LookupBase):
schema=schema[0],
name="validate lookup",
schema_conditionals=ARGSPEC_CONDITIONALS,
**params
**params,
)
if not valid:
raise AnsibleLookupError(

6
plugins/plugin_utils/base/validate.py
View File

@ -49,7 +49,7 @@ class ValidateBase(object):
cref = dict(zip(["corg", "cname", "plugin"], engine.split(".")))
validatorlib = (
"ansible_collections.{corg}.{cname}.plugins.sub_plugins.validate.{plugin}".format(
**cref
**cref,
)
)
@ -123,7 +123,9 @@ class ValidateBase(object):
break
valid, argspec_result, updated_params = check_argspec(
yaml.dump(argspec_obj), self._engine, **params
yaml.dump(argspec_obj),
self._engine,
**params,
)
if not valid:
raise AnsibleError(

5
plugins/test/validate.py
View File

@ -100,7 +100,10 @@ def validate(*args, **kwargs):
params.update({item: kwargs[item]})
valid, argspec_result, updated_params = check_argspec(
DOCUMENTATION, "validate test", schema_conditionals=ARGSPEC_CONDITIONALS, **params
DOCUMENTATION,
"validate test",
schema_conditionals=ARGSPEC_CONDITIONALS,
**params,
)
if not valid:
raise AnsibleError(

15
tests/unit/plugins/action/test_cli_parse.py
View File

@ -81,7 +81,10 @@ class TestCli_Parse(unittest.TestCase):
},
}
valid, result, updated_params = check_argspec(
DOCUMENTATION, "cli_parse module", schema_conditionals={}, **kwargs
DOCUMENTATION,
"cli_parse module",
schema_conditionals={},
**kwargs,
)
self.assertEqual(valid, True)
@ -94,7 +97,10 @@ class TestCli_Parse(unittest.TestCase):
},
}
valid, result, updated_params = check_argspec(
DOCUMENTATION, "cli_parse module", schema_conditionals=ARGSPEC_CONDITIONALS, **kwargs
DOCUMENTATION,
"cli_parse module",
schema_conditionals=ARGSPEC_CONDITIONALS,
**kwargs,
)
self.assertIn("one of the following is required: command, text", result["errors"])
@ -103,7 +109,10 @@ class TestCli_Parse(unittest.TestCase):
"""Confirm failed argspec no parser name"""
kwargs = {"text": "anything", "parser": {"command": "show version"}}
valid, result, updated_params = check_argspec(
DOCUMENTATION, "cli_parse module", schema_conditionals=ARGSPEC_CONDITIONALS, **kwargs
DOCUMENTATION,
"cli_parse module",
schema_conditionals=ARGSPEC_CONDITIONALS,
**kwargs,
)
self.assertIn(
"missing required arguments: name found in parser",