From 70f305106f10a36dbc29d09fcb14c96780000dac Mon Sep 17 00:00:00 2001
From: Rajan Joshi <rajan.joshi@logrhythm.com>
Date: Fri, 13 Mar 2020 17:40:45 +0530
Subject: [PATCH] subcription name updated with id

---
 beater/pubsubbeat.go  | 8 ++++----
 config/config.go      | 2 +-
 config/config_test.go | 4 ++--
 pubsubbeat.yml        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/beater/pubsubbeat.go b/beater/pubsubbeat.go
index 7f5046475..6f3bfd2b0 100644
--- a/beater/pubsubbeat.go
+++ b/beater/pubsubbeat.go
@@ -55,7 +55,7 @@ func New(b *beat.Beat, cfg *common.Config) (beat.Beater, error) {
 		return nil, err
 	}
 
-	logger := logp.NewLogger(fmt.Sprintf("PubSub: %s/%s/%s", config.Project, config.Topic, config.Subscription.Name))
+	logger := logp.NewLogger(fmt.Sprintf("PubSub: %s/%s/%s", config.Project, config.Topic, config.Subscription.Id))
 	logger.Infof("config retrieved: %+v", config)
 
 	client, err := createPubsubClient(config)
@@ -202,14 +202,14 @@ func createPubsubClient(config *config.Config) (*pubsub.Client, error) {
 
 func getOrCreateSubscription(client *pubsub.Client, config *config.Config) (*pubsub.Subscription, error) {
 	if !config.Subscription.Create {
-		subscription := client.Subscription(config.Subscription.Name)
+		subscription := client.Subscription(config.Subscription.Id)
 		return subscription, nil
 	}
 
 	topic := client.Topic(config.Topic)
 	ctx := context.Background()
 
-	subscription, err := client.CreateSubscription(ctx, config.Subscription.Name, pubsub.SubscriptionConfig{
+	subscription, err := client.CreateSubscription(ctx, config.Subscription.Id, pubsub.SubscriptionConfig{
 		Topic:               topic,
 		RetainAckedMessages: config.Subscription.RetainAckedMessages,
 		RetentionDuration:   config.Subscription.RetentionDuration,
@@ -218,7 +218,7 @@ func getOrCreateSubscription(client *pubsub.Client, config *config.Config) (*pub
 	st, ok := status.FromError(err)
 	if ok && st.Code() == codes.AlreadyExists {
 		// The subscription already exists.
-		subscription = client.Subscription(config.Subscription.Name)
+		subscription = client.Subscription(config.Subscription.Id)
 	} else if err != nil {
 		return nil, fmt.Errorf(st.Message())
 	} else if ok && st.Code() == codes.NotFound {
diff --git a/config/config.go b/config/config.go
index 609f2a43a..5a0a1bd54 100644
--- a/config/config.go
+++ b/config/config.go
@@ -29,7 +29,7 @@ type Config struct {
 	Topic           string `config:"topic" validate:"required"`
 	CredentialsFile string `config:"credentials_file"`
 	Subscription    struct {
-		Name                string        `config:"name" validate:"required"`
+		Id                  string        `config:"id" validate:"required"`
 		RetainAckedMessages bool          `config:"retain_acked_messages"`
 		RetentionDuration   time.Duration `config:"retention_duration"`
 		Create              bool          `config:"create"`
diff --git a/config/config_test.go b/config/config_test.go
index 354c23c3a..3dcb381a8 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -61,7 +61,7 @@ func TestGetAndValidateConfigMissingRequiredFields(t *testing.T) {
 		c.SetString("topic", -1, tc.Topic)
 
 		sConfig, _ := c.Child("subscription", -1)
-		sConfig.SetString("name", -1, tc.Subscription)
+		sConfig.SetString("id", -1, tc.Subscription)
 
 		_, err := GetAndValidateConfig(c)
 
@@ -179,7 +179,7 @@ func createDefaultTestConfig() *common.Config {
 	c.SetString("topic", -1, "a-topic")
 
 	sConfig := common.NewConfig()
-	sConfig.SetString("name", -1, "a-subscription")
+	sConfig.SetString("id", -1, "a-subscription")
 	sConfig.SetBool("retain_acked_messages", -1, false)
 	sConfig.SetString("retention_duration", -1, "10m")
 	c.SetChild("subscription", -1, sConfig)
diff --git a/pubsubbeat.yml b/pubsubbeat.yml
index 14c1e085b..a8dc95198 100644
--- a/pubsubbeat.yml
+++ b/pubsubbeat.yml
@@ -21,8 +21,8 @@ pubsubbeat:
   # The Pub/Sub topic name. You must first create this topic.
   topic: my-topic
 
-  # The Pub/Sub subscription name.
-  subscription.name: my-subscription
+  # The Pub/Sub subscription id.
+  subscription.id: my-subscription
 
   # Attempt to create the subscription.
   subscription.create: true # Defaults to true