update vendor and go.modadd_contact_groups

2 files changed, 41 insertions, 11 deletions

diff --git a/vendor/github.com/hashicorp/go-plugin/client.go b/vendor/github.com/hashicorp/go-plugin/client.go
index 679e10a..bc56559 100644
--- a/vendor/github.com/hashicorp/go-plugin/client.go
+++ b/vendor/github.com/hashicorp/go-plugin/client.go
@@ -87,6 +87,10 @@ type Client struct {
         // goroutines.
         clientWaitGroup sync.WaitGroup
 
+        // stderrWaitGroup is used to prevent the command's Wait() function from
+        // being called before we've finished reading from the stderr pipe.
+        stderrWaitGroup sync.WaitGroup
+
         // processKilled is used for testing only, to flag when the process was
         // forcefully killed.
         processKilled bool
@@ -590,6 +594,12 @@ func (c *Client) Start() (addr net.Addr, err error) {
         // Create a context for when we kill
         c.doneCtx, c.ctxCancel = context.WithCancel(context.Background())
 
+        // Start goroutine that logs the stderr
+        c.clientWaitGroup.Add(1)
+        c.stderrWaitGroup.Add(1)
+        // logStderr calls Done()
+        go c.logStderr(cmdStderr)
+
         c.clientWaitGroup.Add(1)
         go func() {
                 // ensure the context is cancelled when we're done
@@ -602,6 +612,10 @@ func (c *Client) Start() (addr net.Addr, err error) {
                 pid := c.process.Pid
                 path := cmd.Path
 
+                // wait to finish reading from stderr since the stderr pipe reader
+                // will be closed by the subsequent call to cmd.Wait().
+                c.stderrWaitGroup.Wait()
+
                 // Wait for the command to end.
                 err := cmd.Wait()
 
@@ -624,11 +638,6 @@ func (c *Client) Start() (addr net.Addr, err error) {
                 c.exited = true
         }()
 
-        // Start goroutine that logs the stderr
-        c.clientWaitGroup.Add(1)
-        // logStderr calls Done()
-        go c.logStderr(cmdStderr)
-
         // Start a goroutine that is going to be reading the lines
         // out of stdout
         linesCh := make(chan string)
@@ -936,6 +945,7 @@ var stdErrBufferSize = 64 * 1024
 
 func (c *Client) logStderr(r io.Reader) {
         defer c.clientWaitGroup.Done()
+        defer c.stderrWaitGroup.Done()
         l := c.logger.Named(filepath.Base(c.config.Cmd.Path))
 
         reader := bufio.NewReaderSize(r, stdErrBufferSize)
diff --git a/vendor/github.com/hashicorp/go-plugin/server.go b/vendor/github.com/hashicorp/go-plugin/server.go
index fc9f05a..4c230e3 100644
--- a/vendor/github.com/hashicorp/go-plugin/server.go
+++ b/vendor/github.com/hashicorp/go-plugin/server.go
@@ -363,14 +363,34 @@ func serverListener() (net.Listener, error) {
 }
 
 func serverListener_tcp() (net.Listener, error) {
-        minPort, err := strconv.ParseInt(os.Getenv("PLUGIN_MIN_PORT"), 10, 32)
-        if err != nil {
-                return nil, err
+        envMinPort := os.Getenv("PLUGIN_MIN_PORT")
+        envMaxPort := os.Getenv("PLUGIN_MAX_PORT")
+
+        var minPort, maxPort int64
+        var err error
+
+        switch {
+        case len(envMinPort) == 0:
+                minPort = 0
+        default:
+                minPort, err = strconv.ParseInt(envMinPort, 10, 32)
+                if err != nil {
+                        return nil, fmt.Errorf("Couldn't get value from PLUGIN_MIN_PORT: %v", err)
+                }
         }
 
-        maxPort, err := strconv.ParseInt(os.Getenv("PLUGIN_MAX_PORT"), 10, 32)
-        if err != nil {
-                return nil, err
+        switch {
+        case len(envMaxPort) == 0:
+                maxPort = 0
+        default:
+                maxPort, err = strconv.ParseInt(envMaxPort, 10, 32)
+                if err != nil {
+                        return nil, fmt.Errorf("Couldn't get value from PLUGIN_MAX_PORT: %v", err)
+                }
+        }
+
+        if minPort > maxPort {
+                return nil, fmt.Errorf("ENV_MIN_PORT value of %d is greater than PLUGIN_MAX_PORT value of %d", minPort, maxPort)
         }
 
         for port := minPort; port <= maxPort; port++ {