remove wildcards and add boilerplate

* cloud/centurylink * source_control * cloud/google * notification * cloud/rackspace * cloud/vmware
2026-05-07 13:52:54 +00:00 · 2017-07-29 08:05:38 -07:00
parent 21564cdb98
commit 4109a82d0a
135 changed files with 1343 additions and 2631 deletions
--- a/lib/ansible/modules/source_control/bzr.py
+++ b/lib/ansible/modules/source_control/bzr.py
@@ -3,21 +3,11 @@

 # (c) 2013, André Paramés <git@andreparames.com>
 # Based on the Git module by Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -73,8 +63,11 @@ EXAMPLES = '''
    version: 22
 '''

+import os
 import re

+from ansible.module_utils.basic import AnsibleModule
+

 class Bzr(object):
    def __init__(self, module, parent, dest, version, bzr_path):
@@ -167,7 +160,7 @@ def main():

    bzrconfig = os.path.join(dest, '.bzr', 'branch', 'branch.conf')

-    rc, out, err, status = (0, None, None, None)
+    rc, out, err = (0, None, None)

    bzr = Bzr(module, parent, dest, version, bzr_path)

@@ -202,8 +195,6 @@ def main():

    module.exit_json(changed=changed, before=before, after=after)

-# import module snippets
-from ansible.module_utils.basic import *

 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/git.py
+++ b/lib/ansible/modules/source_control/git.py
@@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -277,7 +267,6 @@ import tempfile
 from distutils.version import LooseVersion

 from ansible.module_utils.basic import AnsibleModule, get_module_path
-from ansible.module_utils.basic import get_exception
 from ansible.module_utils.six import b, string_types
 from ansible.module_utils._text import to_native

@@ -962,12 +951,11 @@ def create_archive(git_path, module, dest, archive, version, repo, result):
                shutil.move(new_archive, archive)
                shutil.remove(tempdir)
                result.update(changed=True)
-            except OSError:
-                exception = get_exception()
+            except OSError as e:
                module.fail_json(msg="Failed to move %s to %s" %
                                     (new_archive, archive),
                                 details="Error occured while moving : %s"
-                                         % exception)
+                                         % to_native(e))
    else:
        # Perform archive from local directory
        git_archive(git_path, module, dest, archive, archive_fmt, version)
--- a/lib/ansible/modules/source_control/git_config.py
+++ b/lib/ansible/modules/source_control/git_config.py
@@ -4,20 +4,11 @@
 # (c) 2015, Marius Gedminas <marius@pov.lt>
 # (c) 2016, Matthew Gamble <git@matthewgamble.net>
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -156,6 +147,7 @@ config_values:
    alias.diffc: "diff --cached"
    alias.remotev: "remote -v"
 '''
+from ansible.module_utils.basic import AnsibleModule


 def main():
@@ -251,7 +243,6 @@ def main():
        changed=True
    )

-from ansible.module_utils.basic import *

 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/github_deploy_key.py
