Merge pull request #131 from seveas/fuzzy-attrs

Show attributes a bit clearer in debug output

Author: seveas

matcher.go

@@ -17,16 +17,17 @@ type MatchAttribute struct {
 
 func (m MatchAttribute) String() string {
 	c1, c2 := '=', '='
+	f := ""
 	if m.FuzzyTyping {
-		c1, c2 = '≈', '≈'
+		f = " (≈)"
 	}
 	if m.Negate {
 		c1 = '!'
 	}
 	if m.Regex {
 		c2 = '~'
 	}
-	return fmt.Sprintf("%v %c%c %v", m.Name, c1, c2, m.Value)
+	return fmt.Sprintf("%v %c%c %v%s", m.Name, c1, c2, m.Value, f)
 }
 
 func (m MatchAttribute) Match(value interface{}) (matches bool) {

pager.go

@@ -1,6 +1,7 @@
 package herd
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
@@ -14,6 +15,7 @@ type pager struct {
 }
 
 func (p *pager) start() error {
+	ctx := context.Background()
 	if p == nil || p.process != nil {
 		return nil
 	}
@@ -27,9 +29,9 @@ func (p *pager) start() error {
 		if strings.HasSuffix(pager, "less") {
 			args = append(args, "-R")
 		}
-		cmd = exec.Command(pager, args...)
+		cmd = exec.CommandContext(ctx, pager, args...)
 	} else {
-		cmd = exec.Command("sh", "-c", pager)
+		cmd = exec.CommandContext(ctx, "sh", "-c", pager)
 	}
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

provider/consul/provider.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"sort"
 	"strings"
+	"time"
 
 	"github.com/seveas/herd"
 	"github.com/seveas/herd/provider/cache"
@@ -45,7 +46,9 @@ func newProvider(name string) herd.HostProvider {
 func magicProvider() herd.HostProvider {
 	addr, _ := os.LookupEnv("CONSUL_HTTP_ADDR")
 	if addr == "" {
-		_, err := net.LookupHost("consul.service.consul")
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		defer cancel()
+		_, err := net.DefaultResolver.LookupHost(ctx, "consul.service.consul")
 		if err == nil {
 			addr = "http://consul.service.consul:8500"
 		}

provider/plugin/provider.go

@@ -133,7 +133,7 @@ func (p *pluginProvider) connect() error {
 		Managed:          true,
 		HandshakeConfig:  common.Handshake,
 		Plugins:          pluginMap,
-		Cmd:              exec.Command(p.config.Command), // #nosec G204 -- Cmd is user-supplied by design
+		Cmd:              exec.CommandContext(context.Background(), p.config.Command), // #nosec G204 -- Cmd is user-supplied by design
 		Logger:           common.NewLogrusLogger(logrus.StandardLogger(), fmt.Sprintf("plugin-%s", p.name)),
 		SyncStdout:       os.Stdout,
 		SyncStderr:       os.Stderr,

registry.go

@@ -12,6 +12,7 @@ import (
 	"sort"
 	"strings"
 	"syscall"
+	"time"
 
 	"github.com/hashicorp/go-plugin"
 	"github.com/seveas/scattergather"
@@ -280,7 +281,9 @@ func (r *Registry) Search(hostnameGlob string, attributes MatchAttributes, sampl
 
 	ret = ret.Search(hostnameGlob, attributes)
 	if len(ret.hosts) == 0 && attributes != nil && len(attributes) == 0 {
-		if _, err := net.LookupHost(hostnameGlob); err == nil {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+		defer cancel()
+		if _, err := net.DefaultResolver.LookupHost(ctx, hostnameGlob); err == nil {
 			ret = &HostSet{hosts: []*Host{NewHost(hostnameGlob, "", HostAttributes{})}}
 		}
 	}

ssh/agent_pool.go

@@ -2,6 +2,7 @@ package ssh
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -161,7 +162,8 @@ func (ap *agentPool) SignersForPath(path string) []ssh.Signer {
 
 func agentConnection() (io.ReadWriter, error) {
 	if sockPath, ok := os.LookupEnv("SSH_AUTH_SOCK"); ok {
-		return net.Dial("unix", sockPath)
+		var d net.Dialer
+		return d.DialContext(context.Background(), "unix", sockPath)
 	} else if sock := findPageant(); sock != nil {
 		return sock, nil
 	}