Some more overdue go fmt.

Author: relistan

addresses_test.go

@@ -44,7 +44,7 @@ func Test_Addresses(t *testing.T) {
 		// See caveat for findPrivateAddresses() above
 		Convey("Returns an address", func() {
 			addresses, _ := findPrivateAddresses()
-			result, err  := getPublishedIP([]string{}, nil)
+			result, err := getPublishedIP([]string{}, nil)
 
 			So(err, ShouldBeNil)
 			So(result, ShouldResemble, addresses[0].String())

catalog/services_state.go

@@ -53,12 +53,12 @@ func NewServer(name string) *Server {
 
 // Holds the state about all the servers in the cluster
 type ServicesState struct {
-	Servers           map[string]*Server
-	HostnameFn        func() (string, error)
-	Broadcasts        chan [][]byte
-	ServiceNameMatch  *regexp.Regexp // How we match service names
-	LastChanged       time.Time
-	listeners         []chan ChangeEvent
+	Servers          map[string]*Server
+	HostnameFn       func() (string, error)
+	Broadcasts       chan [][]byte
+	ServiceNameMatch *regexp.Regexp // How we match service names
+	LastChanged      time.Time
+	listeners        []chan ChangeEvent
 }
 
 // Returns a pointer to a properly configured ServicesState

cli.go

@@ -8,23 +8,23 @@ import (
 
 type CliOpts struct {
 	AdvertiseIP *string
-	ClusterIPs *[]string
-	ConfigFile *string
+	ClusterIPs  *[]string
+	ConfigFile  *string
 	ClusterName *string
 }
 
 func exitWithError(err error, message string) {
-    if err != nil {
-        log.Fatalf("%s (%s)", message, err.Error())
-    }
+	if err != nil {
+		log.Fatalf("%s (%s)", message, err.Error())
+	}
 }
 
 func parseCommandLine() *CliOpts {
 	var opts CliOpts
 
 	opts.AdvertiseIP = kingpin.Flag("advertise-ip", "The address to advertise to the cluster").Short('a').String()
-	opts.ClusterIPs  = kingpin.Flag("cluster-ip",   "The cluster seed addresses").Required().Short('c').Strings()
-	opts.ConfigFile  = kingpin.Flag("config-file",  "The config file to use").Short('f').Default("bosun.toml").String()
+	opts.ClusterIPs = kingpin.Flag("cluster-ip", "The cluster seed addresses").Required().Short('c').Strings()
+	opts.ConfigFile = kingpin.Flag("config-file", "The config file to use").Short('f').Default("bosun.toml").String()
 	opts.ClusterName = kingpin.Flag("cluster-name", "The cluster we're part of").Short('n').Default("default").String()
 	kingpin.Parse()
 

config.go

@@ -12,7 +12,7 @@ type HAproxyConfig struct {
 	BindIP       string `toml:"bind_ip"`
 	TemplateFile string `toml:"template_file"`
 	ConfigFile   string `toml:"config_file"`
-	Disable      bool `toml:"disable"`
+	Disable      bool   `toml:"disable"`
 }
 
 type ServicesConfig struct {
@@ -37,8 +37,8 @@ type Config struct {
 	Bosun           BosunConfig
 	DockerDiscovery DockerConfig
 	StaticDiscovery StaticConfig
-	Services ServicesConfig
-	HAproxy  HAproxyConfig
+	Services        ServicesConfig
+	HAproxy         HAproxyConfig
 }
 
 func setDefaults(config *Config) {

discovery/discovery.go

@@ -51,7 +51,7 @@ func (d *MultiDiscovery) Run(quit chan bool) {
 		for _, q := range quitChans {
 			// Copy q so we don't change it out from under the goroutine
 			go func(q chan bool) {
-				q <-true
+				q <- true
 			}(q)
 		}
 	}()

discovery/discovery_test.go

@@ -8,10 +8,10 @@ import (
 )
 
 type mockDiscoverer struct {
-	ServicesList []service.Service
-	RunInvoked bool
+	ServicesList    []service.Service
+	RunInvoked      bool
 	ServicesInvoked bool
-	Quit chan bool
+	Quit            chan bool
 }
 
 func (m *mockDiscoverer) Services() []service.Service {
@@ -37,7 +37,7 @@ func Test_MultiDiscovery(t *testing.T) {
 			}, false, false, make(chan bool),
 		}
 
-		multi := &MultiDiscovery{[]Discoverer{ disco1, disco2 }}
+		multi := &MultiDiscovery{[]Discoverer{disco1, disco2}}
 
 		Convey("Run() invokes the Run() method for all the discoverers", func() {
 			multi.Run(make(chan bool))
@@ -49,7 +49,7 @@ func Test_MultiDiscovery(t *testing.T) {
 		Convey("Run() propagates the quit signal", func() {
 			quit := make(chan bool, 1)
 			multi.Run(quit)
-			quit <-true
+			quit <- true
 
 			So(disco1.RunInvoked, ShouldBeTrue)
 			So(disco2.RunInvoked, ShouldBeTrue)

discovery/docker_discovery.go

@@ -15,39 +15,39 @@ const (
 )
 
 type DockerDiscovery struct {
-	events chan *docker.APIEvents  // Where events are announced to us
-	endpoint string                // The Docker endpoint to talk to
-	containers []*service.Service  // The list of containers we know about
-	sync.RWMutex                   // Reader/Writer lock controlling .containers
+	events       chan *docker.APIEvents // Where events are announced to us
+	endpoint     string                 // The Docker endpoint to talk to
+	containers   []*service.Service     // The list of containers we know about
+	sync.RWMutex                        // Reader/Writer lock controlling .containers
 }
 
 func NewDockerDiscovery(endpoint string) *DockerDiscovery {
 	discovery := DockerDiscovery{
 		endpoint: endpoint,
-		events: make(chan *docker.APIEvents),
+		events:   make(chan *docker.APIEvents),
 	}
 	return &discovery
 }
 
 func (d *DockerDiscovery) Run(quit chan bool) {
 	getContainersQuit := make(chan bool)
-	watchEventsQuit   := make(chan bool)
+	watchEventsQuit := make(chan bool)
 	processEventsQuit := make(chan bool)
 
 	// Propagate quit channel message
 	go func() {
 		<-quit // Block on channel until we get a message
-		go func() { getContainersQuit <-true }()
-		go func() { watchEventsQuit <-true }()
-		go func() { processEventsQuit <-true }()
+		go func() { getContainersQuit <- true }()
+		go func() { watchEventsQuit <- true }()
+		go func() { processEventsQuit <- true }()
 	}()
 
 	// Loop around fetching the whole container list
 	go func() {
-		for ;; {
+		for {
 			d.getContainers()
 			select {
-			case <- getContainersQuit:
+			case <-getContainersQuit:
 				return
 			default:
 			}
@@ -75,7 +75,7 @@ func (d *DockerDiscovery) Services() []service.Service {
 func (d *DockerDiscovery) getContainers() {
 	// New connection every time
 	client, _ := docker.NewClient(d.endpoint)
-	containers, err := client.ListContainers(docker.ListContainersOptions{ All: false })
+	containers, err := client.ListContainers(docker.ListContainersOptions{All: false})
 	if err != nil {
 		return
 	}
@@ -102,7 +102,7 @@ func (d *DockerDiscovery) watchEvents(quit chan bool) {
 		if err != nil {
 			log.Println("Lost connection to Docker, re-connecting")
 			client.RemoveEventListener(d.events)
-			d.events  = make(chan *docker.APIEvents) // RemoveEventListener closes it
+			d.events = make(chan *docker.APIEvents) // RemoveEventListener closes it
 
 			client, err = docker.NewClient(d.endpoint)
 			if err == nil {
@@ -113,7 +113,7 @@ func (d *DockerDiscovery) watchEvents(quit chan bool) {
 		}
 
 		select {
-		case <- quit:
+		case <-quit:
 			return
 		default:
 		}
@@ -147,7 +147,7 @@ func (d *DockerDiscovery) handleEvent(event docker.APIEvents) {
 func (d *DockerDiscovery) processEvents(quit chan bool) {
 	for {
 		select {
-		case <- quit:
+		case <-quit:
 			return
 		default:
 		}

discovery/docker_discovery_test.go

@@ -15,13 +15,13 @@ func Test_DockerDiscovery(t *testing.T) {
 
 	Convey("Working with Docker containers", t, func() {
 		endpoint := "http://example.com:2375"
-		disco    := NewDockerDiscovery(endpoint)
-		svcId1   := "deadbeef1231"
-		svcId2   := "deadbeef1011"
+		disco := NewDockerDiscovery(endpoint)
+		svcId1 := "deadbeef1231"
+		svcId2 := "deadbeef1011"
 		baseTime := time.Now().UTC().Round(time.Second)
-		service1 := service.Service{ ID: svcId1, Hostname: hostname, Updated: baseTime }
-		service2 := service.Service{ ID: svcId2, Hostname: hostname, Updated: baseTime }
-		services := []*service.Service{ &service1, &service2 }
+		service1 := service.Service{ID: svcId1, Hostname: hostname, Updated: baseTime}
+		service2 := service.Service{ID: svcId2, Hostname: hostname, Updated: baseTime}
+		services := []*service.Service{&service1, &service2}
 
 		Convey("New() configures an endpoint and events channel", func() {
 			So(disco.endpoint, ShouldEqual, endpoint)
@@ -38,7 +38,7 @@ func Test_DockerDiscovery(t *testing.T) {
 
 		Convey("handleEvents() prunes dead containers", func() {
 			disco.containers = services
-			disco.handleEvent(docker.APIEvents{ID: svcId1, Status:"die"})
+			disco.handleEvent(docker.APIEvents{ID: svcId1, Status: "die"})
 
 			result := disco.Services()
 			So(len(result), ShouldEqual, 1)

discovery/static_discovery.go

@@ -15,19 +15,19 @@ import (
 
 type Target struct {
 	Service service.Service
-	Check healthy.Check
+	Check   healthy.Check
 }
 
 type StaticDiscovery struct {
-	Targets []*Target
+	Targets    []*Target
 	ConfigFile string
 	HostnameFn func() (string, error)
 }
 
 func NewStaticDiscovery(filename string) *StaticDiscovery {
 	return &StaticDiscovery{
 		ConfigFile: filename,
-	    HostnameFn: os.Hostname,
+		HostnameFn: os.Hostname,
 	}
 }
 
@@ -97,7 +97,7 @@ func RandomHex(count int) ([]byte, error) {
 		return nil, err
 	}
 
-	encoded := make([]byte, count * 2)
+	encoded := make([]byte, count*2)
 	hex.Encode(encoded, raw)
 	return encoded, nil
 }

discovery/static_discovery_test.go

@@ -48,7 +48,7 @@ func Test_Services(t *testing.T) {
 			service.Service{ID: "foofoo"},
 			healthy.Check{ID: "foofoo"},
 		}
-		disco.Targets = []*Target{ tgt1, tgt2 }
+		disco.Targets = []*Target{tgt1, tgt2}
 
 		Convey("Returns a list of services extracted from Targets", func() {
 			services := disco.Services()
@@ -59,7 +59,7 @@ func Test_Services(t *testing.T) {
 		})
 
 		Convey("Updates the current timestamp each time", func() {
-			services  := disco.Services()
+			services := disco.Services()
 			services2 := disco.Services()
 
 			So(services[0].Updated.Before(services2[0].Updated), ShouldBeTrue)

haproxy/haproxy.go

@@ -12,19 +12,19 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/newrelic/bosun/service"
 	"github.com/newrelic/bosun/catalog"
+	"github.com/newrelic/bosun/service"
 )
 
 type portset map[string]struct{}
 type portmap map[string]portset
 
 // Configuration and state for the HAproxy management module
 type HAproxy struct {
-	ReloadCmd string
-	VerifyCmd string
-	BindIP string
-	Template string
+	ReloadCmd  string
+	VerifyCmd  string
+	BindIP     string
+	Template   string
 	ConfigFile string
 }
 
@@ -45,7 +45,7 @@ func (h *HAproxy) makePortmap(services map[string][]*service.Service) portmap {
 	ports := make(portmap)
 
 	for name, svcList := range services {
-        if _, ok := ports[name]; !ok {
+		if _, ok := ports[name]; !ok {
 			ports[name] = make(portset, 5)
 		}
 
@@ -73,15 +73,15 @@ func sanitizeName(image string) string {
 // template. Ports are looked up by the func getPorts().
 func (h *HAproxy) WriteConfig(state *catalog.ServicesState, output io.Writer) {
 	services := servicesWithPorts(state)
-	ports    := h.makePortmap(services)
+	ports := h.makePortmap(services)
 
 	data := struct {
 		Services map[string][]*service.Service
 	}{
 		Services: services,
 	}
 
-    funcMap := template.FuncMap{
+	funcMap := template.FuncMap{
 		"now": time.Now().UTC,
 		"getPorts": func(k string) []string {
 			var keys []string
@@ -90,9 +90,9 @@ func (h *HAproxy) WriteConfig(state *catalog.ServicesState, output io.Writer) {
 			}
 			return keys
 		},
-		"bindIP": func() string { return h.BindIP },
+		"bindIP":       func() string { return h.BindIP },
 		"sanitizeName": sanitizeName,
-    }
+	}
 
 	t, err := template.New("haproxy").Funcs(funcMap).ParseFiles(h.Template)
 	if err != nil {