diff --git a/go.mod b/go.mod index af82539460b..f8d1b2080c6 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,8 @@ go 1.15 require ( cloud.google.com/go/compute v1.2.0 + cloud.google.com/go/iam v0.2.0 // indirect + cloud.google.com/go/storage v1.10.0 github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.7 github.com/google/martian/v3 v3.2.1 diff --git a/go.sum b/go.sum index d17780f11a4..aff422ca48b 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,8 @@ cloud.google.com/go/compute v1.2.0 h1:EKki8sSdvDU0OO9mAXGwPXOTOgPz2l08R0/IutDH11 cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/iam v0.2.0 h1:Ouq6qif4mZdXkb3SiFMpxvu0JQJB1Yid9TsZ23N6hg8= +cloud.google.com/go/iam v0.2.0/go.mod h1:BCK88+tmjAwnZYfOSizmKCTSFjJHCa18t3DpdGEY13Y= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -46,6 +48,7 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= @@ -348,6 +351,7 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -453,6 +457,7 @@ google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdr google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.69.0 h1:yHW5s2SFyDapr/43kYtIQmoaaFVW4baLMLwqV4auj2A= google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7C80= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -524,7 +529,9 @@ google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222154240-daf995802d7b h1:wHqTlwZVR0x5EG2S6vKlCq63+Tl/vBoQELitHxqxDOo= google.golang.org/genproto v0.0.0-20220222154240-daf995802d7b/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= diff --git a/httpreplay/cmd/httpr/integration_test.go b/httpreplay/cmd/httpr/integration_test.go index b8aed7c4dc5..0b1915d48b5 100644 --- a/httpreplay/cmd/httpr/integration_test.go +++ b/httpreplay/cmd/httpr/integration_test.go @@ -17,215 +17,215 @@ package main_test -// import ( -// "context" -// "crypto/tls" -// "crypto/x509" -// "errors" -// "fmt" -// "io/ioutil" -// "net" -// "net/http" -// "net/url" -// "os" -// "os/exec" -// "strings" -// "testing" -// "time" - -// "cloud.google.com/go/internal/testutil" -// "cloud.google.com/go/storage" -// "golang.org/x/oauth2" -// "google.golang.org/api/option" -// ) - -// const initial = "initial state" - -// func TestIntegration_HTTPR(t *testing.T) { -// if testing.Short() { -// t.Skip("Integration tests skipped in short mode") -// } -// if testutil.ProjID() == "" { -// t.Fatal("set GCLOUD_TESTS_GOLANG_PROJECT_ID and GCLOUD_TESTS_GOLANG_KEY") -// } -// // Get a unique temporary filename. -// f, err := ioutil.TempFile("", "httpreplay") -// if err != nil { -// t.Fatal(err) -// } -// replayFilename := f.Name() -// if err := f.Close(); err != nil { -// t.Fatal(err) -// } -// defer os.Remove(replayFilename) - -// if err := exec.Command("go", "build").Run(); err != nil { -// t.Fatalf("running 'go build': %v", err) -// } -// defer os.Remove("./httpr") -// want := runRecord(t, replayFilename) -// got := runReplay(t, replayFilename) -// if got != want { -// t.Fatalf("got %q, want %q", got, want) -// } -// } - -// func runRecord(t *testing.T, filename string) string { -// cmd, tr, cport, err := start("-record", filename) -// if err != nil { -// t.Fatal(err) -// } -// defer stop(t, cmd) - -// ctx := context.Background() -// hc := &http.Client{ -// Transport: &oauth2.Transport{ -// Base: tr, -// Source: testutil.TokenSource(ctx, storage.ScopeFullControl), -// }, -// } -// res, err := http.Post( -// fmt.Sprintf("http://localhost:%s/initial", cport), -// "text/plain", -// strings.NewReader(initial)) -// if err != nil { -// t.Fatal(err) -// } -// if res.StatusCode != 200 { -// t.Fatalf("from POST: %s", res.Status) -// } -// info, err := getBucketInfo(ctx, hc) -// if err != nil { -// t.Fatal(err) -// } -// return info -// } - -// func runReplay(t *testing.T, filename string) string { -// cmd, tr, cport, err := start("-replay", filename) -// if err != nil { -// t.Fatal(err) -// } -// defer stop(t, cmd) - -// hc := &http.Client{Transport: tr} -// res, err := http.Get(fmt.Sprintf("http://localhost:%s/initial", cport)) -// if err != nil { -// t.Fatal(err) -// } -// if res.StatusCode != 200 { -// t.Fatalf("from GET: %s", res.Status) -// } -// bytes, err := ioutil.ReadAll(res.Body) -// res.Body.Close() -// if err != nil { -// t.Fatal(err) -// } -// if got, want := string(bytes), initial; got != want { -// t.Errorf("initial: got %q, want %q", got, want) -// } -// info, err := getBucketInfo(context.Background(), hc) -// if err != nil { -// t.Fatal(err) -// } -// return info -// } - -// // Start the proxy binary and wait for it to come up. -// // Return a transport that talks to the proxy, as well as the control port. -// // modeFlag must be either "-record" or "-replay". -// func start(modeFlag, filename string) (*exec.Cmd, *http.Transport, string, error) { -// pport, err := pickPort() -// if err != nil { -// return nil, nil, "", err -// } -// cport, err := pickPort() -// if err != nil { -// return nil, nil, "", err -// } -// cmd := exec.Command("./httpr", "-port", pport, "-control-port", cport, modeFlag, filename, "-debug-headers") -// if err := cmd.Start(); err != nil { -// return nil, nil, "", err -// } -// // Wait for the server to come up. -// serverUp := false -// for i := 0; i < 10; i++ { -// if conn, err := net.Dial("tcp", "localhost:"+cport); err == nil { -// conn.Close() -// serverUp = true -// break -// } -// time.Sleep(time.Second) -// } -// if !serverUp { -// return nil, nil, "", errors.New("server never came up") -// } -// tr, err := proxyTransport(pport, cport) -// if err != nil { -// return nil, nil, "", err -// } -// return cmd, tr, cport, nil -// } - -// func stop(t *testing.T, cmd *exec.Cmd) { -// if err := cmd.Process.Signal(os.Interrupt); err != nil { -// t.Fatal(err) -// } -// } - -// // pickPort picks an unused port. -// func pickPort() (string, error) { -// l, err := net.Listen("tcp", ":0") -// if err != nil { -// return "", err -// } -// addr := l.Addr().String() -// _, port, err := net.SplitHostPort(addr) -// if err != nil { -// return "", err -// } -// l.Close() -// return port, nil -// } - -// func proxyTransport(pport, cport string) (*http.Transport, error) { -// caCert, err := getBody(fmt.Sprintf("http://localhost:%s/authority.cer", cport)) -// if err != nil { -// return nil, err -// } -// caCertPool := x509.NewCertPool() -// if !caCertPool.AppendCertsFromPEM([]byte(caCert)) { -// return nil, errors.New("bad CA Cert") -// } -// return &http.Transport{ -// Proxy: http.ProxyURL(&url.URL{Host: "localhost:" + pport}), -// TLSClientConfig: &tls.Config{RootCAs: caCertPool}, -// }, nil -// } - -// func getBucketInfo(ctx context.Context, hc *http.Client) (string, error) { -// client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) -// if err != nil { -// return "", err -// } -// defer client.Close() -// b := client.Bucket(testutil.ProjID()) -// attrs, err := b.Attrs(ctx) -// if err != nil { -// return "", err -// } -// return fmt.Sprintf("name:%s reqpays:%v location:%s sclass:%s", -// attrs.Name, attrs.RequesterPays, attrs.Location, attrs.StorageClass), nil -// } - -// func getBody(url string) ([]byte, error) { -// res, err := http.Get(url) -// if err != nil { -// return nil, err -// } -// if res.StatusCode != 200 { -// return nil, fmt.Errorf("response: %s", res.Status) -// } -// defer res.Body.Close() -// return ioutil.ReadAll(res.Body) -// } +import ( + "context" + "crypto/tls" + "crypto/x509" + "errors" + "fmt" + "io/ioutil" + "net" + "net/http" + "net/url" + "os" + "os/exec" + "strings" + "testing" + "time" + + "cloud.google.com/go/internal/testutil" + "cloud.google.com/go/storage" + "golang.org/x/oauth2" + "google.golang.org/api/option" +) + +const initial = "initial state" + +func TestIntegration_HTTPR(t *testing.T) { + if testing.Short() { + t.Skip("Integration tests skipped in short mode") + } + if testutil.ProjID() == "" { + t.Fatal("set GCLOUD_TESTS_GOLANG_PROJECT_ID and GCLOUD_TESTS_GOLANG_KEY") + } + // Get a unique temporary filename. + f, err := ioutil.TempFile("", "httpreplay") + if err != nil { + t.Fatal(err) + } + replayFilename := f.Name() + if err := f.Close(); err != nil { + t.Fatal(err) + } + defer os.Remove(replayFilename) + + if err := exec.Command("go", "build").Run(); err != nil { + t.Fatalf("running 'go build': %v", err) + } + defer os.Remove("./httpr") + want := runRecord(t, replayFilename) + got := runReplay(t, replayFilename) + if got != want { + t.Fatalf("got %q, want %q", got, want) + } +} + +func runRecord(t *testing.T, filename string) string { + cmd, tr, cport, err := start("-record", filename) + if err != nil { + t.Fatal(err) + } + defer stop(t, cmd) + + ctx := context.Background() + hc := &http.Client{ + Transport: &oauth2.Transport{ + Base: tr, + Source: testutil.TokenSource(ctx, storage.ScopeFullControl), + }, + } + res, err := http.Post( + fmt.Sprintf("http://localhost:%s/initial", cport), + "text/plain", + strings.NewReader(initial)) + if err != nil { + t.Fatal(err) + } + if res.StatusCode != 200 { + t.Fatalf("from POST: %s", res.Status) + } + info, err := getBucketInfo(ctx, hc) + if err != nil { + t.Fatal(err) + } + return info +} + +func runReplay(t *testing.T, filename string) string { + cmd, tr, cport, err := start("-replay", filename) + if err != nil { + t.Fatal(err) + } + defer stop(t, cmd) + + hc := &http.Client{Transport: tr} + res, err := http.Get(fmt.Sprintf("http://localhost:%s/initial", cport)) + if err != nil { + t.Fatal(err) + } + if res.StatusCode != 200 { + t.Fatalf("from GET: %s", res.Status) + } + bytes, err := ioutil.ReadAll(res.Body) + res.Body.Close() + if err != nil { + t.Fatal(err) + } + if got, want := string(bytes), initial; got != want { + t.Errorf("initial: got %q, want %q", got, want) + } + info, err := getBucketInfo(context.Background(), hc) + if err != nil { + t.Fatal(err) + } + return info +} + +// Start the proxy binary and wait for it to come up. +// Return a transport that talks to the proxy, as well as the control port. +// modeFlag must be either "-record" or "-replay". +func start(modeFlag, filename string) (*exec.Cmd, *http.Transport, string, error) { + pport, err := pickPort() + if err != nil { + return nil, nil, "", err + } + cport, err := pickPort() + if err != nil { + return nil, nil, "", err + } + cmd := exec.Command("./httpr", "-port", pport, "-control-port", cport, modeFlag, filename, "-debug-headers") + if err := cmd.Start(); err != nil { + return nil, nil, "", err + } + // Wait for the server to come up. + serverUp := false + for i := 0; i < 10; i++ { + if conn, err := net.Dial("tcp", "localhost:"+cport); err == nil { + conn.Close() + serverUp = true + break + } + time.Sleep(time.Second) + } + if !serverUp { + return nil, nil, "", errors.New("server never came up") + } + tr, err := proxyTransport(pport, cport) + if err != nil { + return nil, nil, "", err + } + return cmd, tr, cport, nil +} + +func stop(t *testing.T, cmd *exec.Cmd) { + if err := cmd.Process.Signal(os.Interrupt); err != nil { + t.Fatal(err) + } +} + +// pickPort picks an unused port. +func pickPort() (string, error) { + l, err := net.Listen("tcp", ":0") + if err != nil { + return "", err + } + addr := l.Addr().String() + _, port, err := net.SplitHostPort(addr) + if err != nil { + return "", err + } + l.Close() + return port, nil +} + +func proxyTransport(pport, cport string) (*http.Transport, error) { + caCert, err := getBody(fmt.Sprintf("http://localhost:%s/authority.cer", cport)) + if err != nil { + return nil, err + } + caCertPool := x509.NewCertPool() + if !caCertPool.AppendCertsFromPEM([]byte(caCert)) { + return nil, errors.New("bad CA Cert") + } + return &http.Transport{ + Proxy: http.ProxyURL(&url.URL{Host: "localhost:" + pport}), + TLSClientConfig: &tls.Config{RootCAs: caCertPool}, + }, nil +} + +func getBucketInfo(ctx context.Context, hc *http.Client) (string, error) { + client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) + if err != nil { + return "", err + } + defer client.Close() + b := client.Bucket(testutil.ProjID()) + attrs, err := b.Attrs(ctx) + if err != nil { + return "", err + } + return fmt.Sprintf("name:%s reqpays:%v location:%s sclass:%s", + attrs.Name, attrs.RequesterPays, attrs.Location, attrs.StorageClass), nil +} + +func getBody(url string) ([]byte, error) { + res, err := http.Get(url) + if err != nil { + return nil, err + } + if res.StatusCode != 200 { + return nil, fmt.Errorf("response: %s", res.Status) + } + defer res.Body.Close() + return ioutil.ReadAll(res.Body) +} diff --git a/httpreplay/httpreplay_test.go b/httpreplay/httpreplay_test.go index 43e8c3f0f1d..3b3252b7e78 100644 --- a/httpreplay/httpreplay_test.go +++ b/httpreplay/httpreplay_test.go @@ -14,411 +14,411 @@ package httpreplay_test -// import ( -// "bytes" -// "context" -// "encoding/json" -// "fmt" -// "io" -// "io/ioutil" -// "log" -// "net/http" -// "net/http/httptest" -// "os" -// "path/filepath" -// "testing" -// "time" +import ( + "bytes" + "context" + "encoding/json" + "fmt" + "io" + "io/ioutil" + "log" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "testing" + "time" -// "cloud.google.com/go/httpreplay" -// "cloud.google.com/go/internal/testutil" -// "cloud.google.com/go/storage" -// "google.golang.org/api/option" -// ) + "cloud.google.com/go/httpreplay" + "cloud.google.com/go/internal/testutil" + "cloud.google.com/go/storage" + "google.golang.org/api/option" +) -// const ( -// compressedFile = "httpreplay_compressed.txt" -// uncompressedFile = "httpreplay_uncompressed.txt" -// ) +const ( + compressedFile = "httpreplay_compressed.txt" + uncompressedFile = "httpreplay_uncompressed.txt" +) -// func TestIntegration_RecordAndReplay(t *testing.T) { -// httpreplay.DebugHeaders() -// if testing.Short() { -// t.Skip("Integration tests skipped in short mode") -// } -// replayFilename := tempFilename(t, "RecordAndReplay*.replay") -// defer os.Remove(replayFilename) -// projectID := testutil.ProjID() -// if projectID == "" { -// t.Skip("Need project ID. See CONTRIBUTING.md for details.") -// } -// ctx := context.Background() -// cleanup, err := setup(ctx) -// if err != nil { -// t.Fatal(err) -// } -// defer cleanup() +func TestIntegration_RecordAndReplay(t *testing.T) { + httpreplay.DebugHeaders() + if testing.Short() { + t.Skip("Integration tests skipped in short mode") + } + replayFilename := tempFilename(t, "RecordAndReplay*.replay") + defer os.Remove(replayFilename) + projectID := testutil.ProjID() + if projectID == "" { + t.Skip("Need project ID. See CONTRIBUTING.md for details.") + } + ctx := context.Background() + cleanup, err := setup(ctx) + if err != nil { + t.Fatal(err) + } + defer cleanup() -// // Record. -// initial := time.Now() -// ibytes, err := json.Marshal(initial) -// if err != nil { -// t.Fatal(err) -// } -// rec, err := httpreplay.NewRecorder(replayFilename, ibytes) -// if err != nil { -// t.Fatal(err) -// } -// hc, err := rec.Client(ctx, option.WithTokenSource( -// testutil.TokenSource(ctx, storage.ScopeFullControl))) -// if err != nil { -// t.Fatal(err) -// } -// wanta, wantc := run(t, hc) -// testReadCRC(t, hc, "recording") -// if err := rec.Close(); err != nil { -// t.Fatalf("rec.Close: %v", err) -// } + // Record. + initial := time.Now() + ibytes, err := json.Marshal(initial) + if err != nil { + t.Fatal(err) + } + rec, err := httpreplay.NewRecorder(replayFilename, ibytes) + if err != nil { + t.Fatal(err) + } + hc, err := rec.Client(ctx, option.WithTokenSource( + testutil.TokenSource(ctx, storage.ScopeFullControl))) + if err != nil { + t.Fatal(err) + } + wanta, wantc := run(t, hc) + testReadCRC(t, hc, "recording") + if err := rec.Close(); err != nil { + t.Fatalf("rec.Close: %v", err) + } -// // Replay. -// rep, err := httpreplay.NewReplayer(replayFilename) -// if err != nil { -// t.Fatal(err) -// } -// defer rep.Close() -// hc, err = rep.Client(ctx) -// if err != nil { -// t.Fatal(err) -// } -// gota, gotc := run(t, hc) -// testReadCRC(t, hc, "replaying") + // Replay. + rep, err := httpreplay.NewReplayer(replayFilename) + if err != nil { + t.Fatal(err) + } + defer rep.Close() + hc, err = rep.Client(ctx) + if err != nil { + t.Fatal(err) + } + gota, gotc := run(t, hc) + testReadCRC(t, hc, "replaying") -// if diff := testutil.Diff(gota, wanta); diff != "" { -// t.Error(diff) -// } -// if !bytes.Equal(gotc, wantc) { -// t.Errorf("got %q, want %q", gotc, wantc) -// } -// var gotInitial time.Time -// if err := json.Unmarshal(rep.Initial(), &gotInitial); err != nil { -// t.Fatal(err) -// } -// if !gotInitial.Equal(initial) { -// t.Errorf("initial: got %v, want %v", gotInitial, initial) -// } -// } + if diff := testutil.Diff(gota, wanta); diff != "" { + t.Error(diff) + } + if !bytes.Equal(gotc, wantc) { + t.Errorf("got %q, want %q", gotc, wantc) + } + var gotInitial time.Time + if err := json.Unmarshal(rep.Initial(), &gotInitial); err != nil { + t.Fatal(err) + } + if !gotInitial.Equal(initial) { + t.Errorf("initial: got %v, want %v", gotInitial, initial) + } +} -// func setup(ctx context.Context) (cleanup func(), err error) { -// ts := testutil.TokenSource(ctx, storage.ScopeFullControl) -// client, err := storage.NewClient(ctx, option.WithTokenSource(ts)) -// if err != nil { -// return nil, err -// } -// bucket := testutil.ProjID() +func setup(ctx context.Context) (cleanup func(), err error) { + ts := testutil.TokenSource(ctx, storage.ScopeFullControl) + client, err := storage.NewClient(ctx, option.WithTokenSource(ts)) + if err != nil { + return nil, err + } + bucket := testutil.ProjID() -// // upload compressed object -// f1, err := os.Open(filepath.Join("internal", "testdata", "compressed.txt")) -// if err != nil { -// return nil, err -// } -// defer f1.Close() -// w := client.Bucket(bucket).Object(compressedFile).NewWriter(ctx) -// w.ContentEncoding = "gzip" -// w.ContentType = "text/plain" -// if _, err = io.Copy(w, f1); err != nil { -// return nil, err -// } -// if err := w.Close(); err != nil { -// return nil, err -// } -// // upload uncompressed object -// f2, err := os.Open(filepath.Join("internal", "testdata", "uncompressed.txt")) -// if err != nil { -// return nil, err -// } -// defer f2.Close() -// w = client.Bucket(testutil.ProjID()).Object(uncompressedFile).NewWriter(ctx) -// if _, err = io.Copy(w, f2); err != nil { -// return nil, err -// } -// if err := w.Close(); err != nil { -// return nil, err -// } -// return func() { -// client.Bucket(bucket).Object(compressedFile).Delete(ctx) -// client.Bucket(bucket).Object(uncompressedFile).Delete(ctx) -// client.Close() -// }, nil -// } + // upload compressed object + f1, err := os.Open(filepath.Join("internal", "testdata", "compressed.txt")) + if err != nil { + return nil, err + } + defer f1.Close() + w := client.Bucket(bucket).Object(compressedFile).NewWriter(ctx) + w.ContentEncoding = "gzip" + w.ContentType = "text/plain" + if _, err = io.Copy(w, f1); err != nil { + return nil, err + } + if err := w.Close(); err != nil { + return nil, err + } + // upload uncompressed object + f2, err := os.Open(filepath.Join("internal", "testdata", "uncompressed.txt")) + if err != nil { + return nil, err + } + defer f2.Close() + w = client.Bucket(testutil.ProjID()).Object(uncompressedFile).NewWriter(ctx) + if _, err = io.Copy(w, f2); err != nil { + return nil, err + } + if err := w.Close(); err != nil { + return nil, err + } + return func() { + client.Bucket(bucket).Object(compressedFile).Delete(ctx) + client.Bucket(bucket).Object(uncompressedFile).Delete(ctx) + client.Close() + }, nil +} -// // TODO(jba): test errors +// TODO(jba): test errors -// func run(t *testing.T, hc *http.Client) (*storage.BucketAttrs, []byte) { -// ctx := context.Background() -// client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) -// if err != nil { -// t.Fatal(err) -// } -// defer client.Close() -// b := client.Bucket(testutil.ProjID()) -// attrs, err := b.Attrs(ctx) -// if err != nil { -// t.Fatal(err) -// } -// obj := b.Object("replay-test") -// w := obj.NewWriter(ctx) -// data := []byte{150, 151, 152} -// if _, err := w.Write(data); err != nil { -// t.Fatal(err) -// } -// if err := w.Close(); err != nil { -// t.Fatal(err) -// } +func run(t *testing.T, hc *http.Client) (*storage.BucketAttrs, []byte) { + ctx := context.Background() + client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) + if err != nil { + t.Fatal(err) + } + defer client.Close() + b := client.Bucket(testutil.ProjID()) + attrs, err := b.Attrs(ctx) + if err != nil { + t.Fatal(err) + } + obj := b.Object("replay-test") + w := obj.NewWriter(ctx) + data := []byte{150, 151, 152} + if _, err := w.Write(data); err != nil { + t.Fatal(err) + } + if err := w.Close(); err != nil { + t.Fatal(err) + } -// r, err := obj.NewReader(ctx) -// if err != nil { -// t.Fatal(err) -// } -// defer r.Close() -// contents, err := ioutil.ReadAll(r) -// if err != nil { -// t.Fatal(err) -// } + r, err := obj.NewReader(ctx) + if err != nil { + t.Fatal(err) + } + defer r.Close() + contents, err := ioutil.ReadAll(r) + if err != nil { + t.Fatal(err) + } -// return attrs, contents -// } + return attrs, contents +} -// func testReadCRC(t *testing.T, hc *http.Client, mode string) { -// ctx := context.Background() -// client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) -// if err != nil { -// t.Fatalf("%s: %v", mode, err) -// } -// defer client.Close() +func testReadCRC(t *testing.T, hc *http.Client, mode string) { + ctx := context.Background() + client, err := storage.NewClient(ctx, option.WithHTTPClient(hc)) + if err != nil { + t.Fatalf("%s: %v", mode, err) + } + defer client.Close() -// bucket := testutil.ProjID() -// uncompressedObj := client.Bucket(bucket).Object(uncompressedFile) -// gzippedObj := client.Bucket(bucket).Object(compressedFile) + bucket := testutil.ProjID() + uncompressedObj := client.Bucket(bucket).Object(uncompressedFile) + gzippedObj := client.Bucket(bucket).Object(compressedFile) -// for _, test := range []struct { -// desc string -// obj *storage.ObjectHandle -// offset, length int64 -// readCompressed bool // don't decompress a gzipped file + for _, test := range []struct { + desc string + obj *storage.ObjectHandle + offset, length int64 + readCompressed bool // don't decompress a gzipped file -// wantErr bool -// wantLen int // length of contents -// }{ -// { -// desc: "uncompressed, entire file", -// obj: uncompressedObj, -// offset: 0, -// length: -1, -// readCompressed: false, -// wantLen: 179, -// }, -// { -// desc: "uncompressed, entire file, don't decompress", -// obj: uncompressedObj, -// offset: 0, -// length: -1, -// readCompressed: true, -// wantLen: 179, -// }, -// { -// desc: "uncompressed, suffix", -// obj: uncompressedObj, -// offset: 9, -// length: -1, -// readCompressed: false, -// wantLen: 170, -// }, -// { -// desc: "uncompressed, prefix", -// obj: uncompressedObj, -// offset: 0, -// length: 18, -// readCompressed: false, -// wantLen: 18, -// }, -// { -// // When a gzipped file is unzipped by GCS, we can't verify the checksum -// // because it was computed against the zipped contents. There is no -// // header that indicates that a gzipped file is being served unzipped. -// // But our CRC check only happens if there is a Content-Length header, -// // and that header is absent for this read. -// desc: "compressed, entire file, server unzips", -// obj: gzippedObj, -// offset: 0, -// length: -1, -// readCompressed: false, -// wantLen: 179, -// }, -// { -// // When we read a gzipped file uncompressed, it's like reading a regular file: -// // the served content and the CRC match. -// desc: "compressed, entire file, read compressed", -// obj: gzippedObj, -// offset: 0, -// length: -1, -// readCompressed: true, -// wantLen: 128, -// }, -// { -// desc: "compressed, partial, read compressed", -// obj: gzippedObj, -// offset: 1, -// length: 8, -// readCompressed: true, -// wantLen: 8, -// }, -// { -// desc: "uncompressed, HEAD", -// obj: uncompressedObj, -// offset: 0, -// length: 0, -// wantLen: 0, -// }, -// { -// desc: "compressed, HEAD", -// obj: gzippedObj, -// offset: 0, -// length: 0, -// wantLen: 0, -// }, -// } { -// obj := test.obj.ReadCompressed(test.readCompressed) -// r, err := obj.NewRangeReader(ctx, test.offset, test.length) -// if err != nil { -// if test.wantErr { -// continue -// } -// t.Errorf("%s: %s: %v", mode, test.desc, err) -// continue -// } -// data, err := ioutil.ReadAll(r) -// _ = r.Close() -// if err != nil { -// t.Errorf("%s: %s: %v", mode, test.desc, err) -// continue -// } -// if got, want := len(data), test.wantLen; got != want { -// t.Errorf("%s: %s: len: got %d, want %d", mode, test.desc, got, want) -// } -// } -// } + wantErr bool + wantLen int // length of contents + }{ + { + desc: "uncompressed, entire file", + obj: uncompressedObj, + offset: 0, + length: -1, + readCompressed: false, + wantLen: 179, + }, + { + desc: "uncompressed, entire file, don't decompress", + obj: uncompressedObj, + offset: 0, + length: -1, + readCompressed: true, + wantLen: 179, + }, + { + desc: "uncompressed, suffix", + obj: uncompressedObj, + offset: 9, + length: -1, + readCompressed: false, + wantLen: 170, + }, + { + desc: "uncompressed, prefix", + obj: uncompressedObj, + offset: 0, + length: 18, + readCompressed: false, + wantLen: 18, + }, + { + // When a gzipped file is unzipped by GCS, we can't verify the checksum + // because it was computed against the zipped contents. There is no + // header that indicates that a gzipped file is being served unzipped. + // But our CRC check only happens if there is a Content-Length header, + // and that header is absent for this read. + desc: "compressed, entire file, server unzips", + obj: gzippedObj, + offset: 0, + length: -1, + readCompressed: false, + wantLen: 179, + }, + { + // When we read a gzipped file uncompressed, it's like reading a regular file: + // the served content and the CRC match. + desc: "compressed, entire file, read compressed", + obj: gzippedObj, + offset: 0, + length: -1, + readCompressed: true, + wantLen: 128, + }, + { + desc: "compressed, partial, read compressed", + obj: gzippedObj, + offset: 1, + length: 8, + readCompressed: true, + wantLen: 8, + }, + { + desc: "uncompressed, HEAD", + obj: uncompressedObj, + offset: 0, + length: 0, + wantLen: 0, + }, + { + desc: "compressed, HEAD", + obj: gzippedObj, + offset: 0, + length: 0, + wantLen: 0, + }, + } { + obj := test.obj.ReadCompressed(test.readCompressed) + r, err := obj.NewRangeReader(ctx, test.offset, test.length) + if err != nil { + if test.wantErr { + continue + } + t.Errorf("%s: %s: %v", mode, test.desc, err) + continue + } + data, err := ioutil.ReadAll(r) + _ = r.Close() + if err != nil { + t.Errorf("%s: %s: %v", mode, test.desc, err) + continue + } + if got, want := len(data), test.wantLen; got != want { + t.Errorf("%s: %s: len: got %d, want %d", mode, test.desc, got, want) + } + } +} -// func TestRemoveAndClear(t *testing.T) { -// // Disable logging for this test, since it generates a lot. -// log.SetOutput(ioutil.Discard) -// srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { -// fmt.Fprintln(w, "LGTM") -// })) -// defer srv.Close() +func TestRemoveAndClear(t *testing.T) { + // Disable logging for this test, since it generates a lot. + log.SetOutput(ioutil.Discard) + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + fmt.Fprintln(w, "LGTM") + })) + defer srv.Close() -// replayFilename := tempFilename(t, "TestRemoveAndClear*.replay") -// defer os.Remove(replayFilename) + replayFilename := tempFilename(t, "TestRemoveAndClear*.replay") + defer os.Remove(replayFilename) -// ctx := context.Background() -// // Record -// rec, err := httpreplay.NewRecorder(replayFilename, nil) -// if err != nil { -// t.Fatal(err) -// } -// rec.ClearHeaders("Clear") -// rec.RemoveRequestHeaders("Rem*") -// rec.ClearQueryParams("c") -// rec.RemoveQueryParams("r") -// hc, err := rec.Client(ctx, option.WithoutAuthentication()) -// if err != nil { -// t.Fatal(err) -// } -// query := "k=1&r=2&c=3" -// req, err := http.NewRequest("GET", srv.URL+"?"+query, nil) -// if err != nil { -// t.Fatal(err) -// } -// headers := map[string]string{"Keep": "ok", "Clear": "secret", "Remove": "bye"} -// for k, v := range headers { -// req.Header.Set(k, v) -// } -// if _, err := hc.Do(req); err != nil { -// t.Fatal(err) -// } -// if err := rec.Close(); err != nil { -// t.Fatal(err) -// } + ctx := context.Background() + // Record + rec, err := httpreplay.NewRecorder(replayFilename, nil) + if err != nil { + t.Fatal(err) + } + rec.ClearHeaders("Clear") + rec.RemoveRequestHeaders("Rem*") + rec.ClearQueryParams("c") + rec.RemoveQueryParams("r") + hc, err := rec.Client(ctx, option.WithoutAuthentication()) + if err != nil { + t.Fatal(err) + } + query := "k=1&r=2&c=3" + req, err := http.NewRequest("GET", srv.URL+"?"+query, nil) + if err != nil { + t.Fatal(err) + } + headers := map[string]string{"Keep": "ok", "Clear": "secret", "Remove": "bye"} + for k, v := range headers { + req.Header.Set(k, v) + } + if _, err := hc.Do(req); err != nil { + t.Fatal(err) + } + if err := rec.Close(); err != nil { + t.Fatal(err) + } -// // Replay -// // For both headers and query param: -// // - k or Keep must be present and identical -// // - c or Clear must be present, but can be different -// // - r or Remove can be anything -// for _, test := range []struct { -// query string -// headers map[string]string -// wantSuccess bool -// }{ -// {query, headers, true}, // same query string and headers -// {query, -// map[string]string{"Keep": "oops", "Clear": "secret", "Remove": "bye"}, -// false, // different Keep -// }, -// {query, map[string]string{}, false}, // missing Keep and Clear -// {query, map[string]string{"Keep": "ok"}, false}, // missing Clear -// {query, map[string]string{"Keep": "ok", "Clear": "secret"}, true}, // missing Remove is OK -// { -// query, -// map[string]string{"Keep": "ok", "Clear": "secret", "Remove": "whatev"}, -// true, -// }, // different Remove is OK -// {query, map[string]string{"Keep": "ok", "Clear": "diff"}, true}, // different Clear is OK -// {"", headers, false}, // no query string -// {"k=x&r=2&c=3", headers, false}, // different k -// {"r=2", headers, false}, // missing k and c -// {"k=1&r=2", headers, false}, // missing c -// {"k=1&c=3", headers, true}, // missing r is OK -// {"k=1&r=x&c=3", headers, true}, // different r is OK, -// {"k=1&r=2&c=x", headers, true}, // different clear is OK -// } { -// rep, err := httpreplay.NewReplayer(replayFilename) -// if err != nil { -// t.Fatal(err) -// } -// hc, err = rep.Client(ctx) -// if err != nil { -// t.Fatal(err) -// } -// url := srv.URL -// if test.query != "" { -// url += "?" + test.query -// } -// req, err = http.NewRequest("GET", url, nil) -// if err != nil { -// t.Fatal(err) -// } -// for k, v := range test.headers { -// req.Header.Set(k, v) -// } -// resp, err := hc.Do(req) -// if err != nil { -// t.Fatal(err) -// } -// rep.Close() -// if (resp.StatusCode == 200) != test.wantSuccess { -// t.Errorf("%q, %v: got %d, wanted success=%t", -// test.query, test.headers, resp.StatusCode, test.wantSuccess) -// } -// } -// } + // Replay + // For both headers and query param: + // - k or Keep must be present and identical + // - c or Clear must be present, but can be different + // - r or Remove can be anything + for _, test := range []struct { + query string + headers map[string]string + wantSuccess bool + }{ + {query, headers, true}, // same query string and headers + {query, + map[string]string{"Keep": "oops", "Clear": "secret", "Remove": "bye"}, + false, // different Keep + }, + {query, map[string]string{}, false}, // missing Keep and Clear + {query, map[string]string{"Keep": "ok"}, false}, // missing Clear + {query, map[string]string{"Keep": "ok", "Clear": "secret"}, true}, // missing Remove is OK + { + query, + map[string]string{"Keep": "ok", "Clear": "secret", "Remove": "whatev"}, + true, + }, // different Remove is OK + {query, map[string]string{"Keep": "ok", "Clear": "diff"}, true}, // different Clear is OK + {"", headers, false}, // no query string + {"k=x&r=2&c=3", headers, false}, // different k + {"r=2", headers, false}, // missing k and c + {"k=1&r=2", headers, false}, // missing c + {"k=1&c=3", headers, true}, // missing r is OK + {"k=1&r=x&c=3", headers, true}, // different r is OK, + {"k=1&r=2&c=x", headers, true}, // different clear is OK + } { + rep, err := httpreplay.NewReplayer(replayFilename) + if err != nil { + t.Fatal(err) + } + hc, err = rep.Client(ctx) + if err != nil { + t.Fatal(err) + } + url := srv.URL + if test.query != "" { + url += "?" + test.query + } + req, err = http.NewRequest("GET", url, nil) + if err != nil { + t.Fatal(err) + } + for k, v := range test.headers { + req.Header.Set(k, v) + } + resp, err := hc.Do(req) + if err != nil { + t.Fatal(err) + } + rep.Close() + if (resp.StatusCode == 200) != test.wantSuccess { + t.Errorf("%q, %v: got %d, wanted success=%t", + test.query, test.headers, resp.StatusCode, test.wantSuccess) + } + } +} -// func tempFilename(t *testing.T, pattern string) string { -// f, err := ioutil.TempFile("", pattern) -// if err != nil { -// t.Fatal(err) -// } -// filename := f.Name() -// if err := f.Close(); err != nil { -// t.Fatal(err) -// } -// return filename -// } +func tempFilename(t *testing.T, pattern string) string { + f, err := ioutil.TempFile("", pattern) + if err != nil { + t.Fatal(err) + } + filename := f.Name() + if err := f.Close(); err != nil { + t.Fatal(err) + } + return filename +} diff --git a/internal/generated/snippets/go.mod b/internal/generated/snippets/go.mod index 466559d83cd..b0178987dfc 100644 --- a/internal/generated/snippets/go.mod +++ b/internal/generated/snippets/go.mod @@ -51,7 +51,7 @@ require ( cloud.google.com/go/gkeconnect v0.1.0 cloud.google.com/go/gkehub v0.2.0 cloud.google.com/go/gsuiteaddons v1.0.0 - cloud.google.com/go/iam v0.1.1 + cloud.google.com/go/iam v0.2.0 cloud.google.com/go/iap v1.0.0 cloud.google.com/go/ids v0.1.0 cloud.google.com/go/iot v1.0.0 diff --git a/internal/godocfx/go.mod b/internal/godocfx/go.mod index 9c4f04b64b3..ba1df324ad2 100644 --- a/internal/godocfx/go.mod +++ b/internal/godocfx/go.mod @@ -6,7 +6,6 @@ require ( cloud.google.com/go v0.100.2 cloud.google.com/go/bigquery v1.26.0 cloud.google.com/go/datastore v1.6.0 - cloud.google.com/go/iam v0.1.0 // indirect cloud.google.com/go/storage v1.18.2 github.com/google/go-cmp v0.5.7 github.com/yuin/goldmark v1.4.4 diff --git a/internal/godocfx/go.sum b/internal/godocfx/go.sum index 88ba6d4cb2a..33dbf8b6ec3 100644 --- a/internal/godocfx/go.sum +++ b/internal/godocfx/go.sum @@ -1,3 +1,8 @@ +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.26.0 h1:/q4uEmgogEwNOgB9VnJT/vAugY1jahD/BrZSMYl1XUM= cloud.google.com/go/bigquery v1.26.0/go.mod h1:zB9gvHgECb8KMHiAIVI8uwvlWVF4QDzVnUQP/CdPaQc= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= @@ -5,13 +10,24 @@ cloud.google.com/go/compute v1.2.0 h1:EKki8sSdvDU0OO9mAXGwPXOTOgPz2l08R0/IutDH11 cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw= cloud.google.com/go/datacatalog v1.0.0 h1:KHjIs525XbESSGHxwEKHTzkwfvj7xxYrCy4gcvvlHBY= cloud.google.com/go/datacatalog v1.0.0/go.mod h1:cz8rXsZV278v0nXPhnp5eXRnZtqx2Mtv96W8r7a7Oxs= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/datastore v1.6.0 h1:wZaHIqu1tebvGRYhVgcfNX6jN2q638OGO23JyJckxuI= cloud.google.com/go/datastore v1.6.0/go.mod h1:q3ZJj1GMQRdU0OCv5XXpCqfLqHHZnI5zcumkvuYDmHI= -cloud.google.com/go/iam v0.1.0 h1:W2vbGCrE3Z7J/x3WXLxxGl9LMSB2uhsAA7Ss/6u/qRY= -cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= +cloud.google.com/go/iam v0.2.0 h1:Ouq6qif4mZdXkb3SiFMpxvu0JQJB1Yid9TsZ23N6hg8= +cloud.google.com/go/iam v0.2.0/go.mod h1:BCK88+tmjAwnZYfOSizmKCTSFjJHCa18t3DpdGEY13Y= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.18.2 h1:5NQw6tOn3eMm0oE8vTkfjau18kjL79FlMjy/CHTpmoY= cloud.google.com/go/storage v1.18.2/go.mod h1:AiIj7BWXyhO5gGVmYJ+S8tbkCx3yb0IMjua8Aw4naVM= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -35,7 +51,12 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -43,6 +64,7 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -60,6 +82,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -68,36 +91,73 @@ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.4 h1:zNWRjYUW32G9KirMXYHQHVNFkXvMI7LpgNW2AgYAoIs= github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= @@ -107,9 +167,19 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -118,6 +188,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= @@ -127,13 +199,30 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -148,6 +237,7 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -159,13 +249,33 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= @@ -174,23 +284,55 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.66.0/go.mod h1:I1dmXYpX7HGwz/ejRxwQp2qj5bFAz93HiCU1C1oYd9M= +google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.69.0 h1:yHW5s2SFyDapr/43kYtIQmoaaFVW4baLMLwqV4auj2A= google.golang.org/api v0.69.0/go.mod h1:boanBiw+h5c3s+tBPgEzLDRHfFLWV0qXxRHz3ws7C80= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= @@ -202,14 +344,22 @@ google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220201184016-50beb8ab5c44/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220211171837-173942840c17/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220222154240-daf995802d7b h1:wHqTlwZVR0x5EG2S6vKlCq63+Tl/vBoQELitHxqxDOo= google.golang.org/genproto v0.0.0-20220222154240-daf995802d7b/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= @@ -229,17 +379,23 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=