sso_proxy: implement go-micro config

Author: Jusshersmith

cmd/sso-proxy/main.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/kelseyhightower/envconfig"
-
 	"github.com/buzzfeed/sso/internal/pkg/httpserver"
 	"github.com/buzzfeed/sso/internal/pkg/logging"
 	"github.com/buzzfeed/sso/internal/proxy"
@@ -21,45 +19,61 @@ func init() {
 func main() {
 	logger := logging.NewLogEntry()
 
-	opts := proxy.NewOptions()
-	err := envconfig.Process("", opts)
+	config, err := proxy.LoadConfig()
+	if err != nil {
+		logger.Error(err, "error loading in config from env vars")
+		os.Exit(1)
+	}
+
+	err = config.Validate()
 	if err != nil {
-		logger.Error(err, "error parsing env vars into options")
+		logger.Error(err, "error validating config")
 		os.Exit(1)
 	}
 
-	err = opts.Validate()
+	sc := config.MetricsConfig.StatsdConfig
+	statsdClient, err := proxy.NewStatsdClient(sc.Host, sc.Port)
 	if err != nil {
-		logger.Error(err, "error validating options")
+		logger.Error(err, "error creating statsd client")
 		os.Exit(1)
 	}
 
 	// we setup a runtime collector to emit stats
 	go func() {
-		c := collector.New(opts.StatsdClient, 30*time.Second)
+		c := collector.New(statsdClient, 30*time.Second)
 		c.Run()
 	}()
 
-	ssoProxy, err := proxy.New(opts)
+	err = proxy.SetUpstreamConfigs(
+		&config.UpstreamConfigs,
+		config.SessionConfig,
+		config.ServerConfig,
+	)
+	if err != nil {
+		logger.Error(err, "error setting upstream configs")
+		os.Exit(1)
+	}
+
+	ssoProxy, err := proxy.New(config, statsdClient)
 	if err != nil {
 		logger.Error(err, "error creating sso proxy")
 		os.Exit(1)
 	}
 
 	loggingHandler := proxy.NewLoggingHandler(os.Stdout,
 		ssoProxy,
-		opts.RequestLogging,
-		opts.StatsdClient,
+		config.LoggingConfig,
+		statsdClient,
 	)
 
 	s := &http.Server{
-		Addr:         fmt.Sprintf(":%d", opts.Port),
-		ReadTimeout:  opts.TCPReadTimeout,
-		WriteTimeout: opts.TCPWriteTimeout,
+		Addr:         fmt.Sprintf(":%d", config.ServerConfig.Port),
+		ReadTimeout:  config.ServerConfig.TimeoutConfig.Read,
+		WriteTimeout: config.ServerConfig.TimeoutConfig.Write,
 		Handler:      loggingHandler,
 	}
 
-	if err := httpserver.Run(s, opts.ShutdownTimeout, logger); err != nil {
+	if err := httpserver.Run(s, config.ServerConfig.TimeoutConfig.Shutdown, logger); err != nil {
 		logger.WithError(err).Fatal("error running server")
 	}
 }

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/gorilla/mux v1.7.2
 	github.com/gorilla/websocket v1.4.0
 	github.com/imdario/mergo v0.3.7
-	github.com/kelseyhightower/envconfig v1.3.0
 	github.com/mccutchen/go-httpbin v1.1.1
 	github.com/micro/go-micro v1.5.0
 	github.com/miscreant/miscreant-go v0.0.0-20181010193435-325cbd69228b

go.sum

@@ -150,8 +150,6 @@ github.com/joncalhoun/qson v0.0.0-20170526102502-8a9cab3a62b1/go.mod h1:DFXrEwSR
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kelseyhightower/envconfig v1.3.0 h1:IvRS4f2VcIQy6j4ORGIf9145T/AsUB+oY8LyvN8BXNM=
-github.com/kelseyhightower/envconfig v1.3.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=