From bf0fb89a2ae2b5bf7d6e512bcb64eb2ceee2edf6 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 30 Apr 2019 17:20:10 -0400 Subject: [PATCH] update go-plugin Includes fix for correct plugin server log levels, preventing everything from logging to Debug. --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/hashicorp/go-plugin/client.go | 10 +++++----- vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 44fe95940..fbb759943 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,7 @@ require ( github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa // indirect github.com/hashicorp/go-msgpack v0.5.4 // indirect github.com/hashicorp/go-multierror v1.0.0 - github.com/hashicorp/go-plugin v0.0.0-20190322172744-52e1c4730856 + github.com/hashicorp/go-plugin v1.0.1-0.20190430211030-5692942914bb github.com/hashicorp/go-retryablehttp v0.5.2 github.com/hashicorp/go-rootcerts v1.0.0 github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86 // indirect diff --git a/go.sum b/go.sum index b2a189a2a..8c8c07596 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/hashicorp/go-msgpack v0.5.4/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iP github.com/hashicorp/go-multierror v0.0.0-20180717150148-3d5d8f294aa0/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-plugin v0.0.0-20190322172744-52e1c4730856 h1:FHiCaU46W1WoqApsaGGIKbNkhQ6v71hJrOf2INQMLUo= -github.com/hashicorp/go-plugin v0.0.0-20190322172744-52e1c4730856/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-plugin v1.0.1-0.20190430211030-5692942914bb h1:Zg2pmmk0lrLFL85lQGt08bOUBpIBaVs6/psiAyx0c4w= +github.com/hashicorp/go-plugin v1.0.1-0.20190430211030-5692942914bb/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.2 h1:AoISa4P4IsW0/m4T6St8Yw38gTl5GtBAgfkhYh1xAz4= github.com/hashicorp/go-retryablehttp v0.5.2/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0 h1:Rqb66Oo1X/eSV1x66xbDccZjhJigjg0+e82kpwzSwCI= diff --git a/vendor/github.com/hashicorp/go-plugin/client.go b/vendor/github.com/hashicorp/go-plugin/client.go index 8118b5876..679e10ad7 100644 --- a/vendor/github.com/hashicorp/go-plugin/client.go +++ b/vendor/github.com/hashicorp/go-plugin/client.go @@ -976,15 +976,15 @@ func (c *Client) logStderr(r io.Reader) { // Attempt to infer the desired log level from the commonly used // string prefixes switch line := string(line); { - case strings.HasPrefix("[TRACE]", line): + case strings.HasPrefix(line, "[TRACE]"): l.Trace(line) - case strings.HasPrefix("[DEBUG]", line): + case strings.HasPrefix(line, "[DEBUG]"): l.Debug(line) - case strings.HasPrefix("[INFO]", line): + case strings.HasPrefix(line, "[INFO]"): l.Info(line) - case strings.HasPrefix("[WARN]", line): + case strings.HasPrefix(line, "[WARN]"): l.Warn(line) - case strings.HasPrefix("[ERROR]", line): + case strings.HasPrefix(line, "[ERROR]"): l.Error(line) default: l.Debug(line) diff --git a/vendor/modules.txt b/vendor/modules.txt index ace4c61a8..bb5d86866 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -279,7 +279,7 @@ github.com/hashicorp/go-getter/helper/url github.com/hashicorp/go-hclog # github.com/hashicorp/go-multierror v1.0.0 github.com/hashicorp/go-multierror -# github.com/hashicorp/go-plugin v0.0.0-20190322172744-52e1c4730856 +# github.com/hashicorp/go-plugin v1.0.1-0.20190430211030-5692942914bb github.com/hashicorp/go-plugin github.com/hashicorp/go-plugin/internal/plugin # github.com/hashicorp/go-retryablehttp v0.5.2