adyxax/ansible-role-borg
Archived
1
0
Fork 0
Code Issues Activity

Allow hyphens in borg job name

Browse source
This commit is contained in:
Julien Dessaux 2021-10-05 14:25:38 +02:00
parent 277f232657
commit 42790f21cd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
action_plugins/borg_validate.py
View file

@ -39,8 +39,8 @@ class ActionModule(ActionBase):
error_msgs.append(f"Invalid job for host {task_vars['ansible_host']} : no name defined") error_msgs.append(f"Invalid job for host {task_vars['ansible_host']} : no name defined")
elif not isinstance(job['name'], str): elif not isinstance(job['name'], str):
error_msgs.append(f"Invalid job name for host {task_vars['ansible_host']} : name must be of type string") error_msgs.append(f"Invalid job name for host {task_vars['ansible_host']} : name must be of type string")
elif not re.match(r'^[a-zA-Z0-9_]+$', job['name']): elif not re.match(r'^[a-zA-Z0-9_-]+$', job['name']):
error_msgs.append(f"Invalid job name for host {task_vars['ansible_host']} : name must match ^[a-zA-Z0-9_]+$") error_msgs.append(f"Invalid job name for host {task_vars['ansible_host']} : name must match ^[a-zA-Z0-9_-]+$")
# path and command_to_pipe are mutually exclusive # path and command_to_pipe are mutually exclusive
if 'path' in job.keys() and 'command_to_pipe' in job.keys(): if 'path' in job.keys() and 'command_to_pipe' in job.keys():
error_msgs.append(f"Invalid job for host {task_vars['ansible_host']} : it needs either a path or a command_to_pipe, not both") error_msgs.append(f"Invalid job for host {task_vars['ansible_host']} : it needs either a path or a command_to_pipe, not both")