From 4e8035fa46faaffda83aab6dace5ff25654fe898 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Thu, 30 Jan 2020 22:27:52 -0700
Subject: [PATCH] Fix go fmt/vet issues

---
 listener.go          | 12 +++++++++---
 server/server.go     |  8 ++++++--
 storage/file/file.go |  1 -
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/listener.go b/listener.go
index 17fcc81..80e070f 100644
--- a/listener.go
+++ b/listener.go
@@ -38,6 +38,9 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
 	if len(config.Organization) == 0 {
 		config.Organization = []string{"dynamic"}
 	}
+	if config.TLSConfig == nil {
+		config.TLSConfig = &tls.Config{}
+	}
 
 	dynamicListener := &listener{
 		factory: &factory.TLS{
@@ -51,6 +54,9 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
 		sans:      config.SANs,
 		tlsConfig: config.TLSConfig,
 	}
+	if dynamicListener.tlsConfig == nil {
+		dynamicListener.tlsConfig = &tls.Config{}
+	}
 	dynamicListener.tlsConfig.GetCertificate = dynamicListener.getCertificate
 
 	if setter, ok := storage.(SetFactory); ok {
@@ -61,7 +67,7 @@ func NewListener(l net.Listener, storage TLSStorage, caCert *x509.Certificate, c
 		config.ExpirationDaysCheck = 30
 	}
 
-	tlsListener := tls.NewListener(dynamicListener.WrapExpiration(config.ExpirationDaysCheck), &dynamicListener.tlsConfig)
+	tlsListener := tls.NewListener(dynamicListener.WrapExpiration(config.ExpirationDaysCheck), dynamicListener.tlsConfig)
 	return tlsListener, dynamicListener.cacheHandler(), nil
 }
 
@@ -78,7 +84,7 @@ func (c *cancelClose) Close() error {
 type Config struct {
 	CN                  string
 	Organization        []string
-	TLSConfig           tls.Config
+	TLSConfig           *tls.Config
 	SANs                []string
 	ExpirationDaysCheck int
 }
@@ -90,7 +96,7 @@ type listener struct {
 	factory   TLSFactory
 	storage   TLSStorage
 	version   string
-	tlsConfig tls.Config
+	tlsConfig *tls.Config
 	cert      *tls.Certificate
 	sans      []string
 	init      sync.Once
diff --git a/server/server.go b/server/server.go
index 251ad98..56aa8b1 100644
--- a/server/server.go
+++ b/server/server.go
@@ -44,6 +44,10 @@ func ListenAndServe(ctx context.Context, httpsPort, httpPort int, handler http.H
 		opts = &ListenOpts{}
 	}
 
+	if opts.TLSListenerConfig.TLSConfig == nil {
+		opts.TLSListenerConfig.TLSConfig = &tls.Config{}
+	}
+
 	logger := logrus.StandardLogger()
 	errorLog := log.New(logger.WriterLevel(logrus.DebugLevel), "", log.LstdFlags)
 
@@ -108,7 +112,7 @@ func getTLSListener(ctx context.Context, tcp net.Listener, opts ListenOpts) (net
 	}
 
 	if len(opts.TLSListenerConfig.TLSConfig.Certificates) > 0 {
-		return tls.NewListener(tcp, &opts.TLSListenerConfig.TLSConfig), nil, nil
+		return tls.NewListener(tcp, opts.TLSListenerConfig.TLSConfig), nil, nil
 	}
 
 	if len(opts.AcmeDomains) > 0 {
@@ -210,5 +214,5 @@ func acmeListener(tcp net.Listener, opts ListenOpts) net.Listener {
 		return manager.GetCertificate(hello)
 	}
 
-	return tls.NewListener(tcp, &opts.TLSListenerConfig.TLSConfig)
+	return tls.NewListener(tcp, opts.TLSListenerConfig.TLSConfig)
 }
diff --git a/storage/file/file.go b/storage/file/file.go
index ba738bc..0672944 100644
--- a/storage/file/file.go
+++ b/storage/file/file.go
@@ -39,4 +39,3 @@ func (s *storage) Update(secret *v1.Secret) error {
 
 	return json.NewEncoder(f).Encode(secret)
 }
-