From 0e9c32fcdeff9cfec1b9cc8d1fd710066dbd3336 Mon Sep 17 00:00:00 2001
From: "Sieradzki, Lukasz" <lukasz.sieradzki@sabre.com>
Date: Mon, 4 Nov 2024 21:01:26 +0100
Subject: [PATCH] 
 https://github.com/ansible-collections/google.cloud/issues/653

---
 changelogs/gcp_pubsub_subscription_bugfix.yaml |  2 ++
 plugins/modules/gcp_pubsub_subscription.py     | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/gcp_pubsub_subscription_bugfix.yaml

diff --git a/changelogs/gcp_pubsub_subscription_bugfix.yaml b/changelogs/gcp_pubsub_subscription_bugfix.yaml
new file mode 100644
index 0000000..355570d
--- /dev/null
+++ b/changelogs/gcp_pubsub_subscription_bugfix.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - gcp_pubsub_subscription - improper subscription uprade PATCH request
\ No newline at end of file
diff --git a/plugins/modules/gcp_pubsub_subscription.py b/plugins/modules/gcp_pubsub_subscription.py
index f39583b..2de6e14 100644
--- a/plugins/modules/gcp_pubsub_subscription.py
+++ b/plugins/modules/gcp_pubsub_subscription.py
@@ -62,7 +62,7 @@ options:
       to a gcp_pubsub_topic task and then set this topic field to "{{ name-of-resource
       }}"'
     required: true
-    type: dict
+    type: dict            
   labels:
     description:
     - A set of key/value label pairs to assign to this Subscription.
@@ -634,8 +634,9 @@ def create(module, link):
 def update(module, link, fetch):
     auth = GcpSession(module, 'pubsub')
     params = {'updateMask': updateMask(resource_to_request(module), response_to_hash(module, fetch))}
-    request = resource_to_request(module)
-    del request['name']
+    subscription =  resource_to_request(module)
+    del subscription['name']
+    request = { 'subscription': subscription }
     return return_if_object(module, auth.patch(link, request, params=params))
 
 
@@ -651,7 +652,7 @@ def updateMask(request, response):
         update_mask.append('messageRetentionDuration')
     if request.get('retainAckedMessages') != response.get('retainAckedMessages'):
         update_mask.append('retainAckedMessages')
-    if request.get('expirationPolicy') != response.get('expirationPolicy'):
+    if request.get('expirationPolicy') and request.get('expirationPolicy') != response.get('expirationPolicy'):
         update_mask.append('expirationPolicy')
     if request.get('deadLetterPolicy') != response.get('deadLetterPolicy'):
         update_mask.append('deadLetterPolicy')
@@ -664,7 +665,6 @@ def delete(module, link):
     auth = GcpSession(module, 'pubsub')
     return return_if_object(module, auth.delete(link))
 
-
 def resource_to_request(module):
     request = {
         u'name': name_pattern(module.params.get('name'), module),
@@ -838,7 +838,9 @@ class SubscriptionExpirationpolicy(object):
             self.request = {}
 
     def to_request(self):
-        return remove_nones_from_dict({u'ttl': self.request.get('ttl')})
+        ttl = self.request.get('ttl')
+        ttl = None if ttl == "" else ttl
+        return remove_nones_from_dict({u'ttl': ttl})
 
     def from_response(self):
         return remove_nones_from_dict({u'ttl': self.request.get(u'ttl')})