new file mode 100644

@@ -0,0 +1,2 @@

+bugfixes:

+    - ensure we always have internal module attributes set, even if not being passed (fixes using modules as script)

@@ -27,8 +27,6 @@ FILE_ATTRIBUTES = {

     'Z': 'compresseddirty',

 }

-PASS_BOOLS = ('no_log', 'debug', 'diff')

-

 # Ansible modules can be written in any language.

 # The functions available here can be used to do many common tasks,

 # to simplify development of Python modules.

@@ -157,6 +155,7 @@ from ansible.module_utils.common.parameters import (

     list_deprecations,

     list_no_log_values,

     PASS_VARS,

+    PASS_BOOLS,

 )

 from ansible.module_utils.six import (

@@ -711,8 +710,10 @@ class AnsibleModule(object):

         if self._tmpdir is None:

             basedir = None

-            basedir = os.path.expanduser(os.path.expandvars(self._remote_tmp))

-            if not os.path.exists(basedir):

+            if self._remote_tmp is not None:

+                basedir = os.path.expanduser(os.path.expandvars(self._remote_tmp))

+

+            if basedir is not None and not os.path.exists(basedir):

                 try:

                     os.makedirs(basedir, mode=0o700)

                 except (OSError, IOError) as e:

@@ -1441,20 +1442,27 @@ class AnsibleModule(object):

         if legal_inputs is None:

             legal_inputs = self._legal_inputs

-        for (k, v) in list(param.items()):

+        for k in list(param.keys()):

             if check_invalid_arguments and k not in legal_inputs:

                 unsupported_parameters.add(k)

-            elif k.startswith('_ansible_'):

-                # handle setting internal properties from internal ansible vars

-                key = k.replace('_ansible_', '')

-                if key in PASS_BOOLS:

-                    setattr(self, PASS_VARS[key], self.boolean(v))

+

+        for k in PASS_VARS:

+            # handle setting internal properties from internal ansible vars

+            param_key = '_ansible_%s' % k

+            if param_key in param:

+                if k in PASS_BOOLS:

+                    setattr(self, PASS_VARS[k][0], self.boolean(param[param_key]))

                 else:

-                    setattr(self, PASS_VARS[key], v)

+                    setattr(self, PASS_VARS[k][0], param[param_key])

-                # clean up internal params:

-                del self.params[k]

+                # clean up internal top level params:

+                if param_key in self.params:

+                    del self.params[param_key]

+            else:

+                # use defaults if not already set

+                if not hasattr(self, PASS_VARS[k][0]):

+                    setattr(self, PASS_VARS[k][0], PASS_VARS[k][1])

         if unsupported_parameters:

             msg = "Unsupported parameters for (%s) module: %s" % (self._name, ', '.join(sorted(list(unsupported_parameters))))

@@ -18,24 +18,28 @@ from ansible.module_utils.six import (

 # Python2 & 3 way to get NoneType

 NoneType = type(None)

+# if adding boolean attribute, also add to PASS_BOOL

+# some of this dupes defaults from controller config

 PASS_VARS = {

-    'check_mode': 'check_mode',

-    'debug': '_debug',

-    'diff': '_diff',

-    'keep_remote_files': '_keep_remote_files',

-    'module_name': '_name',

-    'no_log': 'no_log',

-    'remote_tmp': '_remote_tmp',

-    'selinux_special_fs': '_selinux_special_fs',

-    'shell_executable': '_shell',

-    'socket': '_socket_path',

-    'string_conversion_action': '_string_conversion_action',

-    'syslog_facility': '_syslog_facility',

-    'tmpdir': '_tmpdir',

-    'verbosity': '_verbosity',

-    'version': 'ansible_version',

+    'check_mode': ('check_mode', False),

+    'debug': ('_debug', False),

+    'diff': ('_diff', False),

+    'keep_remote_files': ('_keep_remote_files', False),

+    'module_name': ('_name', None),

+    'no_log': ('no_log', False),

+    'remote_tmp': ('_remote_tmp', None),

+    'selinux_special_fs': ('_selinux_special_fs', ['fuse', 'nfs', 'vboxsf', 'ramfs', '9p']),

+    'shell_executable': ('_shell', '/bin/sh'),

+    'socket': ('_socket_path', None),

+    'string_conversion_action': ('_string_conversion_action', 'warn'),

+    'syslog_facility': ('_syslog_facility', 'INFO'),

+    'tmpdir': ('_tmpdir', None),

+    'verbosity': ('_verbosity', 0),

+    'version': ('ansible_version', '0.0'),

 }

+PASS_BOOLS = ('check_mode', 'debug', 'diff', 'keep_remote_files', 'no_log')

+

 def _return_datastructure_name(obj):

     """ Return native stringified values from datastructures.

new file mode 100644

@@ -0,0 +1 @@

+shippable/posix/group3

new file mode 100644

@@ -0,0 +1 @@

+{ "ANSIBLE_MODULE_ARGS": {} }

new file mode 100644

@@ -0,0 +1,7 @@

+#!/usr/bin/python

+

+from ansible.module_utils.basic import AnsibleModule

+

+module = AnsibleModule(argument_spec=dict())

+

+module.exit_json(**{'tempdir': module._remote_tmp})

new file mode 100755

@@ -0,0 +1,6 @@

+#!/usr/bin/env bash

+

+set -eux

+

+# test running module directly

+python.py library/test.py args.json

@@ -20,7 +20,7 @@ def patch_ansible_module(request, mocker):

         if '_ansible_remote_tmp' not in request.param['ANSIBLE_MODULE_ARGS']:

             request.param['ANSIBLE_MODULE_ARGS']['_ansible_remote_tmp'] = '/tmp'

         if '_ansible_keep_remote_files' not in request.param['ANSIBLE_MODULE_ARGS']:

-            request.param['ANSIBLE_MODULE_ARGS']['_ansible_keep_remote_files'] = '/tmp'

+            request.param['ANSIBLE_MODULE_ARGS']['_ansible_keep_remote_files'] = False

         args = json.dumps(request.param)

     else:

         raise Exception('Malformed data to the patch_ansible_module pytest fixture')