Get rid of run

No need for an intermediary, this should be easier for new readers.
Also paves, the way for the removal of KfConfig (which in turns,
will help for the pkg-ification of pkgs/).

Author: bpineau

cmd/execute.go

@@ -2,60 +2,88 @@ package cmd
 
 import (
 	"fmt"
+	"os"
+	"os/signal"
+	"syscall"
 	"time"
 
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"github.com/bpineau/katafygio/config"
 	"github.com/bpineau/katafygio/pkg/client"
+	"github.com/bpineau/katafygio/pkg/controller"
+	"github.com/bpineau/katafygio/pkg/event"
+	"github.com/bpineau/katafygio/pkg/health"
 	"github.com/bpineau/katafygio/pkg/log"
-	"github.com/bpineau/katafygio/pkg/run"
+	"github.com/bpineau/katafygio/pkg/observer"
+	"github.com/bpineau/katafygio/pkg/recorder"
+	"github.com/bpineau/katafygio/pkg/store/git"
 )
 
 const appName = "katafygio"
 
+func runE(cmd *cobra.Command, args []string) (err error) {
+
+	resync := time.Duration(resyncInt) * time.Second
+	logger := log.New(logLevel, logServer, logOutput)
+
+	if restcfg == nil {
+		restcfg, err = client.New(apiServer, kubeConf)
+		if err != nil {
+			return fmt.Errorf("failed to create a client: %v", err)
+		}
+	}
+
+	conf := &config.KfConfig{
+		DryRun:        dryRun,
+		DumpMode:      dumpMode,
+		Logger:        logger,
+		LocalDir:      localDir,
+		GitURL:        gitURL,
+		Filter:        filter,
+		ExcludeKind:   exclkind,
+		ExcludeObject: exclobj,
+		HealthPort:    healthP,
+		Client:        restcfg,
+		ResyncIntv:    resync,
+	}
+
+	repo, err := git.New(conf).Start()
+	if err != nil {
+		conf.Logger.Fatalf("failed to start git repo handler: %v", err)
+	}
+
+	evts := event.New()
+	reco := recorder.New(conf, evts).Start()
+	obsv := observer.New(conf, evts, &controller.Factory{}).Start()
+	http := health.New(conf).Start()
+
+	sigterm := make(chan os.Signal, 1)
+	signal.Notify(sigterm, syscall.SIGTERM)
+	signal.Notify(sigterm, syscall.SIGINT)
+	if !conf.DumpMode {
+		<-sigterm
+	}
+
+	obsv.Stop()
+	repo.Stop()
+	reco.Stop()
+	http.Stop()
+
+	return nil
+}
+
 var (
 	restcfg client.Interface
 
-	// RootCmd is our main entry point, launching pkg/run.Run()
+	// RootCmd is our main entry point, launching runE()
 	RootCmd = &cobra.Command{
 		Use:   appName,
 		Short: "Backup Kubernetes cluster as yaml files",
 		Long: "Backup Kubernetes cluster as yaml files in a git repository.\n" +
 			"--exclude-kind (-x) and --exclude-object (-y) may be specified several times.",
-
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			resync := time.Duration(viper.GetInt("resync-interval")) * time.Second
-			logger := log.New(viper.GetString("log.level"),
-				viper.GetString("log.server"),
-				viper.GetString("log.output"))
-
-			if restcfg == nil {
-				restcfg, err = client.New(viper.GetString("api-server"),
-					viper.GetString("kube-config"))
-				if err != nil {
-					return fmt.Errorf("failed to create a client: %v", err)
-				}
-			}
-
-			conf := &config.KfConfig{
-				DryRun:        viper.GetBool("dry-run"),
-				DumpMode:      viper.GetBool("dump-only"),
-				Logger:        logger,
-				LocalDir:      viper.GetString("local-dir"),
-				GitURL:        viper.GetString("git-url"),
-				Filter:        viper.GetString("filter"),
-				ExcludeKind:   viper.GetStringSlice("exclude-kind"),
-				ExcludeObject: viper.GetStringSlice("exclude-object"),
-				HealthPort:    viper.GetInt("healthcheck-port"),
-				Client:        restcfg,
-				ResyncIntv:    resync,
-			}
-
-			run.Run(conf) // <- this is where things happen
-			return nil
-		},
+		PreRun: bindConf,
+		RunE:   runE,
 	}
 )
 

cmd/flags.go

@@ -20,7 +20,7 @@ var (
 	localDir  string
 	gitURL    string
 	healthP   int
-	resync    int
+	resyncInt int
 	exclkind  []string
 	exclobj   []string
 )
@@ -80,6 +80,24 @@ func init() {
 	RootCmd.PersistentFlags().IntVarP(&healthP, "healthcheck-port", "p", 0, "Port for answering healthchecks on /health url")
 	bindPFlag("healthcheck-port", "healthcheck-port")
 
-	RootCmd.PersistentFlags().IntVarP(&resync, "resync-interval", "i", 900, "Full resync interval in seconds (0 to disable)")
+	RootCmd.PersistentFlags().IntVarP(&resyncInt, "resync-interval", "i", 900, "Full resync interval in seconds (0 to disable)")
 	bindPFlag("resync-interval", "resync-interval")
 }
+
+// for whatever the reason, viper don't auto bind values from config file so we have to tell him
+func bindConf(cmd *cobra.Command, args []string) {
+	apiServer = viper.GetString("api-server")
+	kubeConf = viper.GetString("kube-config")
+	dryRun = viper.GetBool("dry-run")
+	dumpMode = viper.GetBool("dump-only")
+	logLevel = viper.GetString("log.level")
+	logOutput = viper.GetString("log.output")
+	logServer = viper.GetString("log.server")
+	filter = viper.GetString("filter")
+	localDir = viper.GetString("local-dir")
+	gitURL = viper.GetString("git-url")
+	healthP = viper.GetInt("healthcheck-port")
+	resyncInt = viper.GetInt("resync-interval")
+	exclkind = viper.GetStringSlice("exclude-kind")
+	exclobj = viper.GetStringSlice("exclude-object")
+}