remove wildcards and add boilerplate

* cloud/centurylink
* source_control
* cloud/google
* notification
* cloud/rackspace
* cloud/vmware

lib/ansible/modules/cloud/google/gc_storage.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'],
@@ -146,8 +139,6 @@ EXAMPLES = '''
 '''
 
 import os
-import urlparse
-import hashlib
 
 try:
     import boto
@@ -155,6 +146,9 @@ try:
 except ImportError:
     HAS_BOTO = False
 
+from ansible.module_utils.basic import AnsibleModule
+
+
 def grant_check(module, gs, obj):
     try:
         acp = obj.get_acl()
@@ -461,7 +455,5 @@ def main():
             module.fail_json(msg="Bucket and Object parameters must be set", failed=True)
 
 
-# import module snippets
-from ansible.module_utils.basic import *
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcdns_record.py

@@ -2,21 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2015 CallFire Inc.
-#
-# This file is part of Ansible.
-#
-# This program 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.
-#
-# This program 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 this program.  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
 
 
 ################################################################################
@@ -333,6 +322,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gcdns import gcdns_connect
+
 
 ################################################################################
 # Constants
@@ -788,8 +780,5 @@ def main():
     module.exit_json(changed=changed, diff=diff, **json_output)
 
 
-from ansible.module_utils.basic import *
-from ansible.module_utils.gcdns import *
-
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcdns_zone.py

@@ -2,21 +2,10 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2015 CallFire Inc.
-#
-# This file is part of Ansible.
-#
-# This program 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.
-#
-# This program 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 this program.  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
 
 
 ################################################################################
@@ -139,6 +128,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gcdns import gcdns_connect
+
 
 ################################################################################
 # Constants
@@ -379,8 +371,5 @@ def main():
     module.exit_json(changed=changed, diff=diff, **json_output)
 
 
-from ansible.module_utils.basic import *
-from ansible.module_utils.gcdns import *
-
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2013 Google Inc.
-#
-# 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'],
@@ -302,6 +292,12 @@ EXAMPLES = '''
 
 import socket
 
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
+
 try:
     import libcloud
     from libcloud.compute.types import Provider
@@ -314,11 +310,10 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
-try:
-    from ast import literal_eval
-    HAS_PYTHON26 = True
-except ImportError:
-    HAS_PYTHON26 = False
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect, unexpected_error_msg
+from ansible.module_utils.gcp import get_valid_location
+from ansible.module_utils.six.moves import reduce
 
 
 def get_instance_info(inst):
@@ -390,7 +385,6 @@ def create_instances(module, gce, instance_names, number, lc_zone):
     subnetwork = module.params.get('subnetwork')
     persistent_boot_disk = module.params.get('persistent_boot_disk')
     disks = module.params.get('disks')
-    state = module.params.get('state')
     tags = module.params.get('tags')
     ip_forward = module.params.get('ip_forward')
     external_ip = module.params.get('external_ip')
@@ -398,7 +392,6 @@ def create_instances(module, gce, instance_names, number, lc_zone):
     preemptible = module.params.get('preemptible')
     disk_size = module.params.get('disk_size')
     service_account_permissions = module.params.get('service_account_permissions')
-    service_account_email = module.params.get('service_account_email')
 
     if external_ip == "none":
         instance_external_ip = None
@@ -657,19 +650,12 @@ def main():
 
     gce = gce_connect(module)
 
-    image = module.params.get('image')
     instance_names = module.params.get('instance_names')
-    machine_type = module.params.get('machine_type')
-    metadata = module.params.get('metadata')
     name = module.params.get('name')
     number = module.params.get('num_instances')
-    network = module.params.get('network')
     subnetwork = module.params.get('subnetwork')
-    persistent_boot_disk = module.params.get('persistent_boot_disk')
     state = module.params.get('state')
-    tags = module.params.get('tags')
     zone = module.params.get('zone')
-    ip_forward = module.params.get('ip_forward')
     preemptible = module.params.get('preemptible')
     changed = False
 
@@ -745,9 +731,5 @@ class LazyDiskImage:
         return self.image
 
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gce import *
-from ansible.module_utils.gcp import get_valid_location
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_eip.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -91,6 +81,12 @@ region:
 USER_AGENT_VERSION = 'v1'
 USER_AGENT_PRODUCT = 'Ansible-gce_eip'
 
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
+
 try:
     import libcloud
     from libcloud.compute.types import Provider
@@ -103,11 +99,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
-try:
-    from ast import literal_eval
-    HAS_PYTHON26 = True
-except ImportError:
-    HAS_PYTHON26 = False
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gcp import gcp_connect
+
 
 def get_address(gce, name, region):
     """
@@ -226,8 +220,6 @@ def main():
     json_output.update(params)
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gcp import gcp_connect
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_img.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2015 Google Inc. All Rights Reserved.
-#
-# 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
+
 
 """An Ansible module to utilize GCE image resources."""
 
@@ -230,5 +220,6 @@ def main():
 
     module.exit_json(changed=changed, name=name)
 
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_instance_template.py

@@ -1,18 +1,10 @@
 #!/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'],
@@ -243,8 +235,12 @@ EXAMPLES = '''
 RETURN = '''
 '''
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.gce import gce_connect
+import traceback
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
 
 try:
     import libcloud
