Refactor to make host a field of router

Signed-off-by: jayme-github <[email protected]>
helm · Jul 14, 2020 · f18ed1f · f18ed1f
1 parent 91088c5
commit f18ed1f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/cmd/chartmuseum/main.go b/cmd/chartmuseum/main.go
@@ -100,14 +100,15 @@ func cliHandler(c *cli.Context) {
 		WriteTimeout:           conf.GetInt("writetimeout"),
 		ReadTimeout:            conf.GetInt("readtimeout"),
 		EnforceSemver2:         conf.GetBool("enforce-semver2"),
+		Host:                   conf.GetString("listen.host"),
 	}
 
 	server, err := newServer(options)
 	if err != nil {
 		crash(err)
 	}
 
-	server.Listen(conf.GetString("listen.host"), conf.GetInt("port"))
+	server.Listen(conf.GetInt("port"))
 }
 
 func backendFromConfig(conf *config.Config) storage.Backend {

diff --git a/pkg/chartmuseum/router/router.go b/pkg/chartmuseum/router/router.go
@@ -49,6 +49,7 @@ type (
 		CORSAllowOrigin string
 		ReadTimeout     time.Duration
 		WriteTimeout    time.Duration
+		Host            string
 	}
 
 	// RouterOptions are options for constructing a Router
@@ -75,6 +76,7 @@ type (
 		ReadTimeout       int
 		WriteTimeout      int
 		CORSAllowOrigin   string
+		Host              string
 	}
 
 	// Route represents an application route
@@ -113,6 +115,7 @@ func NewRouter(options RouterOptions) *Router {
 		CORSAllowOrigin: options.CORSAllowOrigin,
 		ReadTimeout:     time.Duration(options.ReadTimeout) * time.Second,
 		WriteTimeout:    time.Duration(options.WriteTimeout) * time.Second,
+		Host:            options.Host,
 	}
 
 	var err error
@@ -163,13 +166,13 @@ func NewRouter(options RouterOptions) *Router {
 	return router
 }
 
-func (router *Router) Start(host string, port int) {
+func (router *Router) Start(port int) {
 	router.Logger.Infow("Starting ChartMuseum",
-		"host", host, "port", port,
+		"host", router.Host, "port", port,
 	)
 
 	server := http.Server{
-		Addr:         fmt.Sprintf("%s:%d", host, port),
+		Addr:         fmt.Sprintf("%s:%d", router.Host, port),
 		Handler:      router,
 		ReadTimeout:  router.ReadTimeout,
 		WriteTimeout: router.WriteTimeout,

diff --git a/pkg/chartmuseum/server.go b/pkg/chartmuseum/server.go
@@ -69,11 +69,12 @@ type (
 		// EnforceSemver2 represents if the museum server always accept the Chart with [valid semantic version 2](https://semver.org/)
 		// More refers to : https://github.com/helm/chartmuseum/issues/320
 		EnforceSemver2 bool
+		Host           string
 	}
 
 	// Server is a generic interface for web servers
 	Server interface {
-		Listen(host string, port int)
+		Listen(port int)
 	}
 )
 

diff --git a/pkg/chartmuseum/server/multitenant/server.go b/pkg/chartmuseum/server/multitenant/server.go
@@ -147,8 +147,8 @@ func NewMultiTenantServer(options MultiTenantServerOptions) (*MultiTenantServer,
 }
 
 // Listen starts the router on a given port
-func (server *MultiTenantServer) Listen(host string, port int) {
-	server.Router.Start(host, port)
+func (server *MultiTenantServer) Listen(port int) {
+	server.Router.Start(port)
 }
 
 func (server *MultiTenantServer) genIndex() {