args in free-form syntax can come before or after implicit cmd

ansible · Jun 10, 2024 · 190942f · 190942f
1 parent c2f0510
commit 190942f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/examples/playbooks/transform-no-free-form.transformed.yml b/examples/playbooks/transform-no-free-form.transformed.yml
@@ -8,6 +8,12 @@
         cmd: touch foo
       changed_when: false
 
+    - name: Create a placefolder file
+      ansible.builtin.command: # <-- command can also go first
+        chdir: /tmp
+        cmd: touch bar
+      changed_when: false
+
     - name: Use raw to echo
       ansible.builtin.raw: echo foo # <-- don't use executable=
       args:

diff --git a/examples/playbooks/transform-no-free-form.yml b/examples/playbooks/transform-no-free-form.yml
@@ -6,6 +6,10 @@
       ansible.builtin.command: chdir=/tmp touch foo # <-- don't use shorthand
       changed_when: false
 
+    - name: Create a placefolder file
+      ansible.builtin.command: touch bar chdir=/tmp # <-- command can also go first
+      changed_when: false
+
     - name: Use raw to echo
       ansible.builtin.raw: executable=/bin/bash echo foo # <-- don't use executable=
       changed_when: false

diff --git a/src/ansiblelint/rules/no_free_form.py b/src/ansiblelint/rules/no_free_form.py
@@ -80,7 +80,7 @@ def matchtask(
                 "win_command",
                 "win_shell",
             ):
-                if self.cmd_shell_re.match(action_value):
+                if self.cmd_shell_re.search(action_value):
                     fail = True
             else:
                 fail = True

diff --git a/test/test_transformer.py b/test/test_transformer.py
@@ -143,7 +143,7 @@ def fixture_runner_result(
         ),
         pytest.param(
             "examples/playbooks/transform-no-free-form.yml",
-            4,
+            5,
             True,
             True,
             id="no_free_form_transform",