Do not try to encode metadata if it is None (#46739)

* Do not try to encode metadata if it is None * Add changelog fragment * Fix fragment missing EOF line
ansible · Oct 10, 2018 · 62d1317 · 62d1317
1 parent fcef4fd
commit 62d1317
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/changelogs/fragments/46739-gcp-compute-instance-metadata.yaml b/changelogs/fragments/46739-gcp-compute-instance-metadata.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "gcp_compute_instance - fix crash when the instance metadata is not set"
diff --git a/lib/ansible/modules/cloud/google/gcp_compute_instance.py b/lib/ansible/modules/cloud/google/gcp_compute_instance.py
@@ -1106,7 +1106,7 @@ def raise_if_errors(response, err_path, module):
 
 
 def encode_request(request, module):
-    if 'metadata' in request:
+    if 'metadata' in request and request['metadata'] is not None:
         request['metadata'] = metadata_encoder(request['metadata'])
     return request