move nats config back to the messaging package

Author: rybit

go.sum

@@ -99,6 +99,7 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/stan.go v0.4.5 h1:lPZ9y1jVGiXcTaUc1SnEIWPYfh0avuEiHBePNJYgpPk=
 github.com/nats-io/stan.go v0.4.5/go.mod h1:Ji7mK6gRZJSH1nc3ZJH6vi7zn/QnZhpR9Arm4iuzsUQ=
+github.com/nats-io/stan.go v0.5.0 h1:ZaSPMb6jnDXsSlOACynJrUiB3Evleg3ZyyX+rnf3TlQ=
 github.com/nats-io/stan.go v0.5.0/go.mod h1:dYqB+vMN3C2F9pT1FRQpg9eHbjPj6mP0yYuyBNuXHZE=
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

nconf/nats.go renamed to messaging/config.go

@@ -1,10 +1,12 @@
-package nconf
+package messaging
 
 import (
 	"fmt"
 	"strings"
 	"time"
 
+	"github.com/netlify/netlify-commons/nconf"
+
 	"github.com/pkg/errors"
 
 	"github.com/nats-io/stan.go"
@@ -28,10 +30,10 @@ type NatsAuth struct {
 }
 
 type NatsConfig struct {
-	TLS           *TLSConfig `mapstructure:"tls_conf"`
-	DiscoveryName string     `mapstructure:"discovery_name" split_words:"true"`
-	Servers       []string   `mapstructure:"servers"`
-	Auth          NatsAuth   `mapstructure:"auth"`
+	TLS           *nconf.TLSConfig `mapstructure:"tls_conf"`
+	DiscoveryName string           `mapstructure:"discovery_name" split_words:"true"`
+	Servers       []string         `mapstructure:"servers"`
+	Auth          NatsAuth         `mapstructure:"auth"`
 
 	// for streaming
 	ClusterID string `mapstructure:"cluster_id" split_words:"true"`

messaging/nats.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/nats-io/nats.go"
 	"github.com/nats-io/stan.go"
-	"github.com/netlify/netlify-commons/nconf"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -22,7 +21,7 @@ func init() {
 	silent = logrus.NewEntry(l)
 }
 
-func ConfigureNatsConnection(config *nconf.NatsConfig, log logrus.FieldLogger) (*nats.Conn, error) {
+func ConfigureNatsConnection(config *NatsConfig, log logrus.FieldLogger) (*nats.Conn, error) {
 	if log == nil {
 		log = silent
 	}
@@ -49,7 +48,7 @@ func ConfigureNatsConnection(config *nconf.NatsConfig, log logrus.FieldLogger) (
 	return nc, nil
 }
 
-func ConnectToNats(config *nconf.NatsConfig, opts ...nats.Option) (*nats.Conn, error) {
+func ConnectToNats(config *NatsConfig, opts ...nats.Option) (*nats.Conn, error) {
 	tlsConfig, err := config.TLS.TLSConfig()
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to configure TLS")
@@ -61,11 +60,11 @@ func ConnectToNats(config *nconf.NatsConfig, opts ...nats.Option) (*nats.Conn, e
 	}
 
 	switch strings.ToLower(config.Auth.Method) {
-	case nconf.NatsAuthMethodUser:
+	case NatsAuthMethodUser:
 		opts = append(opts, nats.UserInfo(config.Auth.User, config.Auth.Password))
-	case nconf.NatsAuthMethodToken:
+	case NatsAuthMethodToken:
 		opts = append(opts, nats.Token(config.Auth.Token))
-	case nconf.NatsAuthMethodTLS:
+	case NatsAuthMethodTLS:
 		// if using TLS auth, make sure the client certificate is loaded
 		if tlsConfig == nil || len(tlsConfig.Certificates) == 0 {
 			return nil, fmt.Errorf("TLS auth method is configured but no certificate was loaded")
@@ -78,7 +77,7 @@ func ConnectToNats(config *nconf.NatsConfig, opts ...nats.Option) (*nats.Conn, e
 	return nats.Connect(config.ServerString(), opts...)
 }
 
-func ConfigureNatsStreaming(config *nconf.NatsConfig, log logrus.FieldLogger) (stan.Conn, error) {
+func ConfigureNatsStreaming(config *NatsConfig, log logrus.FieldLogger) (stan.Conn, error) {
 	// connect to the underlying instance
 	nc, err := ConfigureNatsConnection(config, log)
 	if err != nil {
@@ -93,7 +92,7 @@ func ConfigureNatsStreaming(config *nconf.NatsConfig, log logrus.FieldLogger) (s
 	return conn, nil
 }
 
-func ConnectToNatsStreaming(nc *nats.Conn, config *nconf.NatsConfig, log logrus.FieldLogger) (stan.Conn, error) {
+func ConnectToNatsStreaming(nc *nats.Conn, config *NatsConfig, log logrus.FieldLogger) (stan.Conn, error) {
 	if config.ClusterID == "" {
 		return nil, errors.New("Must provide a cluster ID to connect to streaming nats")
 	}