diff options
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/action/apt_wrapper.py | 14 | ||||
| -rwxr-xr-x | plugins/action/etckeeper_commit.py | 18 | ||||
| -rwxr-xr-x | plugins/action/parse_json_file.py | 8 | ||||
| -rwxr-xr-x | plugins/action/read_file.py | 6 | ||||
| -rwxr-xr-x | plugins/action/safe_git.py | 30 | ||||
| -rw-r--r-- | plugins/module_utils/file.py | 16 | ||||
| -rw-r--r-- | plugins/module_utils/git.py | 56 |
7 files changed, 74 insertions, 74 deletions
diff --git a/plugins/action/apt_wrapper.py b/plugins/action/apt_wrapper.py index 804454b..b524080 100755 --- a/plugins/action/apt_wrapper.py +++ b/plugins/action/apt_wrapper.py @@ -5,30 +5,30 @@ import re from ansible.plugins.action import ActionBase from ansible_collections.tensin.infra.plugins.module_utils import file -LOG_PATH = '/var/log/dpkg.log' +LOG_PATH = "/var/log/dpkg.log" class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): super().run(tmp, task_vars) - before = self._parse_dpkg_log(task_vars, default='') + before = self._parse_dpkg_log(task_vars, default="") apt_result = self._execute_module( - module_name='ansible.builtin.apt', - module_args=self._task.args.get('apt_args', {}), + module_name="ansible.builtin.apt", + module_args=self._task.args.get("apt_args", {}), task_vars=task_vars, ) after = self._parse_dpkg_log(task_vars) - apt_result['packages'] = after[len(before) :] + apt_result["packages"] = after[len(before) :] return apt_result def _parse_dpkg_log(self, task_vars, default=None): contents = file.read_file(self, LOG_PATH, task_vars, default=default) lines = contents.splitlines() - regex = re.compile(' install | upgrade | remove | purge ') + regex = re.compile(" install | upgrade | remove | purge ") lines = [line for line in lines if regex.search(line)] - lines = [' '.join(line.split(' ')[2:]) for line in lines] + lines = [" ".join(line.split(" ")[2:]) for line in lines] return lines diff --git a/plugins/action/etckeeper_commit.py b/plugins/action/etckeeper_commit.py index 06c7be0..d4c4519 100755 --- a/plugins/action/etckeeper_commit.py +++ b/plugins/action/etckeeper_commit.py @@ -11,16 +11,16 @@ class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): result = super().run(tmp, task_vars) - msg = self._task.args['msg'] - allowlist = self._task.args.get('allowlist', []) + msg = self._task.args["msg"] + allowlist = self._task.args.get("allowlist", []) allowlist = [re.compile(pattern) for pattern in allowlist] - skip_no_changes = self._task.args.get('skip_no_changes', False) + skip_no_changes = self._task.args.get("skip_no_changes", False) - dirty_files = git.get_dirty_file_list(self, '/etc', task_vars) + dirty_files = git.get_dirty_file_list(self, "/etc", task_vars) if not dirty_files: if skip_no_changes: return result - raise AnsibleActionFail('Nothing to commit') + raise AnsibleActionFail("Nothing to commit") if allowlist: unexpected = [ @@ -37,12 +37,12 @@ class ActionModule(ActionBase): def _commit(self, msg, task_vars): cmd_result = self._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( - argv=['etckeeper', 'commit', msg], + argv=["etckeeper", "commit", msg], ), task_vars=task_vars, ) - if cmd_result.get('failed'): - raise AnsibleActionFail('etckeeper commit failed', result=cmd_result) + if cmd_result.get("failed"): + raise AnsibleActionFail("etckeeper commit failed", result=cmd_result) return cmd_result diff --git a/plugins/action/parse_json_file.py b/plugins/action/parse_json_file.py index d9c864a..fe776a8 100755 --- a/plugins/action/parse_json_file.py +++ b/plugins/action/parse_json_file.py @@ -11,8 +11,8 @@ class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): result = super().run(tmp, task_vars) - path = self._task.args['path'] - default = self._task.args.get('default') + path = self._task.args["path"] + default = self._task.args.get("default") if default is not None: default = json.dumps(default) @@ -21,7 +21,7 @@ class ActionModule(ActionBase): try: content = json.loads(content) except json.JSONDecodeError as e: - raise AnsibleActionFail(f'Failed to parse JSON at {path}') from e + raise AnsibleActionFail(f"Failed to parse JSON at {path}") from e - result['content'] = content + result["content"] = content return result diff --git a/plugins/action/read_file.py b/plugins/action/read_file.py index 3370846..ec43e1e 100755 --- a/plugins/action/read_file.py +++ b/plugins/action/read_file.py @@ -8,8 +8,8 @@ class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): result = super().run(tmp, task_vars) - path = self._task.args['path'] - default = self._task.args.get('default') + path = self._task.args["path"] + default = self._task.args.get("default") - result['content'] = file.read_file(self, path, task_vars, default=default) + result["content"] = file.read_file(self, path, task_vars, default=default) return result diff --git a/plugins/action/safe_git.py b/plugins/action/safe_git.py index 8389169..8d4504b 100755 --- a/plugins/action/safe_git.py +++ b/plugins/action/safe_git.py @@ -9,25 +9,25 @@ class ActionModule(ActionBase): def run(self, tmp=None, task_vars=None): result = super().run(tmp, task_vars) - repo = self._task.args['repo'] - dest = self._task.args['dest'] - accept_hostkey = self._task.args.get('accept_hostkey', False) - remote = self._task.args.get('remote', 'origin') - version = self._task.args['version'] + repo = self._task.args["repo"] + dest = self._task.args["dest"] + accept_hostkey = self._task.args.get("accept_hostkey", False) + remote = self._task.args.get("remote", "origin") + version = self._task.args["version"] builtin_args = { - 'repo': repo, - 'dest': dest, - 'accept_hostkey': accept_hostkey, - 'remote': remote, - 'version': version, + "repo": repo, + "dest": dest, + "accept_hostkey": accept_hostkey, + "remote": remote, + "version": version, } if not file.does_dir_exist(self, dest, task_vars): # If the destination directory doesn't exist, delegate to the # builtin module. return self._execute_module( - module_name='ansible.builtin.git', + module_name="ansible.builtin.git", module_args=builtin_args, task_vars=task_vars, ) @@ -35,7 +35,7 @@ class ActionModule(ActionBase): # ansible.builtin.git would just remove everything, fuck that. if not git.is_work_tree(self, dest, task_vars): raise AnsibleActionFail( - f'Destination {dest} exists but is not a repository' + f"Destination {dest} exists but is not a repository" ) # Again, ansible.builtin.git would just remove everything, fuck that. @@ -49,7 +49,7 @@ class ActionModule(ActionBase): # `false`, but I don't want to depend on default values. dirty_files = git.get_dirty_file_list(self, dest, task_vars) if dirty_files: - raise AnsibleActionFail(f'There are local changes in {dest}') + raise AnsibleActionFail(f"There are local changes in {dest}") # Fetch the remote. git.update_remote(self, dest, remote, task_vars, accept_hostkey=accept_hostkey) @@ -59,12 +59,12 @@ class ActionModule(ActionBase): is_ancestor = git.is_ancestor(self, dest, remote, version, task_vars) if not is_ancestor: raise AnsibleActionFail( - f'HEAD in {dest} is not an ancestor of {remote}/{version}' + f"HEAD in {dest} is not an ancestor of {remote}/{version}" ) # Finally, everything looks good, delegate to the builtin module. return self._execute_module( - module_name='ansible.builtin.git', + module_name="ansible.builtin.git", module_args=builtin_args, task_vars=task_vars, ) diff --git a/plugins/module_utils/file.py b/plugins/module_utils/file.py index 4492f81..b0491e8 100644 --- a/plugins/module_utils/file.py +++ b/plugins/module_utils/file.py @@ -6,7 +6,7 @@ from ansible.module_utils.common.text.converters import to_text def _get_stat(action, path, task_vars): stat_result = action._execute_module( - module_name='ansible.builtin.stat', + module_name="ansible.builtin.stat", module_args=dict( path=path, get_attributes=False, @@ -15,18 +15,18 @@ def _get_stat(action, path, task_vars): ), task_vars=task_vars, ) - if stat_result.get('failed'): + if stat_result.get("failed"): raise AnsibleActionFail(f"Couldn't stat file {path}", result=stat_result) - return stat_result['stat'] + return stat_result["stat"] def does_file_exist(action, path, task_vars): - return _get_stat(action, path, task_vars)['exists'] + return _get_stat(action, path, task_vars)["exists"] def does_dir_exist(action, path, task_vars): stat = _get_stat(action, path, task_vars) - return stat['exists'] and stat.get('isdir', False) + return stat["exists"] and stat.get("isdir", False) def read_file(action, path, task_vars, default=False): @@ -34,10 +34,10 @@ def read_file(action, path, task_vars, default=False): if not does_file_exist(action, path, task_vars): return default read_result = action._execute_module( - module_name='ansible.builtin.slurp', + module_name="ansible.builtin.slurp", module_args=dict(src=path), task_vars=task_vars, ) - if read_result.get('failed'): + if read_result.get("failed"): raise AnsibleActionFail(f"Couldn't read file {path}", result=read_result) - return base64.b64decode(to_text(read_result['content'])).decode('utf-8') + return base64.b64decode(to_text(read_result["content"])).decode("utf-8") diff --git a/plugins/module_utils/git.py b/plugins/module_utils/git.py index d9c5f35..b05281d 100644 --- a/plugins/module_utils/git.py +++ b/plugins/module_utils/git.py @@ -7,30 +7,30 @@ from ansible.module_utils.common.text.converters import to_text def is_work_tree(action, repo_dir, task_vars): cmd_result = action._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( - argv=['git', 'rev-parse', '--is-inside-work-tree'], + argv=["git", "rev-parse", "--is-inside-work-tree"], chdir=repo_dir, ), task_vars=task_vars, ) - return not cmd_result.get('failed') + return not cmd_result.get("failed") def get_status(action, repo_dir, task_vars): cmd_result = action._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( - argv=['git', 'status', '--porcelain'], + argv=["git", "status", "--porcelain"], chdir=repo_dir, ), task_vars=task_vars, ) - if cmd_result.get('failed'): + if cmd_result.get("failed"): raise AnsibleActionFail( f"Couldn't get git status for {repo_dir}", result=cmd_result ) - return to_text(cmd_result['stdout']) + return to_text(cmd_result["stdout"]) def get_dirty_file_list(action, repo_dir, task_vars): @@ -40,46 +40,46 @@ def get_dirty_file_list(action, repo_dir, task_vars): return status -def get_remote_url(action, repo_dir, task_vars, remote='origin'): +def get_remote_url(action, repo_dir, task_vars, remote="origin"): cmd_result = action._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( - argv=['git', 'config', '--local', f'remote.{remote}.url'], + argv=["git", "config", "--local", f"remote.{remote}.url"], chdir=repo_dir, ), task_vars=task_vars, ) - if cmd_result.get('failed'): + if cmd_result.get("failed"): raise AnsibleActionFail( f"Couldn't read the URL of remote '{remote}' in {repo_dir}", result=cmd_result, ) - return cmd_result['stdout'] + return cmd_result["stdout"] def update_remote(action, repo_dir, remote, task_vars, accept_hostkey=False): - ssh = os.environ.get('GIT_SSH', 'ssh') - ssh_opts = '' + ssh = os.environ.get("GIT_SSH", "ssh") + ssh_opts = "" if accept_hostkey: - ssh_opts += ' -o StrictHostKeyChecking=no' + ssh_opts += " -o StrictHostKeyChecking=no" ssh_command = shlex.quote(ssh) + ssh_opts cmd_result = action._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( argv=[ - 'env', - f'GIT_SSH_COMMAND={ssh_command}', - 'git', - 'remote', - 'update', + "env", + f"GIT_SSH_COMMAND={ssh_command}", + "git", + "remote", + "update", remote, ], chdir=repo_dir, ), task_vars=task_vars, ) - if cmd_result.get('failed'): + if cmd_result.get("failed"): raise AnsibleActionFail( f"Couldn't update remote '{remote}' for {repo_dir}", result=cmd_result ) @@ -87,24 +87,24 @@ def update_remote(action, repo_dir, remote, task_vars, accept_hostkey=False): def is_ancestor(action, repo_dir, remote, version, task_vars): looks_like_hash = all( - ((c >= '0' and c <= '9') or (c >= 'a' and c <= 'f') for c in version) + ((c >= "0" and c <= "9") or (c >= "a" and c <= "f") for c in version) ) - remote_versions = [f'{remote}/{version}'] + remote_versions = [f"{remote}/{version}"] if looks_like_hash: remote_versions += [version] for _version in remote_versions: cmd_result = action._execute_module( - module_name='ansible.builtin.command', + module_name="ansible.builtin.command", module_args=dict( - argv=['git', 'merge-base', '--is-ancestor', 'HEAD', _version], + argv=["git", "merge-base", "--is-ancestor", "HEAD", _version], chdir=repo_dir, ), task_vars=task_vars, ) - if cmd_result.get('failed'): - if cmd_result.get('stderr'): + if cmd_result.get("failed"): + if cmd_result.get("stderr"): continue else: return True |