diff options
| author | Egor Tensin <egor@tensin.name> | 2025-11-24 00:47:29 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2025-11-27 01:31:43 +0100 |
| commit | c4b418a791acf23742195709b3be777128c55ce1 (patch) | |
| tree | e04967a81122048592be935647e63eeb89c0fb79 /plugins/action/etckeeper_commit.py | |
| parent | fix some ansible-lint warnings (diff) | |
| download | infra-ansible-c4b418a791acf23742195709b3be777128c55ce1.tar.gz infra-ansible-c4b418a791acf23742195709b3be777128c55ce1.zip | |
plugins: add safe_git
Diffstat (limited to 'plugins/action/etckeeper_commit.py')
| -rwxr-xr-x | plugins/action/etckeeper_commit.py | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/plugins/action/etckeeper_commit.py b/plugins/action/etckeeper_commit.py index 065b9eb..d16e66f 100755 --- a/plugins/action/etckeeper_commit.py +++ b/plugins/action/etckeeper_commit.py @@ -4,6 +4,7 @@ import re from ansible.errors import AnsibleActionFail from ansible.plugins.action import ActionBase +from ansible_collections.tensin.infra.plugins.module_utils import git class ActionModule(ActionBase): @@ -15,7 +16,7 @@ class ActionModule(ActionBase): allowlist = [re.compile(pattern) for pattern in allowlist] skip_no_changes = self._task.args.get('skip_no_changes', False) - dirty_files = self._get_dirty_file_list('/etc', task_vars) + dirty_files = git.get_dirty_file_list(self, '/etc', task_vars) if not dirty_files: if skip_no_changes: return result @@ -31,25 +32,6 @@ class ActionModule(ActionBase): return self._commit(msg, task_vars) - def _get_dirty_file_list(self, repo_dir, task_vars): - status = self._get_status(repo_dir, task_vars) - status = status.splitlines() - status = [line[3:] for line in status] - return status - - def _get_status(self, repo_dir, task_vars): - cmd_result = self._execute_module( - module_name='ansible.builtin.command', - module_args=dict( - argv=['git', 'status', '--porcelain'], - chdir=repo_dir, - ), - task_vars=task_vars, - ) - if cmd_result.get('failed'): - raise AnsibleActionFail(f"Couldn't get git status for {repo_dir}", result=cmd_result) - return cmd_result['stdout'] - def _commit(self, msg, task_vars): cmd_result = self._execute_module( module_name='ansible.builtin.command', |
