Removing apiKey and senderID from gcm command

cmd/apns.go

@@ -82,6 +82,5 @@ var apnsCmd = &cobra.Command{
 }
 
 func init() {
-	apnsCmd.Flags()
 	RootCmd.AddCommand(apnsCmd)
 }

cmd/gcm.go

@@ -23,10 +23,8 @@
 package cmd
 
 import (
-	"fmt"
-
-	"github.com/sirupsen/logrus"
 	raven "github.com/getsentry/raven-go"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/topfreegames/pusher/interfaces"
@@ -54,21 +52,7 @@ func startGcm(
 	} else {
 		log.Level = logrus.InfoLevel
 	}
-	l := log.WithFields(logrus.Fields{
-		"method": "gcmCmd",
-		"debug":  debug,
-	})
-	if len(senderID) == 0 {
-		err := fmt.Errorf("senderId must be set")
-		l.Error(err)
-		return nil, err
-	}
-	if len(apiKey) == 0 {
-		err := fmt.Errorf("apiKey must be set")
-		l.Error(err)
-		return nil, err
-	}
-	return pusher.NewGCMPusher(senderID, apiKey, production, config, log, statsdClientOrNil, dbOrNil, clientOrNil)
+	return pusher.NewGCMPusher(production, config, log, statsdClientOrNil, dbOrNil, clientOrNil)
 }
 
 // gcmCmd represents the gcm command
@@ -100,7 +84,5 @@ var gcmCmd = &cobra.Command{
 }
 
 func init() {
-	gcmCmd.Flags().StringVar(&senderID, "senderId", "", "gcm senderID")
-	gcmCmd.Flags().StringVar(&apiKey, "apiKey", "", "gcm apiKey")
 	RootCmd.AddCommand(gcmCmd)
 }

cmd/gcm_test.go

@@ -25,9 +25,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/sirupsen/logrus"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 	"github.com/topfreegames/pusher/mocks"
 	"github.com/topfreegames/pusher/util"
@@ -83,19 +83,5 @@ var _ = Describe("GCM", func() {
 			Expect(gcmPusher).NotTo(BeNil())
 			Expect(gcmPusher.IsProduction).To(BeTrue())
 		})
-
-		It("Should return error if senderId is not provided", func() {
-			gcmPusher, err := startGcm(false, false, false, "", apiKey, config, mockStatsDClient, mockDb, mockClient)
-			Expect(gcmPusher).To(BeNil())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(Equal("senderId must be set"))
-		})
-
-		It("Should return error if apiKey is not provided", func() {
-			gcmPusher, err := startGcm(false, false, false, senderID, "", config, mockStatsDClient, mockDb, mockClient)
-			Expect(gcmPusher).To(BeNil())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(Equal("apiKey must be set"))
-		})
 	})
 })

pusher/gcm.go

@@ -38,7 +38,6 @@ import (
 
 // GCMPusher struct for GCM pusher
 type GCMPusher struct {
-	apiKey                  string
 	Config                  *viper.Viper
 	feedbackReporters       []interfaces.FeedbackReporter
 	GracefulShutdownTimeout int
@@ -48,15 +47,12 @@ type GCMPusher struct {
 	MessageHandler          map[string]interfaces.MessageHandler
 	Queue                   interfaces.Queue
 	run                     bool
-	senderID                string
 	StatsReporters          []interfaces.StatsReporter
 	stopChannel             chan struct{}
 }
 
 // NewGCMPusher for getting a new GCMPusher instance
 func NewGCMPusher(
-	senderID,
-	apiKey string,
 	isProduction bool,
 	config *viper.Viper,
 	logger *logrus.Logger,
@@ -65,11 +61,9 @@ func NewGCMPusher(
 	clientOrNil ...interfaces.GCMClient,
 ) (*GCMPusher, error) {
 	g := &GCMPusher{
-		apiKey:       apiKey,
 		Config:       config,
 		IsProduction: isProduction,
 		Logger:       logger,
-		senderID:     senderID,
 		stopChannel:  make(chan struct{}),
 	}
 	var client interfaces.GCMClient
@@ -191,8 +185,7 @@ func (g *GCMPusher) routeMessages(msgChan *chan interfaces.KafkaMessage) {
 func (g *GCMPusher) Start() {
 	g.run = true
 	l := g.Logger.WithFields(logrus.Fields{
-		"method":   "start",
-		"senderID": g.senderID,
+		"method": "start",
 	})
 	l.Info("starting pusher in gcm mode...")
 	for _, v := range g.MessageHandler {

pusher/gcm_test.go

@@ -36,8 +36,6 @@ import (
 var _ = Describe("GCM Pusher", func() {
 	var config *viper.Viper
 	configFile := "../config/test.yaml"
-	senderID := "sender-id"
-	apiKey := "api-key"
 	isProduction := false
 	logger, hook := test.NewNullLogger()
 
@@ -62,8 +60,6 @@ var _ = Describe("GCM Pusher", func() {
 			It("should return configured pusher", func() {
 				client := mocks.NewGCMClientMock()
 				pusher, err := NewGCMPusher(
-					senderID,
-					apiKey,
 					isProduction,
 					config,
 					logger,
@@ -73,13 +69,11 @@ var _ = Describe("GCM Pusher", func() {
 				)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(pusher).NotTo(BeNil())
-				Expect(pusher.apiKey).To(Equal(apiKey))
 				Expect(pusher.Config).NotTo(BeNil())
 				Expect(pusher.IsProduction).To(Equal(isProduction))
 				Expect(pusher.MessageHandler).NotTo(BeNil())
 				Expect(pusher.Queue).NotTo(BeNil())
 				Expect(pusher.run).To(BeFalse())
-				Expect(pusher.senderID).To(Equal(senderID))
 				Expect(pusher.StatsReporters).To(HaveLen(1))
 				Expect(pusher.MessageHandler).To(HaveLen(1))
 			})
@@ -89,8 +83,6 @@ var _ = Describe("GCM Pusher", func() {
 			It("should launch go routines and run forever", func() {
 				client := mocks.NewGCMClientMock()
 				pusher, err := NewGCMPusher(
-					senderID,
-					apiKey,
 					isProduction,
 					config,
 					logger,