Bug fixes for GCP modules (as of 2019-01-22T12:43:52-08:00) (#51246)

plugins/modules/gcp_compute_target_pool.py

@@ -18,15 +18,14 @@
 # ----------------------------------------------------------------------------
 
 from __future__ import absolute_import, division, print_function
+
 __metaclass__ = type
 
 ################################################################################
 # Documentation
 ################################################################################
 
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ["preview"],
-                    'supported_by': 'community'}
+ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported_by': 'community'}
 
 DOCUMENTATION = '''
 ---
@@ -257,7 +256,7 @@ def main():
             instances=dict(type='list'),
             name=dict(required=True, type='str'),
             session_affinity=dict(type='str', choices=['NONE', 'CLIENT_IP', 'CLIENT_IP_PROTO']),
-            region=dict(required=True, type='str')
+            region=dict(required=True, type='str'),
         )
     )
 
@@ -316,7 +315,7 @@ def resource_to_request(module):
         u'healthCheck': replace_resource_dict(module.params.get(u'health_check', {}), 'selfLink'),
         u'instances': replace_resource_dict(module.params.get('instances', []), 'selfLink'),
         u'name': module.params.get('name'),
-        u'sessionAffinity': module.params.get('session_affinity')
+        u'sessionAffinity': module.params.get('session_affinity'),
     }
     request = encode_request(request, module)
     return_vals = {}
@@ -352,8 +351,8 @@ def return_if_object(module, response, kind, allow_not_found=False):
     try:
         module.raise_for_status(response)
         result = response.json()
-    except getattr(json.decoder, 'JSONDecodeError', ValueError) as inst:
-        module.fail_json(msg="Invalid JSON response with error: %s" % inst)
+    except getattr(json.decoder, 'JSONDecodeError', ValueError):
+        module.fail_json(msg="Invalid JSON response with error: %s" % response.text)
 
     result = decode_request(result, module)
 
@@ -394,7 +393,7 @@ def response_to_hash(module, response):
         u'id': response.get(u'id'),
         u'instances': response.get(u'instances'),
         u'name': module.params.get('name'),
-        u'sessionAffinity': module.params.get('session_affinity')
+        u'sessionAffinity': module.params.get('session_affinity'),
     }
 
 
@@ -420,7 +419,7 @@ def wait_for_completion(status, op_result, module):
     op_id = navigate_hash(op_result, ['name'])
     op_uri = async_op_url(module, {'op_id': op_id})
     while status != 'DONE':
-        raise_if_errors(op_result, ['error', 'errors'], 'message')
+        raise_if_errors(op_result, ['error', 'errors'], module)
         time.sleep(1.0)
         op_result = fetch_resource(module, op_uri, 'compute#operation')
         status = navigate_hash(op_result, ['status'])