From 3af09f48d45f4d74105c3f0fa2f5941dffba217f Mon Sep 17 00:00:00 2001 From: vnktram Date: Tue, 22 Feb 2022 14:33:02 +0530 Subject: [PATCH] Fix topic for subscription retry --- internal/subscription/core.go | 8 +++++++- internal/subscription/model.go | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/internal/subscription/core.go b/internal/subscription/core.go index d0c5299c..d14db704 100644 --- a/internal/subscription/core.go +++ b/internal/subscription/core.go @@ -377,7 +377,13 @@ func (c *Core) Migrate(ctx context.Context, names []string) error { err = c.topicCore.CreateSubscriptionTopic(ctx, &topic.Model{ Name: sub.GetSubscriptionTopic(), ExtractedTopicName: sub.ExtractedSubscriptionName, - ExtractedProjectID: sub.ExtractedTopicProjectID, + ExtractedProjectID: sub.ExtractedSubscriptionProjectID, + NumPartitions: topicModel.NumPartitions, + }) + err = c.topicCore.CreateRetryTopic(ctx, &topic.Model{ + Name: sub.GetRetryTopic(), + ExtractedTopicName: sub.ExtractedSubscriptionName, + ExtractedProjectID: sub.ExtractedSubscriptionProjectID, NumPartitions: topicModel.NumPartitions, }) if err != nil { diff --git a/internal/subscription/model.go b/internal/subscription/model.go index ad45c94b..19c42f5c 100644 --- a/internal/subscription/model.go +++ b/internal/subscription/model.go @@ -103,12 +103,12 @@ func (m *Model) GetTopic() string { // GetSubscriptionTopic returns the topic used for subscription fanout topic func (m *Model) GetSubscriptionTopic() string { - return topic.GetTopicName(m.ExtractedTopicProjectID, m.ExtractedSubscriptionName+topic.SubscriptionSuffix) + return topic.GetTopicName(m.ExtractedSubscriptionProjectID, m.ExtractedSubscriptionName+topic.SubscriptionSuffix) } // GetRetryTopic returns the topic used for subscription retries func (m *Model) GetRetryTopic() string { - return topic.GetTopicName(m.ExtractedTopicProjectID, m.ExtractedSubscriptionName+topic.RetryTopicSuffix) + return topic.GetTopicName(m.ExtractedSubscriptionProjectID, m.ExtractedSubscriptionName+topic.RetryTopicSuffix) } // GetDeadLetterTopic returns the topic used for dead lettering for subscription