@@ -258,11 +254,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
-try:
-    from ast import literal_eval
-    HAS_PYTHON26 = True
-except ImportError:
-    HAS_PYTHON26 = False
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect
+from ansible.module_utils._text import to_native
 
 
 def get_info(inst):
@@ -294,7 +288,6 @@ def create_instance_template(module, gce):
     subnetwork_region = module.params.get('subnetwork_region')
     can_ip_forward = module.params.get('can_ip_forward')
     external_ip = module.params.get('external_ip')
-    service_account_email = module.params.get('service_account_email')
     service_account_permissions = module.params.get(
         'service_account_permissions')
     on_host_maintenance = module.params.get('on_host_maintenance')
@@ -303,7 +296,6 @@ def create_instance_template(module, gce):
     tags = module.params.get('tags')
     metadata = module.params.get('metadata')
     description = module.params.get('description')
-    disks = module.params.get('disks')
     disks_gce_struct = module.params.get('disks_gce_struct')
     changed = False
 
@@ -467,8 +459,9 @@ def delete_instance_template(module, gce):
     try:
         instance = gce.ex_get_instancetemplate(name)
         current_state = "present"
-    except GoogleBaseError as err:
-        json_data = dict(msg='instance template not exists')
+    except GoogleBaseError as e:
+        json_data = dict(msg='instance template not exists: %s' % to_native(e),
+                         exception=traceback.format_exc())
 
     if current_state == "present":
         rc = instance.destroy()
@@ -519,26 +512,26 @@ def check_if_system_state_would_be_changed(module, gce):
     state = module.params.get("state")
     name = module.params.get("name")
 
-    instance = None
     try:
-        instance = gce.ex_get_instancetemplate(name)
+        gce.ex_get_instancetemplate(name)
         current_state = "present"
-    except GoogleBaseError as err:
-        module.fail_json(msg='GCE get instancetemplate problem')
+    except GoogleBaseError as e:
+        module.fail_json(msg='GCE get instancetemplate problem: %s' % to_native(e),
+                         exception=traceback.format_exc())
 
     if current_state != state:
         changed = True
 
     if current_state == "absent":
         if changed:
-            output = 'instance template {} will be created'.format(name)
+            output = 'instance template {0} will be created'.format(name)
         else:
-            output = 'nothing to do for instance template {} '.format(name)
+            output = 'nothing to do for instance template {0} '.format(name)
     if current_state == "present":
         if changed:
-            output = 'instance template {} will be destroyed'.format(name)
+            output = 'instance template {0} will be destroyed'.format(name)
         else:
-            output = 'nothing to do for instance template {} '.format(name)
+            output = 'nothing to do for instance template {0} '.format(name)
 
     return (changed, output)
 
@@ -587,8 +580,8 @@ def main():
 
     try:
         gce = gce_connect(module)
-    except GoogleBaseError as err:
-        module.fail_json(msg='GCE Connexion failed')
+    except GoogleBaseError as e:
+        module.fail_json(msg='GCE Connexion failed %s' % to_native(e), exception=traceback.format_exc())
 
     if module.check_mode:
         (changed, output) = check_if_system_state_would_be_changed(module, gce)

lib/ansible/modules/cloud/google/gce_labels.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -146,10 +136,10 @@ try:
 except ImportError:
     HAS_PYTHON26 = False
 
-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gcp import check_params, get_google_api_client, GCPUtils
 
+
 UA_PRODUCT = 'ansible-gce_labels'
 UA_VERSION = '0.0.1'
 GCE_API_VERSION = 'v1'
