Skip to content

Commit 624d582

Browse files
authored
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.
1 parent 6d506de commit 624d582

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,10 @@ For status on this, see https://github.com/googleapis/google-cloud-cpp/issues/88
9595
details.
9696
</details>
9797

98-
## v2.1.0 - TBD
98+
## v2.0.1 - 2022-07
99+
100+
* fix(pubsub): missing subscription name in lease extensions.
101+
This made the lease extensions fail in all cases.
99102

100103
## v2.0.0 - 2022-07
101104

google/cloud/pubsub/internal/streaming_subscription_batch_source.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ future<Status> StreamingSubscriptionBatchSource::BulkNack(
127127
void StreamingSubscriptionBatchSource::ExtendLeases(
128128
std::vector<std::string> ack_ids, std::chrono::seconds extension) {
129129
google::pubsub::v1::ModifyAckDeadlineRequest request;
130+
request.set_subscription(subscription_full_name_);
130131
request.set_ack_deadline_seconds(
131132
static_cast<std::int32_t>(extension.count()));
132133
for (auto& a : ack_ids) {

google/cloud/pubsub/internal/streaming_subscription_batch_source_test.cc

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -522,17 +522,25 @@ TEST(StreamingSubscriptionBatchSourceTest, AckMany) {
522522
Property(&ModifyRequest::ack_ids,
523523
ElementsAre("fake-003"))))
524524
.WillOnce(OnModify);
525-
EXPECT_CALL(*mock, AsyncModifyAckDeadline(
526-
_, _,
527-
Property(&ModifyRequest::ack_ids,
528-
ElementsAre("fake-004", "fake-005"))))
525+
EXPECT_CALL(
526+
*mock,
527+
AsyncModifyAckDeadline(
528+
_, _,
529+
AllOf(
530+
Property(&ModifyRequest::subscription,
531+
"projects/test-project/subscriptions/test-subscription"),
532+
Property(&ModifyRequest::ack_ids,
533+
ElementsAre("fake-004", "fake-005")))))
529534
.WillOnce(OnModify);
530535
EXPECT_CALL(
531536
*mock,
532537
AsyncModifyAckDeadline(
533538
_, _,
534-
AllOf(Property(&ModifyRequest::ack_ids, ElementsAre("fake-006")),
535-
Property(&ModifyRequest::ack_deadline_seconds, 123))))
539+
AllOf(
540+
Property(&ModifyRequest::subscription,
541+
"projects/test-project/subscriptions/test-subscription"),
542+
Property(&ModifyRequest::ack_ids, ElementsAre("fake-006")),
543+
Property(&ModifyRequest::ack_deadline_seconds, 123))))
536544
.WillOnce(OnModify);
537545

538546
auto shutdown = std::make_shared<SessionShutdownManager>();

0 commit comments

Comments
 (0)