Skip to content

Commit f73a498

Browse files
tomhjptomhjp
authored
Add Diagnose to runner.Runner interface (#275)
* Interface change but non-breaking as `runner.Runner` has not yet been tagged * Differentiate between empty line and closed channel * Maintain the previous first line of the error message just in case of consumers depending on it
1 parent 80216d7 commit f73a498

13 files changed

+150
-81
lines changed

‎client.go

+10-20
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ import (
3131
"google.golang.org/grpc"
3232
)
3333

34-
const unrecognizedRemotePluginMessage = `Unrecognized remote plugin message: %q
35-
This usually means
36-
the plugin was not compiled for this architecture,
37-
the plugin is missing dynamic-link libraries necessary to run,
38-
the plugin is not executable by this process due to file permissions, or
39-
the plugin failed to negotiate the initial go-plugin protocol handshake
40-
%s`
41-
4234
// If this is 1, then we've called CleanupClients. This can be used
4335
// by plugin RPC implementations to change error behavior since you
4436
// can expected network connection errors at this point. This should be
@@ -524,16 +516,6 @@ func (c *Client) Kill() {
524516
c.l.Unlock()
525517
}
526518

527-
// peTypes is a list of Portable Executable (PE) machine types from https://learn.microsoft.com/en-us/windows/win32/debug/pe-format
528-
// mapped to GOARCH types. It is not comprehensive, and only includes machine types that Go supports.
529-
var peTypes = map[uint16]string{
530-
0x14c: "386",
531-
0x1c0: "arm",
532-
0x6264: "loong64",
533-
0x8664: "amd64",
534-
0xaa64: "arm64",
535-
}
536-
537519
// Start the underlying subprocess, communicating with it to negotiate
538520
// a port for RPC connections, and returning the address to connect via RPC.
539521
//
@@ -765,13 +747,21 @@ func (c *Client) Start() (addr net.Addr, err error) {
765747
err = errors.New("timeout while waiting for plugin to start")
766748
case <-c.doneCtx.Done():
767749
err = errors.New("plugin exited before we could connect")
768-
case line := <-linesCh:
750+
case line, ok := <-linesCh:
769751
// Trim the line and split by "|" in order to get the parts of
770752
// the output.
771753
line = strings.TrimSpace(line)
772754
parts := strings.SplitN(line, "|", 6)
773755
if len(parts) < 4 {
774-
err = fmt.Errorf(unrecognizedRemotePluginMessage, line, additionalNotesAboutCommand(cmd.Path))
756+
errText := fmt.Sprintf("Unrecognized remote plugin message: %s", line)
757+
if !ok {
758+
errText += "\n" + "Failed to read any lines from plugin's stdout"
759+
}
760+
additionalNotes := runner.Diagnose(context.Background())
761+
if additionalNotes != "" {
762+
errText += "\n" + additionalNotes
763+
}
764+
err = errors.New(errText)
775765
return
776766
}
777767

‎client_test.go

-40
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"net"
1515
"os"
1616
"os/exec"
17-
"path"
1817
"path/filepath"
1918
"strings"
2019
"sync"
@@ -1494,42 +1493,3 @@ this line is short
14941493
t.Fatalf("\nexpected output: %q\ngot output: %q", msg, read)
14951494
}
14961495
}
1497-
1498-
func TestAdditionalNotesAboutCommand(t *testing.T) {
1499-
files := []string{
1500-
"windows-amd64.exe",
1501-
"windows-386.exe",
1502-
"linux-amd64",
1503-
"darwin-amd64",
1504-
"darwin-arm64",
1505-
}
1506-
for _, file := range files {
1507-
fullFile := path.Join("testdata", file)
1508-
if _, err := os.Stat(fullFile); os.IsNotExist(err) {
1509-
t.Skipf("testdata executables not present; please run 'make' in testdata/ directory for this test")
1510-
}
1511-
1512-
notes := additionalNotesAboutCommand(fullFile)
1513-
if strings.Contains(file, "windows") && !strings.Contains(notes, "PE") {
1514-
t.Errorf("Expected notes to contain Windows information:\n%s", notes)
1515-
}
1516-
if strings.Contains(file, "linux") && !strings.Contains(notes, "ELF") {
1517-
t.Errorf("Expected notes to contain Linux information:\n%s", notes)
1518-
}
1519-
if strings.Contains(file, "darwin") && !strings.Contains(notes, "MachO") {
1520-
t.Errorf("Expected notes to contain macOS information:\n%s", notes)
1521-
}
1522-
1523-
if strings.Contains(file, "amd64") && !(strings.Contains(notes, "amd64") || strings.Contains(notes, "EM_X86_64") || strings.Contains(notes, "CpuAmd64")) {
1524-
t.Errorf("Expected notes to contain amd64 information:\n%s", notes)
1525-
}
1526-
1527-
if strings.Contains(file, "arm64") && !strings.Contains(notes, "CpuArm64") {
1528-
t.Errorf("Expected notes to contain arm64 information:\n%s", notes)
1529-
}
1530-
if strings.Contains(file, "386") && !strings.Contains(notes, "386") {
1531-
t.Errorf("Expected notes to contain 386 information:\n%s", notes)
1532-
}
1533-
1534-
}
1535-
}