+++ b/lib/ansible/modules/source_control/github_deploy_key.py
@@ -1,20 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {
    'metadata_version': '1.0',
@@ -176,9 +167,10 @@ id:
    sample: 24381901
 '''

+import json
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import fetch_url
-import json


 class GithubDeployKey(object):
--- a/lib/ansible/modules/source_control/github_hooks.py
+++ b/lib/ansible/modules/source_control/github_hooks.py
@@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2013, Phillip Gentry <phillip@cx.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type

-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -90,16 +80,9 @@ EXAMPLES = '''
  delegate_to: localhost
 '''

-try:
-    import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        # Let snippet from module_utils/basic.py return a proper error in this case
-        pass
-
 import base64
+import json
+
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.urls import fetch_url

--- a/lib/ansible/modules/source_control/github_issue.py
+++ b/lib/ansible/modules/source_control/github_issue.py
@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # (c) 2017, Abhijeet Kasurde <akasurde@redhat.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -86,6 +76,7 @@ try:
    HAS_GITHUB_PACKAGE = True
 except ImportError:
    HAS_GITHUB_PACKAGE = False
+
 from ansible.module_utils.basic import AnsibleModule


@@ -125,5 +116,6 @@ def main():

    module.exit_json(**result)

+
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/github_key.py
+++ b/lib/ansible/modules/source_control/github_key.py
@@ -1,18 +1,11 @@
 #!/usr/bin/python
-# This file is part of Ansible
 #
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -89,10 +82,12 @@ EXAMPLES = '''
 '''


-import sys  # noqa
 import json
 import re

+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.urls import fetch_url
+

 API_BASE = 'https://api.github.com'

@@ -241,8 +236,6 @@ def main():

    module.exit_json(**result)

-from ansible.module_utils.basic import *  # noqa
-from ansible.module_utils.urls import *  # noqa

 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/github_release.py
+++ b/lib/ansible/modules/source_control/github_release.py
@@ -1,20 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
+# Copyright: Ansible Team
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.0',
@@ -138,7 +129,9 @@ try:
    HAS_GITHUB_API = True
 except ImportError:
    HAS_GITHUB_API = False
-from ansible.module_utils.basic import AnsibleModule, get_exception
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native


 def main():
@@ -188,9 +181,8 @@ def main():

        # test if we're actually logged in
        gh_obj.me()
-    except github3.AuthenticationFailed:
-        e = get_exception()
-        module.fail_json(msg='Failed to connect to GitHub: %s' % e,
+    except github3.AuthenticationFailed as e:
+        module.fail_json(msg='Failed to connect to GitHub: %s' % to_native(e),
                         details="Please check username and password or token "
                                 "for repository %s" % repo)

--- a/lib/ansible/modules/source_control/gitlab_group.py
+++ b/lib/ansible/modules/source_control/gitlab_group.py
@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # (c) 2015, Werner Dijkerman (ikben@werner-dijkerman.nl)
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -108,8 +98,9 @@ try:
 except:
    HAS_GITLAB_PACKAGE = False

-from ansible.module_utils.basic import *
-from ansible.module_utils.pycompat24 import get_exception
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native
+

 class GitLabGroup(object):
    def __init__(self, module, git):
@@ -197,9 +188,8 @@ def main():
            git.login(user=login_user, password=login_password)
        else:
            git = gitlab.Gitlab(server_url, token=login_token, verify_ssl=verify_ssl)
-    except Exception:
-        e = get_exception()
-        module.fail_json(msg="Failed to connect to Gitlab server: %s " % e)
+    except Exception as e:
+        module.fail_json(msg="Failed to connect to Gitlab server: %s " % to_native(e))

    # Check if user is authorized or not before proceeding to any operations
    # if not, exit from here
@@ -228,7 +218,5 @@ def main():
                    module.exit_json(changed=True, result="Successfully created or updated the group %s" % group_name)


-
-
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/gitlab_project.py
+++ b/lib/ansible/modules/source_control/gitlab_project.py
@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # (c) 2015, Werner Dijkerman (ikben@werner-dijkerman.nl)
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -170,8 +160,8 @@ try:
 except:
    HAS_GITLAB_PACKAGE = False

-from ansible.module_utils.basic import *
-from ansible.module_utils.pycompat24 import get_exception
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native


 class GitLabProject(object):
@@ -371,9 +361,8 @@ def main():
            git.login(user=login_user, password=login_password)
        else:
            git = gitlab.Gitlab(server_url, token=login_token, verify_ssl=verify_ssl)
-    except Exception:
-        e = get_exception()
-        module.fail_json(msg="Failed to connect to Gitlab server: %s " % e)
+    except Exception as e:
+        module.fail_json(msg="Failed to connect to Gitlab server: %s " % to_native(e))

    # Check if user is authorized or not before proceeding to any operations
    # if not, exit from here
@@ -411,6 +400,5 @@ def main():
                module.exit_json(changed=False)


-
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/gitlab_user.py
+++ b/lib/ansible/modules/source_control/gitlab_user.py
@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # (c) 2015, Werner Dijkerman (ikben@werner-dijkerman.nl)
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -151,8 +141,8 @@ try:
 except:
    HAS_GITLAB_PACKAGE = False

-from ansible.module_utils.pycompat24 import get_exception
-from ansible.module_utils.basic import *
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils._text import to_native


 class GitLabUser(object):
@@ -195,8 +185,6 @@ class GitLabUser(object):

        # Create the user
        user_username = arguments['username']
-        user_name = arguments['name']
-        user_email = arguments['email']
        if self._gitlab.createuser(password=user_password, confirm=confirm, **arguments):
            user_id = self.getUserId(user_username)
            if self._gitlab.addsshkeyuser(user_id=user_id, title=user_sshkey_name, key=user_sshkey_file):
@@ -344,9 +332,8 @@ def main():
            git.login(user=login_user, password=login_password)
        else:
            git = gitlab.Gitlab(server_url, token=login_token, verify_ssl=verify_ssl)
-    except Exception:
-        e = get_exception()
-        module.fail_json(msg="Failed to connect to Gitlab server: %s " % e)
+    except Exception as e:
+        module.fail_json(msg="Failed to connect to Gitlab server: %s " % to_native(e))

    # Check if user is authorized or not before proceeding to any operations
    # if not, exit from here
@@ -370,6 +357,5 @@ def main():
            user.createOrUpdateUser(user_name, user_username, user_password, user_email, user_sshkey_name, user_sshkey_file, group_name, access_level, confirm)


-
 if __name__ == '__main__':
    main()
--- a/lib/ansible/modules/source_control/hg.py
+++ b/lib/ansible/modules/source_control/hg.py
@@ -4,24 +4,11 @@
 # (c) 2013, Yeukhon Wong <yeukhon@acm.org>
 # (c) 2014, Nate Coraor <nate@bx.psu.edu>
 #
-# This module was originally inspired by Brad Olson's ansible-module-mercurial
-# <https://github.com/bradobro/ansible-module-mercurial>. This module tends
-# to follow the git module implementation.
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -117,10 +104,10 @@ EXAMPLES = '''

 import os

-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils._text import to_native

+
 class Hg(object):

    def __init__(self, module, dest, repo, revision, hg_path):
--- a/lib/ansible/modules/source_control/subversion.py
+++ b/lib/ansible/modules/source_control/subversion.py
@@ -2,21 +2,11 @@
 # -*- coding: utf-8 -*-

 # (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import absolute_import, division, print_function
+__metaclass__ = type
+

 ANSIBLE_METADATA = {'metadata_version': '1.0',
                    'status': ['preview'],
@@ -127,8 +117,10 @@ EXAMPLES = '''
    update: no
 '''

+import os
 import re
-import tempfile
+
+from ansible.module_utils.basic import AnsibleModule


 class Subversion(object):
@@ -309,8 +301,6 @@ def main():
        changed = before != after or local_mods
        module.exit_json(changed=changed, before=before, after=after)

-# import module snippets
-from ansible.module_utils.basic import *

 if __name__ == '__main__':
    main()