@@ -329,5 +319,6 @@ def main():
 
     module.exit_json(**json_output)
 
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_lb.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2013 Google Inc.
-#
-# 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'],
@@ -174,6 +164,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import USER_AGENT_PRODUCT, USER_AGENT_VERSION, gce_connect, unexpected_error_msg
+
 
 def main():
     module = AnsibleModule(
@@ -342,9 +335,6 @@ def main():
     json_output['changed'] = changed
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gce import *
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_mig.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2016 Google Inc.
-#
-# 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'],
@@ -272,7 +262,11 @@ updated_named_ports:
     sample: true
 '''
 
-import socket
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
 
 try:
     import libcloud
@@ -286,11 +280,8 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
-try:
-    from ast import literal_eval
-    HAS_PYTHON26 = True
-except ImportError:
-    HAS_PYTHON26 = False
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect
 
 
 def _check_params(params, field_list):
@@ -902,8 +893,6 @@ def main():
     json_output.update(params)
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gce import *
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_net.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2013 Google Inc.
-#
-# 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'],
@@ -281,6 +271,10 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect, unexpected_error_msg
+
+
 def format_allowed_section(allowed):
     """Format each section of the allowed list"""
     if allowed.count(":") == 0:
@@ -552,9 +546,6 @@ def main():
     json_output['changed'] = changed
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gce import *
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_pd.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2013 Google Inc.
-#
-# 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'],
@@ -161,6 +151,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect, unexpected_error_msg
+
 
 def main():
     module = AnsibleModule(
@@ -318,9 +311,6 @@ def main():
     json_output['changed'] = changed
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gce import *
 
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gce_snapshot.py

@@ -1,20 +1,12 @@
 #!/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 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'],
@@ -131,9 +123,6 @@ snapshots_absent:
     sample: "[disk0-example-snapshot, disk1-example-snapshot]"
 '''
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.gce import gce_connect
-
 try:
     from libcloud.compute.types import Provider
     _ = Provider.GCE
@@ -141,6 +130,9 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gce import gce_connect
+
 
 def find_snapshot(volume, name):
     '''

lib/ansible/modules/cloud/google/gce_tag.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'],
@@ -130,6 +123,7 @@ except ImportError:
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gce import gce_connect
 
+
 def _union_items(baselist, comparelist):
     """Combine two lists, removing duplicates."""
     return list(set(baselist) | set(comparelist))
@@ -145,7 +139,6 @@ def _get_changed_items(baselist, comparelist):
 def modify_tags(gce, module, node, tags, state='present'):
     """Modify tags on an instance."""
 
-    zone = node.extra['zone'].name
     existing_tags = node.extra['tags']
     tags = [x.lower() for x in tags]
     tags_changed = []
@@ -236,5 +229,6 @@ def main():
     else:
         module.exit_json(changed=changed, instance_name=instance_name, tags=tags_changed, zone=zone)
 
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcp_backend_service.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -180,6 +170,11 @@ timeout:
     sample: "myhttpport"
 '''
 
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
 
 try:
     import libcloud
@@ -193,13 +188,6 @@ try:
 except ImportError:
     HAS_LIBCLOUD = False
 
-try:
-    from ast import literal_eval
-    HAS_PYTHON26 = True
-except ImportError:
-    HAS_PYTHON26 = False
-
-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gce import gce_connect
 from ansible.module_utils.gcp import check_params
@@ -416,5 +404,6 @@ def main():
     json_output.update(params)
     module.exit_json(**json_output)
 
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcp_forwarding_rule.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -130,11 +120,10 @@ state:
     sample: present
 '''
 
-
-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gcp import get_google_api_client, GCPUtils
 
+
 USER_AGENT_PRODUCT = 'ansible-forwarding_rule'
 USER_AGENT_VERSION = '0.0.1'
 
@@ -270,7 +259,7 @@ def update_global_forwarding_rule(client, forwarding_rule, params, name, project
     """
     gcp_dict = _build_global_forwarding_rule_dict(params, project_id)
 
-    ans = GCPUtils.are_params_equal(forwarding_rule, gcp_dict)
+    GCPUtils.are_params_equal(forwarding_rule, gcp_dict)
     if forwarding_rule['target'] == gcp_dict['target']:
         return (False, 'no update necessary')
 

lib/ansible/modules/cloud/google/gcp_healthcheck.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -197,10 +187,9 @@ healthcheck:
     sample: { "name": "my-hc", "port": 443, "requestPath": "/foo" }
 '''
 
-
-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.gcp import check_params, get_google_api_client, GCPUtils
+from ansible.module_utils.gcp import get_google_api_client, GCPUtils
+
 
 USER_AGENT_PRODUCT = 'ansible-healthcheck'
 USER_AGENT_VERSION = '0.0.1'

lib/ansible/modules/cloud/google/gcp_target_proxy.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -96,11 +86,10 @@ target_proxy:
     sample: { "name": "my-target-proxy", "urlMap": "..." }
 '''
 
-
-# import module snippets
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gcp import get_google_api_client, GCPUtils
 
+
 USER_AGENT_PRODUCT = 'ansible-target_proxy'
 USER_AGENT_VERSION = '0.0.1'
 
@@ -227,7 +216,7 @@ def update_target_http_proxy(client, target_proxy, params, name, project_id):
     """
     gcp_dict = _build_target_proxy_dict(params, project_id)
 
-    ans = GCPUtils.are_params_equal(target_proxy, gcp_dict)
+    GCPUtils.are_params_equal(target_proxy, gcp_dict)
     if target_proxy['urlMap'] == gcp_dict['urlMap']:
         return (False, 'no update necessary')
 

lib/ansible/modules/cloud/google/gcp_url_map.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -146,8 +136,11 @@ url_map:
     sample: { "name": "my-url-map", "hostRules": [...], "pathMatchers": [...] }
 '''
 
-
-from ast import literal_eval
+try:
+    from ast import literal_eval
+    HAS_PYTHON26 = True
+except ImportError:
+    HAS_PYTHON26 = False
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gcp import check_params, get_google_api_client, GCPUtils

lib/ansible/modules/cloud/google/gcpubsub.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2016 Google Inc.
-#
-# 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'],
@@ -186,9 +176,6 @@ topic:
     type: str
     sample: "mytopic"
 '''
-CLOUD_CLIENT = 'google-cloud-pubsub'
-CLOUD_CLIENT_MINIMUM_VERSION = '0.22.0'
-CLOUD_CLIENT_USER_AGENT = 'ansible-pubsub-0.1'
 
 try:
     from ast import literal_eval
@@ -202,6 +189,14 @@ try:
 except ImportError as e:
     HAS_GOOGLE_CLOUD_PUBSUB = False
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gcp import check_min_pkg_version, get_google_cloud_credentials
+
+
+CLOUD_CLIENT = 'google-cloud-pubsub'
+CLOUD_CLIENT_MINIMUM_VERSION = '0.22.0'
+CLOUD_CLIENT_USER_AGENT = 'ansible-pubsub-0.1'
+
 
 def publish_messages(message_list, topic):
     with topic.batch() as batch:
@@ -336,8 +331,6 @@ def main():
     json_output.update(mod_params)
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gcp import *
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcpubsub_facts.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2016 Google Inc.
-#
-# 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'],
@@ -100,6 +90,11 @@ try:
     HAS_GOOGLE_CLOUD_PUBSUB = True
 except ImportError as e:
     HAS_GOOGLE_CLOUD_PUBSUB = False
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.gcp import check_min_pkg_version, get_google_cloud_credentials
+
+
 def list_func(data, member='name'):
     """Used for state=list."""
     return [getattr(x, member) for x in data]
@@ -148,8 +143,6 @@ def main():
     json_output.update(mod_params)
     module.exit_json(**json_output)
 
-# import module snippets
-from ansible.module_utils.basic import *
-from ansible.module_utils.gcp import *
+
 if __name__ == '__main__':
     main()

lib/ansible/modules/cloud/google/gcspanner.py

@@ -1,20 +1,10 @@
 #!/usr/bin/python
 # Copyright 2017 Google Inc.
-#
-# 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'],
@@ -141,6 +131,7 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.gcp import check_min_pkg_version, get_google_cloud_credentials
 from ansible.module_utils.six import string_types
 
+
 CLOUD_CLIENT = 'google-cloud-spanner'
 CLOUD_CLIENT_MINIMUM_VERSION = '0.23.0'
 CLOUD_CLIENT_USER_AGENT = 'ansible-spanner-0.1'
@@ -178,7 +169,7 @@ def instance_update(instance):
 
     try:
         instance.update()
-    except ValueError as e:
+    except ValueError:
         # The ValueError here is the one we 'expect'.
         pass
 
@@ -285,5 +276,6 @@ def main():
     json_output.update(mod_params)
     module.exit_json(**json_output)
 
+
 if __name__ == '__main__':
     main()