mirror of
https://github.com/thegeeklab/ansible-later.git
synced 2024-11-22 21:00:44 +00:00
fix handling of empty task names
This commit is contained in:
parent
3b5b3e6979
commit
031e528c4b
@ -45,12 +45,12 @@ def check_named_task(candidate, settings):
|
|||||||
nameless_tasks = ["meta", "debug", "include_role", "import_role",
|
nameless_tasks = ["meta", "debug", "include_role", "import_role",
|
||||||
"include_tasks", "import_tasks", "include_vars",
|
"include_tasks", "import_tasks", "include_vars",
|
||||||
"block"]
|
"block"]
|
||||||
description = "module '%s' used without name attribute"
|
description = "module '%s' used without or empty name attribute"
|
||||||
|
|
||||||
if not errors:
|
if not errors:
|
||||||
for task in tasks:
|
for task in tasks:
|
||||||
module = task["action"]["__ansible_module__"]
|
module = task["action"]["__ansible_module__"]
|
||||||
if "name" not in task and module not in nameless_tasks:
|
if ("name" not in task or not task["name"]) and module not in nameless_tasks:
|
||||||
errors.append(Error(task["__line__"], description % module))
|
errors.append(Error(task["__line__"], description % module))
|
||||||
|
|
||||||
return Result(candidate.path, errors)
|
return Result(candidate.path, errors)
|
||||||
@ -66,7 +66,7 @@ def check_name_format(candidate, settings):
|
|||||||
if "name" in task:
|
if "name" in task:
|
||||||
namelines[task["name"]].append(task["__line__"])
|
namelines[task["name"]].append(task["__line__"])
|
||||||
for (name, lines) in namelines.items():
|
for (name, lines) in namelines.items():
|
||||||
if not name[0].isupper():
|
if name and not name[0].isupper():
|
||||||
errors.append(Error(lines[-1], description % name))
|
errors.append(Error(lines[-1], description % name))
|
||||||
|
|
||||||
return Result(candidate.path, errors)
|
return Result(candidate.path, errors)
|
||||||
@ -83,7 +83,7 @@ def check_unique_named_task(candidate, settings):
|
|||||||
if "name" in task:
|
if "name" in task:
|
||||||
namelines[task["name"]].append(task["__line__"])
|
namelines[task["name"]].append(task["__line__"])
|
||||||
for (name, lines) in namelines.items():
|
for (name, lines) in namelines.items():
|
||||||
if len(lines) > 1:
|
if name and len(lines) > 1:
|
||||||
errors.append(Error(lines[-1], description % name))
|
errors.append(Error(lines[-1], description % name))
|
||||||
|
|
||||||
return Result(candidate.path, errors)
|
return Result(candidate.path, errors)
|
||||||
|
Loading…
Reference in New Issue
Block a user