Stripping hard-coded eri prefix from pub-sub subscriptions

Dynom · Apr 10, 2020 · 5edaf51 · 5edaf51
1 parent a3a121a
commit 5edaf51
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cmd/web/pubsub/gcp/pubsub.go b/cmd/web/pubsub/gcp/pubsub.go
@@ -30,6 +30,7 @@ func NewPubSubSvc(logger logrus.FieldLogger, client *gcppubsub.Client, topicName
 	}
 
 	labels := svc.subscriptionLabels
+	svc.subscriptionLabels = svc.subscriptionLabels[0:0]
 	for _, l := range labels {
 		if l == "" {
 			continue

diff --git a/cmd/web/pubsub/gcp/pubsub_test.go b/cmd/web/pubsub/gcp/pubsub_test.go
@@ -10,10 +10,10 @@ func TestPubSubSvc_getSubscriptionID(t *testing.T) {
 		labels []string
 		want   string
 	}{
-		{name: "no label", labels: []string{}, want: "eri"},
-		{name: "single label", labels: []string{"a"}, want: "eri-a"},
-		{name: "multi label", labels: []string{"a", "b"}, want: "eri-a-b"},
-		{name: "multi label skip empty", labels: []string{"a", "", "b"}, want: "eri-a-b"},
+		{name: "no label", labels: []string{}, want: ""},
+		{name: "single label", labels: []string{"a"}, want: "a"},
+		{name: "multi label", labels: []string{"a", "b"}, want: "a-b"},
+		{name: "multi label skip empty", labels: []string{"a", "", "b"}, want: "a-b"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {