From 63fd0807d153934df65d9d05edaf54580fbddc64 Mon Sep 17 00:00:00 2001
From: Karolis Rusenas <karolis.rusenas@gmail.com>
Date: Sun, 11 Jun 2017 22:52:18 +0100
Subject: [PATCH] cleanup

---
 main.go                   | 48 +++++++++++++++++++--------------------
 trigger/pubsub/manager.go |  4 ++--
 trigger/pubsub/pubsub.go  |  6 ++---
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/main.go b/main.go
index 321df91c..19cd8d92 100644
--- a/main.go
+++ b/main.go
@@ -18,10 +18,8 @@ import (
 
 // gcloud pubsub related config
 const (
-	EnvTriggerPubSub  = "PUBSUB" // set to 1 or something to enable pub/sub trigger
-	EnvProjectID      = "PROJECT_ID"
-	EnvSubscriptionID = "SUBSCRIPTION_ID"
-	EnvTopic          = "TOPIC"
+	EnvTriggerPubSub = "PUBSUB" // set to 1 or something to enable pub/sub trigger
+	EnvProjectID     = "PROJECT_ID"
 )
 
 // kubernetes config, if empty - will default to InCluster
@@ -29,8 +27,15 @@ const (
 	EnvKubernetesConfig = "KUBERNETES_CONFIG"
 )
 
+// EnvDebug - set to 1 or anything else to enable debug logging
+const EnvDebug = "DEBUG"
+
 func main() {
 
+	if os.Getenv(EnvDebug) != "" {
+		log.SetLevel(log.DebugLevel)
+	}
+
 	// getting k8s provider
 	k8sCfg := &kubernetes.Opts{}
 	if os.Getenv(EnvKubernetesConfig) != "" {
@@ -38,7 +43,15 @@ func main() {
 	} else {
 		k8sCfg.InCluster = true
 	}
-	k8sProvider, err := kubernetes.NewProvider(k8sCfg)
+	implementer, err := kubernetes.NewKubernetesImplementer(k8sCfg)
+	if err != nil {
+		log.WithFields(log.Fields{
+			"error":  err,
+			"config": k8sCfg,
+		}).Fatal("main: failed to create kubernetes implementer")
+	}
+
+	k8sProvider, err := kubernetes.NewProvider(implementer)
 	if err != nil {
 		log.WithFields(log.Fields{
 			"error": err,
@@ -62,22 +75,10 @@ func main() {
 			log.Fatalf("main: project ID env variable not set")
 			return
 		}
-		subscriptionID := os.Getenv(EnvSubscriptionID)
-		if subscriptionID == "" {
-			log.Fatalf("main: subscription ID env variable not set")
-			return
-		}
-		topic := os.Getenv(EnvTopic)
-		if topic == "" {
-			log.Fatalf("main: top env variable not set")
-			return
-		}
 
 		ps, err := pubsub.NewSubscriber(&pubsub.Opts{
-			Project:      projectID,
-			Subscription: subscriptionID,
-			Topic:        topic,
-			Providers:    providers,
+			ProjectID: projectID,
+			Providers: providers,
 		})
 		if err != nil {
 			log.WithFields(log.Fields{
@@ -87,12 +88,9 @@ func main() {
 		}
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
-		go ps.Subscribe(ctx)
-		log.WithFields(log.Fields{
-			"project":      projectID,
-			"subscription": subscriptionID,
-			"topic":        topic,
-		}).Info("main: gcloud pubsub trigger for gcr enabled")
+
+		subManager := pubsub.NewDefaultManager(projectID, implementer, ps)
+		go subManager.Start(ctx)
 	}
 
 	signalChan := make(chan os.Signal, 1)
diff --git a/trigger/pubsub/manager.go b/trigger/pubsub/manager.go
index 8793d445..03723b04 100644
--- a/trigger/pubsub/manager.go
+++ b/trigger/pubsub/manager.go
@@ -135,7 +135,7 @@ func (s *DefaultManager) checkDeployment(deployment *v1beta1.Deployment) error {
 		registry := extractContainerRegistryURI(c.Image)
 
 		if !isGoogleContainerRegistry(registry) {
-			log.Infof("registry %s is not a GCR, skipping", registry)
+			log.Debug("registry %s is not a GCR, skipping", registry)
 			continue
 		}
 
@@ -167,7 +167,7 @@ func (s *DefaultManager) checkDeployment(deployment *v1beta1.Deployment) error {
 				"gcr_uri":    gcrURI,
 				"deployment": deployment.Name,
 				"image_name": c.Image,
-			}).Info("trigger.pubsub.manager: existing subscription for deployment's image found")
+			}).Debug("trigger.pubsub.manager: existing subscription for deployment's image found")
 		}
 
 	}
diff --git a/trigger/pubsub/pubsub.go b/trigger/pubsub/pubsub.go
index 657f48e1..2903a690 100644
--- a/trigger/pubsub/pubsub.go
+++ b/trigger/pubsub/pubsub.go
@@ -64,7 +64,7 @@ func (s *Subscriber) ensureTopic(ctx context.Context, id string) error {
 	if exists {
 		log.WithFields(log.Fields{
 			"topic": id,
-		}).Info("trigger.pubsub: topic exists")
+		}).Debug("trigger.pubsub: topic exists")
 		return nil
 	}
 
@@ -82,7 +82,7 @@ func (s *Subscriber) ensureSubscription(ctx context.Context, subscriptionID, top
 		log.WithFields(log.Fields{
 			"subscription": subscriptionID,
 			"topic":        topicID,
-		}).Info("trigger.pubsub: subscription exists")
+		}).Debug("trigger.pubsub: subscription exists")
 		return nil
 	}
 
@@ -152,7 +152,7 @@ func (s *Subscriber) callback(ctx context.Context, msg *pubsub.Message) {
 		"action":  decoded.Action,
 		"tag":     decoded.Tag,
 		"version": parsedVersion.String(),
-	}).Info("trigger.pubsub: got message")
+	}).Debug("trigger.pubsub: got message")
 	event := types.Event{
 		Repository: types.Repository{Name: imageName, Tag: parsedVersion.String()},
 		CreatedAt:  time.Now(),