From aff5bdd8b1a58d241fad49aa69f0900d25209410 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 20 Mar 2019 15:44:59 -0700 Subject: [PATCH] Fix Ansible 2.7 uri module The 'path' argument doesn't exist, but 'src' and 'dest' do. Currently this fails due to a KeyError if the module is used. Also, fix the test case to use the 'dest' attribute which is what all versions of the module actually use, rather than 'path'. Change-Id: I09ec78ec16beb455338cf311fc4a9d23442071ab --- .../git/org_plugin-project/playbooks/uri_bad_path.yaml | 2 +- zuul/ansible/base/action/uri.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml index 523aab7380..7130704dad 100644 --- a/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml +++ b/tests/fixtures/config/ansible/git/org_plugin-project/playbooks/uri_bad_path.yaml @@ -3,4 +3,4 @@ - uri: method: GET url: https://example.com - path: /tmp/example.out + dest: /tmp/example.out diff --git a/zuul/ansible/base/action/uri.py b/zuul/ansible/base/action/uri.py index 2030554a82..bc64657ed1 100644 --- a/zuul/ansible/base/action/uri.py +++ b/zuul/ansible/base/action/uri.py @@ -30,6 +30,9 @@ class ActionModule(uri.ActionModule): return paths._fail_module_dict(self._task.action) if paths._is_localhost_task(self): - paths._fail_if_unsafe(self._task.args['path']) + for arg in ('src', 'dest'): + dest = self._task.args.get(arg) + if dest: + paths._fail_if_unsafe(dest) return super(ActionModule, self).run(tmp, task_vars)