More work on getting integration tests running for v2

v2/ansible/parsing/mod_args.py

@@ -55,6 +55,15 @@ class ModuleArgsParser:
           src: a
           dest: b
 
+    # extra gross, but also legal. in this case, the args specified
+    # will act as 'defaults' and will be overriden by any args specified
+    # in one of the other formats (complex args under the action, or
+    # parsed from the k=v string
+    - command: 'pwd'
+      args:
+        chdir: '/tmp'
+
+
     This class has some of the logic to canonicalize these into the form
 
     - module: <module_name>
@@ -104,19 +113,24 @@ class ModuleArgsParser:
 
         return (action, args)
 
-    def _normalize_parameters(self, thing, action=None):
+    def _normalize_parameters(self, thing, action=None, additional_args=dict()):
         '''
         arguments can be fuzzy.  Deal with all the forms.
         '''
 
-        args = dict()
+        # final args are the ones we'll eventually return, so first update
+        # them with any additional args specified, which have lower priority
+        # than those which may be parsed/normalized next
+        final_args = dict()
+        if additional_args:
+            final_args.update(additional_args)
 
         # how we normalize depends if we figured out what the module name is
         # yet.  If we have already figured it out, it's an 'old style' invocation.
         # otherwise, it's not
 
         if action is not None:
-            args = self._normalize_old_style_args(thing)
+            args = self._normalize_old_style_args(thing, action)
         else:
             (action, args) = self._normalize_new_style_args(thing)
 
@@ -124,9 +138,14 @@ class ModuleArgsParser:
         if args and 'args' in args:
             args = args['args']
 
-        return (action, args)
+        # finally, update the args we're going to return with the ones
+        # which were normalized above
+        if args:
+            final_args.update(args)
 
-    def _normalize_old_style_args(self, thing):
+        return (action, final_args)
+
+    def _normalize_old_style_args(self, thing, action):
         '''
         deals with fuzziness in old-style (action/local_action) module invocations
         returns tuple of (module_name, dictionary_args)
@@ -144,7 +163,8 @@ class ModuleArgsParser:
             args = thing
         elif isinstance(thing, string_types):
             # form is like: local_action: copy src=a dest=b ... pretty common
-            args = parse_kv(thing)
+            check_raw = action in ('command', 'shell', 'script')
+            args = parse_kv(thing, check_raw=check_raw)
         elif isinstance(thing, NoneType):
             # this can happen with modules which take no params, like ping:
             args = None
@@ -180,7 +200,8 @@ class ModuleArgsParser:
         elif isinstance(thing, string_types):
             # form is like:  copy: src=a dest=b ... common shorthand throughout ansible
             (action, args) = self._split_module_string(thing)
-            args = parse_kv(args)
+            check_raw = action in ('command', 'shell', 'script')
+            args = parse_kv(args, check_raw=check_raw)
 
         else:
             # need a dict or a string, so giving up
@@ -206,13 +227,20 @@ class ModuleArgsParser:
         # We can have one of action, local_action, or module specified
         #
 
+
+        # this is the 'extra gross' scenario detailed above, so we grab
+        # the args and pass them in as additional arguments, which can/will
+        # be overwritten via dict updates from the other arg sources below
+        # FIXME: add test cases for this
+        additional_args = self._task_ds.get('args', dict())
+
         # action
         if 'action' in self._task_ds:
 
             # an old school 'action' statement
             thing = self._task_ds['action']
             delegate_to = None
-            action, args = self._normalize_parameters(thing)
+            action, args = self._normalize_parameters(thing, additional_args=additional_args)
 
         # local_action
         if 'local_action' in self._task_ds:
@@ -222,7 +250,7 @@ class ModuleArgsParser:
                 raise AnsibleParserError("action and local_action are mutually exclusive", obj=self._task_ds)
             thing = self._task_ds.get('local_action', '')
             delegate_to = 'localhost'
-            action, args = self._normalize_parameters(thing)
+            action, args = self._normalize_parameters(thing, additional_args=additional_args)
 
         # module: <stuff> is the more new-style invocation
 
@@ -234,7 +262,7 @@ class ModuleArgsParser:
                     raise AnsibleParserError("conflicting action statements", obj=self._task_ds)
                 action = item
                 thing = value
-                action, args = self._normalize_parameters(value, action=action)
+                action, args = self._normalize_parameters(value, action=action, additional_args=additional_args)
 
         # if we didn't see any module in the task at all, it's not a task really
         if action is None:

v2/ansible/parsing/splitter.py

@@ -40,7 +40,20 @@ def parse_kv(args, check_raw=False):
         raw_params = []
         for x in vargs:
             if "=" in x:
-                k, v = x.split("=", 1)
+                pos = 0
+                try:
+                    while True:
+                        pos = x.index('=', pos + 1)
+                        if pos > 0 and x[pos - 1] != '\\':
+                            break
+                except ValueError:
+                    # ran out of string, but we must have some escaped equals,
+                    # so replace those and append this to the list of raw params
+                    raw_params.append(x.replace('\\=', '='))
+                    continue
+
+                k = x[:pos]
+                v = x[pos + 1:]
 
                 # only internal variables can start with an underscore, so
                 # we don't allow users to set them directy in arguments