Address github comments

clients/pkg/promtail/targets/gcplog/pull_target.go

@@ -57,28 +57,7 @@ func newPullTarget(
 		return nil, err
 	}
 
-	target := newGcplogTarget(metrics, logger, handler, relabel, jobName, config, ps, ctx, cancel)
-
-	go func() {
-		_ = target.run()
-	}()
-
-	return target, nil
-}
-
-// nolint:revive
-func newGcplogTarget(
-	metrics *Metrics,
-	logger log.Logger,
-	handler api.EntryHandler,
-	relabel []*relabel.Config,
-	jobName string,
-	config *scrapeconfig.GCPLogTargetConfig,
-	pubsubClient *pubsub.Client,
-	ctx context.Context,
-	cancel func(),
-) *PullTarget {
-	return &PullTarget{
+	target := &PullTarget{
 		metrics:       metrics,
 		logger:        logger,
 		handler:       handler,
@@ -87,9 +66,15 @@ func newGcplogTarget(
 		jobName:       jobName,
 		ctx:           ctx,
 		cancel:        cancel,
-		ps:            pubsubClient,
+		ps:            ps,
 		msgs:          make(chan *pubsub.Message),
 	}
+
+	go func() {
+		_ = target.run()
+	}()
+
+	return target, nil
 }
 
 func (t *PullTarget) run() error {
@@ -133,7 +118,7 @@ func (t *PullTarget) run() error {
 }
 
 func (t *PullTarget) Type() target.TargetType {
-	return target.GcplogTargetType
+	return target.GCPLogTargetType
 }
 
 func (t *PullTarget) Ready() bool {

clients/pkg/promtail/targets/gcplog/pull_target_test.go

@@ -2,6 +2,7 @@ package gcplog
 
 import (
 	"context"
+	"github.com/grafana/loki/clients/pkg/promtail/api"
 	"sync"
 	"testing"
 	"time"
@@ -123,17 +124,19 @@ func testPullTarget(t *testing.T) (*PullTarget, *fake.Client, *pubsub.Client, fu
 
 	fakeClient := fake.New(func() {})
 
-	target := newGcplogTarget(
-		NewMetrics(prometheus.NewRegistry()),
-		log.NewNopLogger(),
-		fakeClient,
-		nil,
-		"job-test-gcplogtarget",
-		testConfig,
-		mockpubsubClient,
-		ctx,
-		cancel,
-	)
+	var handler api.EntryHandler = fakeClient
+	target := &PullTarget{
+		metrics:       NewMetrics(prometheus.NewRegistry()),
+		logger:        log.NewNopLogger(),
+		handler:       handler,
+		relabelConfig: nil,
+		config:        testConfig,
+		jobName:       "job-test-gcplogtarget",
+		ctx:           ctx,
+		cancel:        cancel,
+		ps:            mockpubsubClient,
+		msgs:          make(chan *pubsub.Message),
+	}
 
 	// cleanup
 	return target, fakeClient, mockpubsubClient, func() {

clients/pkg/promtail/targets/gcplog/push_target.go

@@ -131,7 +131,7 @@ func (h *PushTarget) push(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *PushTarget) Type() target.TargetType {
-	return target.GCPPushTargetType
+	return target.GCPLogTargetType
 }
 
 func (h *PushTarget) DiscoveredLabels() model.LabelSet {

clients/pkg/promtail/targets/target/target.go

@@ -18,8 +18,8 @@ const (
 	// SyslogTargetType is a syslog target
 	SyslogTargetType = TargetType("Syslog")
 
-	// GcplogTargetType is a target where log entries are pulled from pubsub topic.
-	GcplogTargetType = TargetType("Gcplog")
+	// GCPLogTargetType is a target where log entries are pulled from pubsub topic.
+	GCPLogTargetType = TargetType("GCPLog")
 
 	// DroppedTargetType is a target that's been dropped.
 	DroppedTargetType = TargetType("dropped")
@@ -44,9 +44,6 @@ const (
 
 	// HerokuDrainTargetType is a Heroku Logs target
 	HerokuDrainTargetType = TargetType("HerokuDrain")
-
-	// GCPPushTargetType is a GCP PubSub Push target
-	GCPPushTargetType = TargetType("GCPPush")
 )
 
 // Target is a promtail scrape target