From 242ad8bb3a7357fb2360cdcdc7f0f541cff68e92 Mon Sep 17 00:00:00 2001
From: Frank Schroeder <frank.schroeder@gmail.com>
Date: Thu, 11 May 2017 19:31:58 +0200
Subject: [PATCH] agent: inline uiDir field

uiDir can be inlined as agent.config.UIDir
---
 command/agent/http.go             | 9 +++------
 command/agent/ui_endpoint_test.go | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/command/agent/http.go b/command/agent/http.go
index 0cc6bde4e..23bced954 100644
--- a/command/agent/http.go
+++ b/command/agent/http.go
@@ -27,7 +27,6 @@ type HTTPServer struct {
 	mux      *http.ServeMux
 	listener net.Listener
 	logger   *log.Logger
-	uiDir    string
 	addr     string
 }
 
@@ -80,7 +79,6 @@ func NewHTTPServers(agent *Agent) ([]*HTTPServer, error) {
 			mux:      mux,
 			listener: list,
 			logger:   log.New(logOutput, "", log.LstdFlags),
-			uiDir:    config.UIDir,
 			addr:     httpAddr.String(),
 		}
 		srv.registerHandlers(config.EnableDebug)
@@ -132,7 +130,6 @@ func NewHTTPServers(agent *Agent) ([]*HTTPServer, error) {
 			mux:      mux,
 			listener: list,
 			logger:   log.New(logOutput, "", log.LstdFlags),
-			uiDir:    config.UIDir,
 			addr:     httpAddr.String(),
 		}
 		srv.registerHandlers(config.EnableDebug)
@@ -293,8 +290,8 @@ func (s *HTTPServer) registerHandlers(enableDebug bool) {
 	}
 
 	// Use the custom UI dir if provided.
-	if s.uiDir != "" {
-		s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(http.Dir(s.uiDir))))
+	if s.agent.config.UIDir != "" {
+		s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(http.Dir(s.agent.config.UIDir))))
 	} else if s.agent.config.EnableUI {
 		s.mux.Handle("/ui/", http.StripPrefix("/ui/", http.FileServer(assetFS())))
 	}
@@ -391,7 +388,7 @@ func (s *HTTPServer) marshalJSON(req *http.Request, obj interface{}) ([]byte, er
 
 // Returns true if the UI is enabled.
 func (s *HTTPServer) IsUIEnabled() bool {
-	return s.uiDir != "" || s.agent.config.EnableUI
+	return s.agent.config.UIDir != "" || s.agent.config.EnableUI
 }
 
 // Renders a simple index page
diff --git a/command/agent/ui_endpoint_test.go b/command/agent/ui_endpoint_test.go
index dab65f99e..75fdd593c 100644
--- a/command/agent/ui_endpoint_test.go
+++ b/command/agent/ui_endpoint_test.go
@@ -33,7 +33,7 @@ func TestUiIndex(t *testing.T) {
 	defer srv.agent.Shutdown()
 
 	// Create file
-	path := filepath.Join(srv.uiDir, "my-file")
+	path := filepath.Join(srv.agent.config.UIDir, "my-file")
 	if err := ioutil.WriteFile(path, []byte("test"), 777); err != nil {
 		t.Fatalf("err: %v", err)
 	}