fix(pubsub): missing subscription name in lease extensions (#9523) (#…

…9533) When I changed the lease extensions to use unary RPCs (as opposed to inline messages in the streaming pull), I neglected to include the subscription name with the request.
googleapis · Jul 20, 2022 · 624d582 · 624d582
1 parent 6d506de
commit 624d582
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -95,7 +95,10 @@ For status on this, see https://github.com/googleapis/google-cloud-cpp/issues/88
   details.
 </details>
 
-## v2.1.0 - TBD
+## v2.0.1 - 2022-07
+
+* fix(pubsub): missing subscription name in lease extensions.
+  This made the lease extensions fail in all cases.
 
 ## v2.0.0 - 2022-07
 

diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc b/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc
@@ -127,6 +127,7 @@ future<Status> StreamingSubscriptionBatchSource::BulkNack(
 void StreamingSubscriptionBatchSource::ExtendLeases(
     std::vector<std::string> ack_ids, std::chrono::seconds extension) {
   google::pubsub::v1::ModifyAckDeadlineRequest request;
+  request.set_subscription(subscription_full_name_);
   request.set_ack_deadline_seconds(
       static_cast<std::int32_t>(extension.count()));
   for (auto& a : ack_ids) {

diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source_test.cc b/google/cloud/pubsub/internal/streaming_subscription_batch_source_test.cc
@@ -522,17 +522,25 @@ TEST(StreamingSubscriptionBatchSourceTest, AckMany) {
                                             Property(&ModifyRequest::ack_ids,
                                                      ElementsAre("fake-003"))))
       .WillOnce(OnModify);
-  EXPECT_CALL(*mock, AsyncModifyAckDeadline(
-                         _, _,
-                         Property(&ModifyRequest::ack_ids,
-                                  ElementsAre("fake-004", "fake-005"))))
+  EXPECT_CALL(
+      *mock,
+      AsyncModifyAckDeadline(
+          _, _,
+          AllOf(
+              Property(&ModifyRequest::subscription,
+                       "projects/test-project/subscriptions/test-subscription"),
+              Property(&ModifyRequest::ack_ids,
+                       ElementsAre("fake-004", "fake-005")))))
       .WillOnce(OnModify);
   EXPECT_CALL(
       *mock,
       AsyncModifyAckDeadline(
           _, _,
-          AllOf(Property(&ModifyRequest::ack_ids, ElementsAre("fake-006")),
-                Property(&ModifyRequest::ack_deadline_seconds, 123))))
+          AllOf(
+              Property(&ModifyRequest::subscription,
+                       "projects/test-project/subscriptions/test-subscription"),
+              Property(&ModifyRequest::ack_ids, ElementsAre("fake-006")),
+              Property(&ModifyRequest::ack_deadline_seconds, 123))))
       .WillOnce(OnModify);
 
   auto shutdown = std::make_shared<SessionShutdownManager>();