Merge pull request #25 from cfergeau/manyhosts

daemon: Re-read hosts file for each request

cmd/admin-helper/daemon.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/code-ready/admin-helper/pkg/api"
-	"github.com/code-ready/admin-helper/pkg/hosts"
 	"github.com/kardianos/service"
 	"github.com/spf13/cobra"
 )
@@ -80,12 +79,7 @@ func (p *program) Start(s service.Service) error {
 			_ = logger.Error(err)
 			return
 		}
-		hosts, err := hosts.New()
-		if err != nil {
-			_ = logger.Error(err)
-			return
-		}
-		if err := http.Serve(ln, api.Mux(hosts)); err != nil {
+		if err := http.Serve(ln, api.Mux()); err != nil {
 			_ = logger.Error(err)
 			return
 		}

pkg/api/mux.go

@@ -10,7 +10,7 @@ import (
 	"github.com/code-ready/admin-helper/pkg/types"
 )
 
-func Mux(hosts *hosts.Hosts) http.Handler {
+func Mux() http.Handler {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
 		_, _ = fmt.Fprint(w, constants.Version)

pkg/api/mux_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestMux(t *testing.T) {
-	ts := httptest.NewServer(Mux(nil))
+	ts := httptest.NewServer(Mux())
 	defer ts.Close()
 
 	client := client.New(http.DefaultClient, ts.URL)

pkg/hosts/hosts.go

@@ -43,6 +43,14 @@ func defaultFilter(s string) bool {
 	return clusterRegexp.MatchString(s) || appRegexp.MatchString(s)
 }
 
+func Add(ip string, hosts []string) error {
+	h, err := New()
+	if err != nil {
+		return err
+	}
+	return h.Add(ip, hosts)
+}
+
 func (h *Hosts) Add(ip string, hosts []string) error {
 	if err := h.verifyHosts(hosts); err != nil {
 		return err
@@ -75,6 +83,14 @@ func (h *Hosts) Add(ip string, hosts []string) error {
 	return h.File.Flush()
 }
 
+func Remove(hosts []string) error {
+	h, err := New()
+	if err != nil {
+		return err
+	}
+	return h.Remove(hosts)
+}
+
 func (h *Hosts) Remove(hosts []string) error {
 	if err := h.verifyHosts(hosts); err != nil {
 		return err
@@ -102,6 +118,14 @@ func (h *Hosts) Remove(hosts []string) error {
 	return h.File.Flush()
 }
 
+func Clean(rawSuffixes []string) error {
+	h, err := New()
+	if err != nil {
+		return err
+	}
+	return h.Clean(rawSuffixes)
+}
+
 func (h *Hosts) Clean(rawSuffixes []string) error {
 	if err := h.checkIsWritable(); err != nil {
 		return err