GCP MagicModules bug fixes (#47285)

Closes: #46930 #46929 #46928 #46927 #46926 #46925 #46924 #46923 #46922 #46921 #46920 #46919 #46918 #46917 #46916 #46915 #46914 #46913 #46912 #46911 #46910 #46909 #46908 #46907 #46906 #46905 #46903 #46902 #46901 #46900 #46899 #46898 #46897 #46896 #46895 #46894 #46893 #46892 #46891 #46890 #46889 #46888 #46887 #46886 #46885 #46884 #46883 #46882 #46881 #46880 #46879 #46878 #46877 #46876 #46875 #46874 #46873 #46872 #46871 #46870 #46869 #46868 #46867 #46866 #46865 #46864 #46863 #46862 #46861 #46860 #46859 #46858 #46857 #46856 #46855 #46854 #46853 #46852

plugins/modules/gcp_compute_target_http_proxy.py

@@ -63,6 +63,11 @@ options:
     url_map:
         description:
             - A reference to the UrlMap resource that defines the mapping from URL to the BackendService.
+            - 'This field represents a link to a UrlMap resource in GCP. It can be specified in
+              two ways. You can add `register: name-of-resource` to a gcp_compute_url_map task
+              and then set this url_map field to "{{ name-of-resource }}" Alternatively, you can
+              set this url_map to a dictionary with the selfLink key where the value is the selfLink
+              of your UrlMap.'
         required: true
 extends_documentation_fragment: gcp
 notes:
@@ -123,13 +128,13 @@ EXAMPLES = '''
       name: "test_object"
       url_map: "{{ urlmap }}"
       project: "test_project"
-      auth_kind: "service_account"
+      auth_kind: "serviceaccount"
       service_account_file: "/tmp/auth.pem"
       state: present
 '''
 
 RETURN = '''
-    creation_timestamp:
+    creationTimestamp:
         description:
             - Creation timestamp in RFC3339 text format.
         returned: success
@@ -154,7 +159,7 @@ RETURN = '''
               be a dash.
         returned: success
         type: str
-    url_map:
+    urlMap:
         description:
             - A reference to the UrlMap resource that defines the mapping from URL to the BackendService.
         returned: success
@@ -198,7 +203,8 @@ def main():
     if fetch:
         if state == 'present':
             if is_different(module, fetch):
-                fetch = update(module, self_link(module), kind)
+                update(module, self_link(module), kind, fetch)
+                fetch = fetch_resource(module, self_link(module), kind)
                 changed = True
         else:
             delete(module, self_link(module), kind)
@@ -221,9 +227,28 @@ def create(module, link, kind):
     return wait_for_operation(module, auth.post(link, resource_to_request(module)))
 
 
-def update(module, link, kind):
+def update(module, link, kind, fetch):
+    update_fields(module, resource_to_request(module),
+                  response_to_hash(module, fetch))
+    return fetch_resource(module, self_link(module), kind)
+
+
+def update_fields(module, request, response):
+    if response.get('urlMap') != request.get('urlMap'):
+        url_map_update(module, request, response)
+
+
+def url_map_update(module, request, response):
     auth = GcpSession(module, 'compute')
-    return wait_for_operation(module, auth.put(link, resource_to_request(module)))
+    auth.post(
+        ''.join([
+            "https://www.googleapis.com/compute/v1/",
+            "projects/{project}/targetHttpProxies/{name}/setUrlMap"
+        ]).format(**module.params),
+        {
+            u'urlMap': replace_resource_dict(module.params.get(u'url_map', {}), 'selfLink')
+        }
+    )
 
 
 def delete(module, link, kind):
@@ -246,9 +271,9 @@ def resource_to_request(module):
     return return_vals
 
 
-def fetch_resource(module, link, kind):
+def fetch_resource(module, link, kind, allow_not_found=True):
     auth = GcpSession(module, 'compute')
-    return return_if_object(module, auth.get(link), kind)
+    return return_if_object(module, auth.get(link), kind, allow_not_found)
 
 
 def self_link(module):
@@ -259,9 +284,9 @@ def collection(module):
     return "https://www.googleapis.com/compute/v1/projects/{project}/global/targetHttpProxies".format(**module.params)
 
 
-def return_if_object(module, response, kind):
+def return_if_object(module, response, kind, allow_not_found=False):
     # If not found, return nothing.
-    if response.status_code == 404:
+    if allow_not_found and response.status_code == 404:
         return None
 
     # If no content, return nothing.
@@ -276,8 +301,6 @@ def return_if_object(module, response, kind):
 
     if navigate_hash(result, ['error', 'errors']):
         module.fail_json(msg=navigate_hash(result, ['error', 'errors']))
-    if result['kind'] != kind:
-        module.fail_json(msg="Incorrect result: {kind}".format(**result))
 
     return result