‎internal/cmdrunner/cmd_runner.go

+21
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ var (
2323
ErrProcessNotFound = errors.New("Reattachment process not found")
2424
)
2525

26+
const unrecognizedRemotePluginMessage = `This usually means
27+
the plugin was not compiled for this architecture,
28+
the plugin is missing dynamic-link libraries necessary to run,
29+
the plugin is not executable by this process due to file permissions, or
30+
the plugin failed to negotiate the initial go-plugin protocol handshake
31+
%s`
32+
2633
// CmdRunner implements the Executor interface. It mostly just passes through
2734
// to exec.Cmd methods.
2835
type CmdRunner struct {
@@ -106,3 +113,17 @@ func (c *CmdRunner) Name() string {
106113
func (c *CmdRunner) ID() string {
107114
return fmt.Sprintf("%d", c.pid)
108115
}
116+
117+
// peTypes is a list of Portable Executable (PE) machine types from https://learn.microsoft.com/en-us/windows/win32/debug/pe-format
118+
// mapped to GOARCH types. It is not comprehensive, and only includes machine types that Go supports.
119+
var peTypes = map[uint16]string{
120+
0x14c: "386",
121+
0x1c0: "arm",
122+
0x6264: "loong64",
123+
0x8664: "amd64",
124+
0xaa64: "arm64",
125+
}
126+
127+
func (c *CmdRunner) Diagnose(_ context.Context) string {
128+
return fmt.Sprintf(unrecognizedRemotePluginMessage, additionalNotesAboutCommand(c.cmd.Path))
129+
}

‎internal/cmdrunner/cmd_runner_test.go

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Copyright (c) HashiCorp, Inc.
2+
// SPDX-License-Identifier: MPL-2.0
3+
4+
package cmdrunner
5+
6+
import (
7+
"os"
8+
"path/filepath"
9+
"strings"
10+
"testing"
11+
)
12+
13+
func TestAdditionalNotesAboutCommand(t *testing.T) {
14+
files := []string{
15+
"windows-amd64.exe",
16+
"windows-386.exe",
17+
"linux-amd64",
18+
"darwin-amd64",
19+
"darwin-arm64",
20+
}
21+
for _, file := range files {
22+
fullFile := filepath.Join("testdata", file)
23+
if _, err := os.Stat(fullFile); os.IsNotExist(err) {
24+
t.Skipf("testdata executables not present; please run 'make' in testdata/ directory for this test")
25+
}
26+
27+
notes := additionalNotesAboutCommand(fullFile)
28+
if strings.Contains(file, "windows") && !strings.Contains(notes, "PE") {
29+
t.Errorf("Expected notes to contain Windows information:\n%s", notes)
30+
}
31+
if strings.Contains(file, "linux") && !strings.Contains(notes, "ELF") {
32+
t.Errorf("Expected notes to contain Linux information:\n%s", notes)
33+
}
34+
if strings.Contains(file, "darwin") && !strings.Contains(notes, "MachO") {
35+
t.Errorf("Expected notes to contain macOS information:\n%s", notes)
36+
}
37+
38+
if strings.Contains(file, "amd64") && !(strings.Contains(notes, "amd64") || strings.Contains(notes, "EM_X86_64") || strings.Contains(notes, "CpuAmd64")) {
39+
t.Errorf("Expected notes to contain amd64 information:\n%s", notes)
40+
}
41+
42+
if strings.Contains(file, "arm64") && !strings.Contains(notes, "CpuArm64") {
43+
t.Errorf("Expected notes to contain arm64 information:\n%s", notes)
44+
}
45+
if strings.Contains(file, "386") && !strings.Contains(notes, "386") {
46+
t.Errorf("Expected notes to contain 386 information:\n%s", notes)
47+
}
48+
49+
}
50+
}

‎notes_unix.go renamed to ‎internal/cmdrunner/notes_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//go:build !windows
55
// +build !windows
66

7-
package plugin
7+
package cmdrunner
88

99
import (
1010
"debug/elf"

‎notes_windows.go renamed to ‎internal/cmdrunner/notes_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//go:build windows
55
// +build windows
66

7-
package plugin
7+
package cmdrunner
88

99
import (
1010
"debug/elf"

‎testdata/.gitignore renamed to ‎internal/cmdrunner/testdata/.gitignore

File renamed without changes.

‎testdata/Makefile renamed to ‎internal/cmdrunner/testdata/Makefile

File renamed without changes.

‎testdata/README.md renamed to ‎internal/cmdrunner/testdata/README.md

File renamed without changes.

‎testdata/go.mod renamed to ‎internal/cmdrunner/testdata/go.mod

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@ module example.com/testdata
22

33
go 1.19
44

5-
replace github.com/hashicorp/go-plugin => ../
5+
replace github.com/hashicorp/go-plugin => ../../../
66

77
require github.com/hashicorp/go-plugin v1.4.7
88

99
require (
1010
github.com/fatih/color v1.7.0 // indirect
11-
github.com/golang/protobuf v1.3.4 // indirect
11+
github.com/golang/protobuf v1.5.0 // indirect
1212
github.com/hashicorp/go-hclog v0.14.1 // indirect
1313
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect
1414
github.com/mattn/go-colorable v0.1.4 // indirect
1515
github.com/mattn/go-isatty v0.0.10 // indirect
1616
github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
1717
github.com/oklog/run v1.0.0 // indirect
18-
golang.org/x/net v0.0.0-20190311183353-d8887717615a // indirect
19-
golang.org/x/sys v0.0.0-20191008105621-543471e840be // indirect
20-
golang.org/x/text v0.3.0 // indirect
21-
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
22-
google.golang.org/grpc v1.27.1 // indirect
18+
golang.org/x/net v0.7.0 // indirect
19+
golang.org/x/sys v0.5.0 // indirect
20+
golang.org/x/text v0.7.0 // indirect
21+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
22+
google.golang.org/grpc v1.38.0 // indirect
23+
google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 // indirect
2324
)

‎testdata/go.sum renamed to ‎internal/cmdrunner/testdata/go.sum

+54-12
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,44 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
22
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3+
github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
34
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
45
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
6+
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
7+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
58
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
69
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10+
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
711
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
12+
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
813
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
914
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
1015
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
11-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
1216
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
1317
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
1418
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
1519
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
16-
github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
17-
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
18-
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
20+
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
21+
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
22+
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
23+
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
24+
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
25+
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
26+
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
27+
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
28+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
1929
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
30+
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
31+
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
32+
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
33+
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
34+
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
35+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
36+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2037
github.com/hashicorp/go-hclog v0.14.1 h1:nQcJDQwIAGnmoUWp8ubocEX40cCml/17YkF6csQLReU=
2138
github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
2239
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
2340
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
24-
github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
41+
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
2542
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
2643
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
2744
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -34,8 +51,10 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
3451
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3552
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3653
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
54+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3755
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
38-
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
56+
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
57+
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
3958
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4059
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
4160
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -44,31 +63,54 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
4463
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
4564
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
4665
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
47-
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
4866
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
67+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
68+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
4969
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
5070
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5171
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5272
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5373
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5474
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5575
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
56-
golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
5776
golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
58-
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
77+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
78+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5979
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
80+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
81+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
6082
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
6183
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
6284
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
6385
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
86+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
87+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6488
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
6589
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
6690
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
67-
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
6891
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
92+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
93+
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
6994
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
7095
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
71-
google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
72-
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
96+
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
97+
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
98+
google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0=
99+
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
100+
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
101+
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
102+
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
103+
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
104+
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
105+
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
106+
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
107+
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
108+
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
109+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
110+
google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743 h1:yqElulDvOF26oZ2O+2/aoX7mQ8DY/6+p39neytrycd8=
111+
google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
112+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
113+
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
114+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
73115
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
74116
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎testdata/minimal.go renamed to ‎internal/cmdrunner/testdata/minimal.go

File renamed without changes.

0 commit comments

Comments
 (0)