Update go deps
Change-Id: Ic750c287819999050a2b61736b62c8064bbb787b
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/330473
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/go/repo_manager/semver_gcs_repo_manager_test.go b/autoroll/go/repo_manager/semver_gcs_repo_manager_test.go
index 72f914e..2394d25 100644
--- a/autoroll/go/repo_manager/semver_gcs_repo_manager_test.go
+++ b/autoroll/go/repo_manager/semver_gcs_repo_manager_test.go
@@ -165,7 +165,7 @@
}
func mockGSList(t *testing.T, urlmock *mockhttpclient.URLMock, bucket, gsPath string, items map[string]string) {
- fakeUrl := fmt.Sprintf("https://storage.googleapis.com/storage/v1/b/%s/o?alt=json&delimiter=&pageToken=&prefix=%s&prettyPrint=false&projection=full&versions=false", bucket, url.PathEscape(gsPath))
+ fakeUrl := fmt.Sprintf("https://storage.googleapis.com/storage/v1/b/%s/o?alt=json&delimiter=&endOffset=&pageToken=&prefix=%s&prettyPrint=false&projection=full&startOffset=&versions=false", bucket, url.PathEscape(gsPath))
resp := gsObjectList{
Kind: "storage#objects",
Items: []gsObject{},
diff --git a/autoroll/go/rpc/rpc.twirp.go b/autoroll/go/rpc/rpc.twirp.go
index ead6f21..38f44b5 100644
--- a/autoroll/go/rpc/rpc.twirp.go
+++ b/autoroll/go/rpc/rpc.twirp.go
@@ -1,9 +1,9 @@
-// Code generated by protoc-gen-twirp v5.12.1, DO NOT EDIT.
+// Code generated by protoc-gen-twirp v7.1.0, DO NOT EDIT.
// source: rpc.proto
/*
Package rpc is a generated twirp stub package.
-This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.12.1.
+This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.1.0.
It is generated from these files:
rpc.proto
@@ -38,9 +38,17 @@
json "encoding/json"
+ path "path"
+
url "net/url"
)
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the twirp package used in your project.
+// A compilation error at this line likely means your copy of the
+// twirp package needs to be updated.
+const _ = twirp.TwirpPackageIsVersion7
+
// =========================
// AutoRollService Interface
// =========================
@@ -74,14 +82,15 @@
// ===============================
type autoRollServiceProtobufClient struct {
- client HTTPClient
- urls [7]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [7]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewAutoRollServiceProtobufClient creates a Protobuf client that implements the AutoRollService interface.
// It communicates using Protobuf and can be configured with a custom HTTPClient.
-func NewAutoRollServiceProtobufClient(addr string, client HTTPClient, opts ...twirp.ClientOption) AutoRollService {
+func NewAutoRollServiceProtobufClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) AutoRollService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -91,21 +100,24 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + AutoRollServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "autoroll.rpc", "AutoRollService")
urls := [7]string{
- prefix + "GetRollers",
- prefix + "GetMiniStatus",
- prefix + "GetStatus",
- prefix + "SetMode",
- prefix + "SetStrategy",
- prefix + "CreateManualRoll",
- prefix + "Unthrottle",
+ serviceURL + "GetRollers",
+ serviceURL + "GetMiniStatus",
+ serviceURL + "GetStatus",
+ serviceURL + "SetMode",
+ serviceURL + "SetStrategy",
+ serviceURL + "CreateManualRoll",
+ serviceURL + "Unthrottle",
}
return &autoRollServiceProtobufClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -113,6 +125,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetRollers")
+ caller := c.callGetRollers
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetRollersRequest) (*GetRollersResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetRollersRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetRollersRequest) when calling interceptor")
+ }
+ return c.callGetRollers(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetRollersResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetRollersResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callGetRollers(ctx context.Context, in *GetRollersRequest) (*GetRollersResponse, error) {
out := new(GetRollersResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -133,6 +171,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetMiniStatus")
+ caller := c.callGetMiniStatus
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetMiniStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetMiniStatusRequest) when calling interceptor")
+ }
+ return c.callGetMiniStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetMiniStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetMiniStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callGetMiniStatus(ctx context.Context, in *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
out := new(GetMiniStatusResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -153,6 +217,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetStatus")
+ caller := c.callGetStatus
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetStatusRequest) (*GetStatusResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetStatusRequest) when calling interceptor")
+ }
+ return c.callGetStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callGetStatus(ctx context.Context, in *GetStatusRequest) (*GetStatusResponse, error) {
out := new(GetStatusResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -173,6 +263,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "SetMode")
+ caller := c.callSetMode
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SetModeRequest) (*SetModeResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetModeRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetModeRequest) when calling interceptor")
+ }
+ return c.callSetMode(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetModeResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetModeResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callSetMode(ctx context.Context, in *SetModeRequest) (*SetModeResponse, error) {
out := new(SetModeResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -193,6 +309,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "SetStrategy")
+ caller := c.callSetStrategy
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SetStrategyRequest) (*SetStrategyResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetStrategyRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetStrategyRequest) when calling interceptor")
+ }
+ return c.callSetStrategy(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetStrategyResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetStrategyResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callSetStrategy(ctx context.Context, in *SetStrategyRequest) (*SetStrategyResponse, error) {
out := new(SetStrategyResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[4], in, out)
if err != nil {
@@ -213,6 +355,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "CreateManualRoll")
+ caller := c.callCreateManualRoll
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *CreateManualRollRequest) (*CreateManualRollResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CreateManualRollRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CreateManualRollRequest) when calling interceptor")
+ }
+ return c.callCreateManualRoll(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CreateManualRollResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CreateManualRollResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callCreateManualRoll(ctx context.Context, in *CreateManualRollRequest) (*CreateManualRollResponse, error) {
out := new(CreateManualRollResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[5], in, out)
if err != nil {
@@ -233,6 +401,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "Unthrottle")
+ caller := c.callUnthrottle
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *UnthrottleRequest) (*UnthrottleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*UnthrottleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*UnthrottleRequest) when calling interceptor")
+ }
+ return c.callUnthrottle(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*UnthrottleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*UnthrottleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceProtobufClient) callUnthrottle(ctx context.Context, in *UnthrottleRequest) (*UnthrottleResponse, error) {
out := new(UnthrottleResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[6], in, out)
if err != nil {
@@ -254,14 +448,15 @@
// ===========================
type autoRollServiceJSONClient struct {
- client HTTPClient
- urls [7]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [7]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewAutoRollServiceJSONClient creates a JSON client that implements the AutoRollService interface.
// It communicates using JSON and can be configured with a custom HTTPClient.
-func NewAutoRollServiceJSONClient(addr string, client HTTPClient, opts ...twirp.ClientOption) AutoRollService {
+func NewAutoRollServiceJSONClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) AutoRollService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -271,21 +466,24 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + AutoRollServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "autoroll.rpc", "AutoRollService")
urls := [7]string{
- prefix + "GetRollers",
- prefix + "GetMiniStatus",
- prefix + "GetStatus",
- prefix + "SetMode",
- prefix + "SetStrategy",
- prefix + "CreateManualRoll",
- prefix + "Unthrottle",
+ serviceURL + "GetRollers",
+ serviceURL + "GetMiniStatus",
+ serviceURL + "GetStatus",
+ serviceURL + "SetMode",
+ serviceURL + "SetStrategy",
+ serviceURL + "CreateManualRoll",
+ serviceURL + "Unthrottle",
}
return &autoRollServiceJSONClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -293,6 +491,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetRollers")
+ caller := c.callGetRollers
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetRollersRequest) (*GetRollersResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetRollersRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetRollersRequest) when calling interceptor")
+ }
+ return c.callGetRollers(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetRollersResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetRollersResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callGetRollers(ctx context.Context, in *GetRollersRequest) (*GetRollersResponse, error) {
out := new(GetRollersResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -313,6 +537,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetMiniStatus")
+ caller := c.callGetMiniStatus
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetMiniStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetMiniStatusRequest) when calling interceptor")
+ }
+ return c.callGetMiniStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetMiniStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetMiniStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callGetMiniStatus(ctx context.Context, in *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
out := new(GetMiniStatusResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -333,6 +583,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "GetStatus")
+ caller := c.callGetStatus
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetStatusRequest) (*GetStatusResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetStatusRequest) when calling interceptor")
+ }
+ return c.callGetStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callGetStatus(ctx context.Context, in *GetStatusRequest) (*GetStatusResponse, error) {
out := new(GetStatusResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -353,6 +629,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "SetMode")
+ caller := c.callSetMode
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SetModeRequest) (*SetModeResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetModeRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetModeRequest) when calling interceptor")
+ }
+ return c.callSetMode(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetModeResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetModeResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callSetMode(ctx context.Context, in *SetModeRequest) (*SetModeResponse, error) {
out := new(SetModeResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -373,6 +675,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "SetStrategy")
+ caller := c.callSetStrategy
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SetStrategyRequest) (*SetStrategyResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetStrategyRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetStrategyRequest) when calling interceptor")
+ }
+ return c.callSetStrategy(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetStrategyResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetStrategyResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callSetStrategy(ctx context.Context, in *SetStrategyRequest) (*SetStrategyResponse, error) {
out := new(SetStrategyResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[4], in, out)
if err != nil {
@@ -393,6 +721,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "CreateManualRoll")
+ caller := c.callCreateManualRoll
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *CreateManualRollRequest) (*CreateManualRollResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CreateManualRollRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CreateManualRollRequest) when calling interceptor")
+ }
+ return c.callCreateManualRoll(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CreateManualRollResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CreateManualRollResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callCreateManualRoll(ctx context.Context, in *CreateManualRollRequest) (*CreateManualRollResponse, error) {
out := new(CreateManualRollResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[5], in, out)
if err != nil {
@@ -413,6 +767,32 @@
ctx = ctxsetters.WithPackageName(ctx, "autoroll.rpc")
ctx = ctxsetters.WithServiceName(ctx, "AutoRollService")
ctx = ctxsetters.WithMethodName(ctx, "Unthrottle")
+ caller := c.callUnthrottle
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *UnthrottleRequest) (*UnthrottleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*UnthrottleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*UnthrottleRequest) when calling interceptor")
+ }
+ return c.callUnthrottle(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*UnthrottleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*UnthrottleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *autoRollServiceJSONClient) callUnthrottle(ctx context.Context, in *UnthrottleRequest) (*UnthrottleResponse, error) {
out := new(UnthrottleResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[6], in, out)
if err != nil {
@@ -435,13 +815,36 @@
type autoRollServiceServer struct {
AutoRollService
- hooks *twirp.ServerHooks
+ interceptor twirp.Interceptor
+ hooks *twirp.ServerHooks
+ pathPrefix string // prefix for routing
+ jsonSkipDefaults bool // do not include unpopulated fields (default values) in the response
}
-func NewAutoRollServiceServer(svc AutoRollService, hooks *twirp.ServerHooks) TwirpServer {
+// NewAutoRollServiceServer builds a TwirpServer that can be used as an http.Handler to handle
+// HTTP requests that are routed to the right method in the provided svc implementation.
+// The opts are twirp.ServerOption modifiers, for example twirp.WithServerHooks(hooks).
+func NewAutoRollServiceServer(svc AutoRollService, opts ...interface{}) TwirpServer {
+ serverOpts := twirp.ServerOptions{}
+ for _, opt := range opts {
+ switch o := opt.(type) {
+ case twirp.ServerOption:
+ o(&serverOpts)
+ case *twirp.ServerHooks: // backwards compatibility, allow to specify hooks as an argument
+ twirp.WithServerHooks(o)(&serverOpts)
+ case nil: // backwards compatibility, allow nil value for the argument
+ continue
+ default:
+ panic(fmt.Sprintf("Invalid option type %T on NewAutoRollServiceServer", o))
+ }
+ }
+
return &autoRollServiceServer{
- AutoRollService: svc,
- hooks: hooks,
+ AutoRollService: svc,
+ pathPrefix: serverOpts.PathPrefix(),
+ interceptor: twirp.ChainInterceptors(serverOpts.Interceptors...),
+ hooks: serverOpts.Hooks,
+ jsonSkipDefaults: serverOpts.JSONSkipDefaults,
}
}
@@ -451,9 +854,10 @@
writeError(ctx, resp, err, s.hooks)
}
-// AutoRollServicePathPrefix is used for all URL paths on a twirp AutoRollService server.
-// Requests are always: POST AutoRollServicePathPrefix/method
-// It can be used in an HTTP mux to route twirp requests along with non-twirp requests on other routes.
+// AutoRollServicePathPrefix is a convenience constant that could used to identify URL paths.
+// Should be used with caution, it only matches routes generated by Twirp Go clients,
+// that add a "/twirp" prefix by default, and use CamelCase service and method names.
+// More info: https://twitchtv.github.io/twirp/docs/routing.html
const AutoRollServicePathPrefix = "/twirp/autoroll.rpc.AutoRollService/"
func (s *autoRollServiceServer) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
@@ -471,37 +875,48 @@
if req.Method != "POST" {
msg := fmt.Sprintf("unsupported method %q (only POST is allowed)", req.Method)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
- switch req.URL.Path {
- case "/twirp/autoroll.rpc.AutoRollService/GetRollers":
+ // Verify path format: [<prefix>]/<package>.<Service>/<Method>
+ prefix, pkgService, method := parseTwirpPath(req.URL.Path)
+ if pkgService != "autoroll.rpc.AutoRollService" {
+ msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+ if prefix != s.pathPrefix {
+ msg := fmt.Sprintf("invalid path prefix %q, expected %q, on path %q", prefix, s.pathPrefix, req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+
+ switch method {
+ case "GetRollers":
s.serveGetRollers(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/GetMiniStatus":
+ case "GetMiniStatus":
s.serveGetMiniStatus(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/GetStatus":
+ case "GetStatus":
s.serveGetStatus(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/SetMode":
+ case "SetMode":
s.serveSetMode(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/SetStrategy":
+ case "SetStrategy":
s.serveSetStrategy(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/CreateManualRoll":
+ case "CreateManualRoll":
s.serveCreateManualRoll(ctx, resp, req)
return
- case "/twirp/autoroll.rpc.AutoRollService/Unthrottle":
+ case "Unthrottle":
s.serveUnthrottle(ctx, resp, req)
return
default:
msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
}
@@ -540,11 +955,34 @@
return
}
+ handler := s.AutoRollService.GetRollers
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetRollersRequest) (*GetRollersResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetRollersRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetRollersRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetRollers(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetRollersResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetRollersResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetRollersResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetRollers(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -559,7 +997,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -574,7 +1012,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -599,11 +1037,34 @@
return
}
+ handler := s.AutoRollService.GetRollers
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetRollersRequest) (*GetRollersResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetRollersRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetRollersRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetRollers(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetRollersResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetRollersResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetRollersResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetRollers(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -630,7 +1091,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -669,11 +1130,34 @@
return
}
+ handler := s.AutoRollService.GetMiniStatus
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetMiniStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetMiniStatusRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetMiniStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetMiniStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetMiniStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetMiniStatusResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetMiniStatus(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -688,7 +1172,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -703,7 +1187,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -728,11 +1212,34 @@
return
}
+ handler := s.AutoRollService.GetMiniStatus
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetMiniStatusRequest) (*GetMiniStatusResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetMiniStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetMiniStatusRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetMiniStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetMiniStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetMiniStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetMiniStatusResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetMiniStatus(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -759,7 +1266,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -798,11 +1305,34 @@
return
}
+ handler := s.AutoRollService.GetStatus
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetStatusRequest) (*GetStatusResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetStatusRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetStatusResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetStatus(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -817,7 +1347,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -832,7 +1362,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -857,11 +1387,34 @@
return
}
+ handler := s.AutoRollService.GetStatus
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetStatusRequest) (*GetStatusResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetStatusRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetStatusRequest) when calling interceptor")
+ }
+ return s.AutoRollService.GetStatus(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetStatusResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetStatusResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetStatusResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.GetStatus(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -888,7 +1441,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -927,11 +1480,34 @@
return
}
+ handler := s.AutoRollService.SetMode
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SetModeRequest) (*SetModeResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetModeRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetModeRequest) when calling interceptor")
+ }
+ return s.AutoRollService.SetMode(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetModeResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetModeResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SetModeResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.SetMode(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -946,7 +1522,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -961,7 +1537,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -986,11 +1562,34 @@
return
}
+ handler := s.AutoRollService.SetMode
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SetModeRequest) (*SetModeResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetModeRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetModeRequest) when calling interceptor")
+ }
+ return s.AutoRollService.SetMode(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetModeResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetModeResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SetModeResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.SetMode(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1017,7 +1616,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1056,11 +1655,34 @@
return
}
+ handler := s.AutoRollService.SetStrategy
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SetStrategyRequest) (*SetStrategyResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetStrategyRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetStrategyRequest) when calling interceptor")
+ }
+ return s.AutoRollService.SetStrategy(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetStrategyResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetStrategyResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SetStrategyResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.SetStrategy(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1075,7 +1697,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1090,7 +1712,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1115,11 +1737,34 @@
return
}
+ handler := s.AutoRollService.SetStrategy
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SetStrategyRequest) (*SetStrategyResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SetStrategyRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SetStrategyRequest) when calling interceptor")
+ }
+ return s.AutoRollService.SetStrategy(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SetStrategyResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SetStrategyResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SetStrategyResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.SetStrategy(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1146,7 +1791,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1185,11 +1830,34 @@
return
}
+ handler := s.AutoRollService.CreateManualRoll
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *CreateManualRollRequest) (*CreateManualRollResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CreateManualRollRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CreateManualRollRequest) when calling interceptor")
+ }
+ return s.AutoRollService.CreateManualRoll(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CreateManualRollResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CreateManualRollResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *CreateManualRollResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.CreateManualRoll(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1204,7 +1872,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1219,7 +1887,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1244,11 +1912,34 @@
return
}
+ handler := s.AutoRollService.CreateManualRoll
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *CreateManualRollRequest) (*CreateManualRollResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CreateManualRollRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CreateManualRollRequest) when calling interceptor")
+ }
+ return s.AutoRollService.CreateManualRoll(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CreateManualRollResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CreateManualRollResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *CreateManualRollResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.CreateManualRoll(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1275,7 +1966,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1314,11 +2005,34 @@
return
}
+ handler := s.AutoRollService.Unthrottle
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *UnthrottleRequest) (*UnthrottleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*UnthrottleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*UnthrottleRequest) when calling interceptor")
+ }
+ return s.AutoRollService.Unthrottle(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*UnthrottleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*UnthrottleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *UnthrottleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.Unthrottle(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1333,7 +2047,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1348,7 +2062,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1373,11 +2087,34 @@
return
}
+ handler := s.AutoRollService.Unthrottle
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *UnthrottleRequest) (*UnthrottleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*UnthrottleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*UnthrottleRequest) when calling interceptor")
+ }
+ return s.AutoRollService.Unthrottle(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*UnthrottleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*UnthrottleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *UnthrottleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.AutoRollService.Unthrottle(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1404,7 +2141,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1414,11 +2151,14 @@
}
func (s *autoRollServiceServer) ProtocGenTwirpVersion() string {
- return "v5.12.1"
+ return "v7.1.0"
}
+// PathPrefix returns the base service path, in the form: "/<prefix>/<package>.<Service>/"
+// that is everything in a Twirp route except for the <Method>. This can be used for routing,
+// for example to identify the requests that are targeted to this service in a mux.
func (s *autoRollServiceServer) PathPrefix() string {
- return AutoRollServicePathPrefix
+ return baseServicePath(s.pathPrefix, "autoroll.rpc", "AutoRollService")
}
// =====
@@ -1443,6 +2183,7 @@
// Most people can think of TwirpServers as just http.Handlers.
type TwirpServer interface {
http.Handler
+
// ServiceDescriptor returns gzipped bytes describing the .proto file that
// this service was generated from. Once unzipped, the bytes can be
// unmarshalled as a
@@ -1452,12 +2193,15 @@
// FileDescriptorProto's 'Service' slice of ServiceDescriptorProtos. This is a
// low-level field, expected to be used for reflection.
ServiceDescriptor() ([]byte, int)
+
// ProtocGenTwirpVersion is the semantic version string of the version of
// twirp used to generate this file.
ProtocGenTwirpVersion() string
+
// PathPrefix returns the HTTP URL path prefix for all methods handled by this
- // service. This can be used with an HTTP mux to route twirp requests
- // alongside non-twirp requests on one HTTP listener.
+ // service. This can be used with an HTTP mux to route Twirp requests.
+ // The path prefix is in the form: "/<prefix>/<package>.<Service>/"
+ // that is, everything in a Twirp route except for the <Method> at the end.
PathPrefix() string
}
@@ -1508,19 +2252,44 @@
callResponseSent(ctx, hooks)
}
-// urlBase helps ensure that addr specifies a scheme. If it is unparsable
-// as a URL, it returns addr unchanged.
-func urlBase(addr string) string {
- // If the addr specifies a scheme, use it. If not, default to
- // http. If url.Parse fails on it, return it unchanged.
- url, err := url.Parse(addr)
+// sanitizeBaseURL parses the the baseURL, and adds the "http" scheme if needed.
+// If the URL is unparsable, the baseURL is returned unchaged.
+func sanitizeBaseURL(baseURL string) string {
+ u, err := url.Parse(baseURL)
if err != nil {
- return addr
+ return baseURL // invalid URL will fail later when making requests
}
- if url.Scheme == "" {
- url.Scheme = "http"
+ if u.Scheme == "" {
+ u.Scheme = "http"
}
- return url.String()
+ return u.String()
+}
+
+// baseServicePath composes the path prefix for the service (without <Method>).
+// e.g.: baseServicePath("/twirp", "my.pkg", "MyService")
+// returns => "/twirp/my.pkg.MyService/"
+// e.g.: baseServicePath("", "", "MyService")
+// returns => "/MyService/"
+func baseServicePath(prefix, pkg, service string) string {
+ fullServiceName := service
+ if pkg != "" {
+ fullServiceName = pkg + "." + service
+ }
+ return path.Join("/", prefix, fullServiceName) + "/"
+}
+
+// parseTwirpPath extracts path components form a valid Twirp route.
+// Expected format: "[<prefix>]/<package>.<Service>/<Method>"
+// e.g.: prefix, pkgService, method := parseTwirpPath("/twirp/pkg.Svc/MakeHat")
+func parseTwirpPath(path string) (string, string, string) {
+ parts := strings.Split(path, "/")
+ if len(parts) < 2 {
+ return "", "", ""
+ }
+ method := parts[len(parts)-1]
+ pkgService := parts[len(parts)-2]
+ prefix := strings.Join(parts[0:len(parts)-2], "/")
+ return prefix, pkgService, method
}
// getCustomHTTPReqHeaders retrieves a copy of any headers that are set in
@@ -1555,7 +2324,7 @@
}
req.Header.Set("Accept", contentType)
req.Header.Set("Content-Type", contentType)
- req.Header.Set("Twirp-Version", "v5.12.1")
+ req.Header.Set("Twirp-Version", "v7.1.0")
return req, nil
}
@@ -1650,7 +2419,9 @@
code = twirp.PermissionDenied
case 404: // Not Found
code = twirp.BadRoute
- case 429, 502, 503, 504: // Too Many Requests, Bad Gateway, Service Unavailable, Gateway Timeout
+ case 429: // Too Many Requests
+ code = twirp.ResourceExhausted
+ case 502, 503, 504: // Bad Gateway, Service Unavailable, Gateway Timeout
code = twirp.Unavailable
default: // All other codes
code = twirp.Unknown
diff --git a/go.mod b/go.mod
index e712524..37b3f2d 100644
--- a/go.mod
+++ b/go.mod
@@ -44,71 +44,82 @@
replace go.larrymyers.com/protoc-gen-twirp_typescript => github.com/skia-dev/protoc-gen-twirp_typescript v0.0.0-20200902150932-4a52797b9171
require (
- cloud.google.com/go v0.63.0
- cloud.google.com/go/bigtable v1.5.0
- cloud.google.com/go/datastore v1.2.0
+ cloud.google.com/go v0.70.0
+ cloud.google.com/go/bigtable v1.6.0
+ cloud.google.com/go/datastore v1.3.0
cloud.google.com/go/firestore v1.3.0
- cloud.google.com/go/logging v1.0.0
- cloud.google.com/go/pubsub v1.6.1
- cloud.google.com/go/storage v1.10.0
- contrib.go.opencensus.io/exporter/stackdriver v0.13.2
+ cloud.google.com/go/logging v1.1.1
+ cloud.google.com/go/pubsub v1.8.2
+ cloud.google.com/go/storage v1.12.0
+ contrib.go.opencensus.io/exporter/stackdriver v0.13.4
github.com/GeertJohan/go.rice v1.0.0
- github.com/Jeffail/gabs/v2 v2.5.1
+ github.com/Jeffail/gabs/v2 v2.6.0
github.com/Masterminds/goutils v1.1.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/OneOfOne/struct2ts v1.0.4 // indirect
- github.com/PuerkitoBio/goquery v1.5.1
+ github.com/PuerkitoBio/goquery v1.6.0
github.com/a8m/envsubst v1.2.0
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/andybalholm/cascadia v1.2.0 // indirect
- github.com/apache/thrift v0.12.0 // indirect
- github.com/aws/aws-sdk-go v1.34.0 // indirect
+ github.com/aws/aws-sdk-go v1.35.17 // indirect
github.com/bazelbuild/bazel-gazelle v0.21.1 // indirect
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
+ github.com/cockroachdb/cockroach-go v2.0.1+incompatible // indirect
github.com/codegangsta/negroni v1.0.0 // indirect
+ github.com/containerd/containerd v1.4.1 // indirect
github.com/daaku/go.zipexe v1.0.1 // indirect
- github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 // indirect
+ github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0 // indirect
github.com/davecgh/go-spew v1.1.1
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/fiorix/go-web v1.0.1-0.20150221144011-5b593f1e8966
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
github.com/fsnotify/fsnotify v1.4.9 // indirect
+ github.com/go-logr/logr v0.2.1 // indirect
github.com/go-python/gpython v0.0.3
github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f // indirect
github.com/gofrs/uuid v3.3.0+incompatible // indirect
- github.com/golang-migrate/migrate/v4 v4.12.2
+ github.com/golang-migrate/migrate/v4 v4.13.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/mock v1.4.4
- github.com/golang/protobuf v1.4.2
+ github.com/golang/protobuf v1.4.3
+ github.com/golang/snappy v0.0.2 // indirect
github.com/google/go-github/v29 v29.0.3
github.com/google/go-licenses v0.0.0-20201026145851-73411c8fa237
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 // indirect
- github.com/google/uuid v1.1.1
- github.com/googleapis/gnostic v0.4.0 // indirect
- github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f // indirect
+ github.com/google/martian/v3 v3.1.0 // indirect
+ github.com/google/uuid v1.1.2
+ github.com/googleapis/gnostic v0.5.3 // indirect
+ github.com/gophercloud/gophercloud v0.1.0 // indirect
+ github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect
github.com/gorilla/csrf v1.7.0 // indirect
- github.com/gorilla/mux v1.7.4
+ github.com/gorilla/mux v1.8.0
github.com/gorilla/securecookie v1.1.1
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026
+ github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/golang-lru v0.5.4
github.com/huandu/xstrings v1.3.2 // indirect
- github.com/imdario/mergo v0.3.10 // indirect
+ github.com/imdario/mergo v0.3.11 // indirect
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
- github.com/jackc/pgproto3/v2 v2.0.4 // indirect
- github.com/jackc/pgx/v4 v4.8.1
+ github.com/jackc/pgconn v1.7.0 // indirect
+ github.com/jackc/pgx/v4 v4.9.0
github.com/jcgregorio/logger v0.1.2
github.com/jcgregorio/slog v0.0.0-20190423190439-e6f2d537f900
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/kisielk/errcheck v1.2.0
+ github.com/klauspost/compress v1.11.2 // indirect
+ github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
- github.com/mailru/easyjson v0.7.2 // indirect
+ github.com/lib/pq v1.8.0 // indirect
+ github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f // indirect
+ github.com/magiconair/properties v1.8.4 // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
github.com/maruel/subcommands v0.0.0-20200206125935-de1d40e70d4b // indirect
github.com/maruel/ut v1.0.1 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
@@ -118,24 +129,28 @@
github.com/neo4j-drivers/gobolt v1.7.4 // indirect
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+ github.com/nxadm/tail v1.4.5 // indirect
+ github.com/onsi/ginkgo v1.14.2 // indirect
+ github.com/onsi/gomega v1.10.3 // indirect
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/openzipkin/zipkin-go v0.1.6 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
- github.com/pelletier/go-toml v1.8.0 // indirect
+ github.com/pelletier/go-toml v1.8.1 // indirect
github.com/peterh/liner v1.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0
- github.com/prometheus/client_golang v1.7.1
- github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff // indirect
+ github.com/prometheus/client_golang v1.8.0
+ github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac // indirect
github.com/russross/blackfriday/v2 v2.0.1
github.com/sergi/go-diff v1.1.0 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
+ github.com/sirupsen/logrus v1.7.0 // indirect
github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4
github.com/skia-dev/go2ts v1.3.5
github.com/skia-dev/google-api-go-client v0.10.1-0.20200109184256-16c3d6f408b2
- github.com/spf13/afero v1.3.4 // indirect
+ github.com/smartystreets/assertions v1.2.0 // indirect
+ github.com/spf13/afero v1.4.1 // indirect
github.com/spf13/cast v1.3.1 // indirect
- github.com/spf13/cobra v1.0.0
+ github.com/spf13/cobra v1.1.1
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.1
@@ -143,38 +158,47 @@
github.com/stretchr/testify v1.6.1
github.com/syndtr/goleveldb v1.0.0
github.com/texttheater/golang-levenshtein v1.0.1
- github.com/twitchtv/twirp v5.12.1+incompatible
+ github.com/twitchtv/twirp v7.1.0+incompatible
+ github.com/ugorji/go v1.1.4 // indirect
github.com/unrolled/secure v1.0.8
github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5
- github.com/willf/bitset v1.1.10
+ github.com/willf/bitset v1.1.11
github.com/yosuke-furukawa/json5 v0.1.1 // indirect
github.com/zeebo/bencode v1.0.0
go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect
- go.chromium.org/luci v0.0.0-20200810035958-a85648a14281
- go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20200623200853-f5da1af25b54
- go.opencensus.io v0.22.4
- golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
- golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
- golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9 // indirect
+ go.chromium.org/luci v0.0.0-20201029061824-984e7bda0424
+ go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20201012232926-5c91a3223921
+ go.opencensus.io v0.22.5
+ golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
+ golang.org/x/net v0.0.0-20201029055024-942e2f445f3c // indirect
+ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
+ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+ golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 // indirect
+ golang.org/x/text v0.3.4 // indirect
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
- golang.org/x/tools v0.0.0-20200809012840-6f4f008689da
- google.golang.org/api v0.30.0
- google.golang.org/genproto v0.0.0-20200808173500-a06252235341
- google.golang.org/grpc v1.31.0
+ golang.org/x/tools v0.0.0-20201029135353-690a3c245f28
+ google.golang.org/api v0.34.0
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20201028140639-c77dae4b0522
+ google.golang.org/grpc v1.33.1
google.golang.org/protobuf v1.25.0
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+ gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
gopkg.in/fsnotify.v1 v1.4.7
- gopkg.in/ini.v1 v1.57.0 // indirect
+ gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/olivere/elastic.v5 v5.0.86
gopkg.in/sourcemap.v1 v1.0.5 // indirect
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
- honnef.co/go/tools v0.0.1-2020.1.5 // indirect
- k8s.io/api v0.18.6
- k8s.io/apimachinery v0.18.6
- k8s.io/client-go v0.18.6
+ honnef.co/go/tools v0.0.1-2020.1.6 // indirect
+ k8s.io/api v0.19.3
+ k8s.io/apimachinery v0.19.3
+ k8s.io/client-go v0.19.3
+ k8s.io/klog v1.0.0 // indirect
+ k8s.io/klog/v2 v2.3.0 // indirect
+ k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 // indirect
+ k8s.io/utils v0.0.0-20201027101359-01387209bb0d // indirect
rsc.io/sampler v1.99.99 // indirect
+ sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
)
go 1.13
diff --git a/go.sum b/go.sum
index 41805f5..6746fb3 100644
--- a/go.sum
+++ b/go.sum
@@ -13,6 +13,7 @@
cloud.google.com/go v0.46.3 h1:AVXDdKsrtX33oR9fbCMu/+c1o8Ofjq6Ku/MInaLVg5Y=
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
cloud.google.com/go v0.52.0 h1:GGslhk/BU052LPlnI1vpp3fcbUs+hQ3E+Doti/3/vF8=
cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
cloud.google.com/go v0.53.0 h1:MZQCQQaRwOrAcuKjiHWHrgKykt4fZyuwF2dtiG3fGW8=
@@ -34,6 +35,12 @@
cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
cloud.google.com/go v0.63.0 h1:A+DfAZQ/eWca7gvu42CS6FNSDX4R8cghF+XfWLn4R6g=
cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg=
+cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4=
+cloud.google.com/go v0.65.0 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko=
+cloud.google.com/go v0.70.0 h1:ujhG1RejZYi+HYfJNlgBh3j/bVKD8DewM7AkJ5UPyBc=
+cloud.google.com/go v0.70.0/go.mod h1:/UTKYRQTWjVnSe7nGvoSzxEFUELzSI/yAYd0JQT6cRo=
cloud.google.com/go/bigquery v1.0.1 h1:hL+ycaJpVE9M7nLoiXb/Pn10ENE2u+oddxbD8uu0ZVU=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0 h1:sAbMqjY1PEQKZBWfbu6Y6bsupJ9c4QdHnzg/VvYTLcE=
@@ -54,12 +61,16 @@
cloud.google.com/go/bigtable v1.4.0/go.mod h1:AgdyvSw1ksn4wdYT4sXDZSXlaaM6WpdWQyD7DE5ggPM=
cloud.google.com/go/bigtable v1.5.0 h1:ylPDE1w1+koWpPOzf8HkX2PqKaIvN8hPc9t+F0GT3do=
cloud.google.com/go/bigtable v1.5.0/go.mod h1:713PsD2nkJwTioSe6vF/sFCAcjhINJ62cEtKCr8u+F8=
+cloud.google.com/go/bigtable v1.6.0 h1:hcHWHVX8sfXW4qgfB0fYVd3i22Od2TK6gxoN7EWsbwY=
+cloud.google.com/go/bigtable v1.6.0/go.mod h1:tqUJmGg13x13j3xXf6oUXsB7ZEI1mxd5wGMvLStr8y0=
cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/datastore v1.2.0 h1:906wMszEeOl3+WoaxXeoBpZbSWmZ/q2xRHMIVLBLCJc=
cloud.google.com/go/datastore v1.2.0/go.mod h1:FKd9dFEjRui5757lkOJ7z/eKtL74o5hsbY0o6Z0ozz8=
+cloud.google.com/go/datastore v1.3.0 h1:+T3aKNlZd+MABChjtgQqz5kVysNrFubz5HmljVQG4Zg=
+cloud.google.com/go/datastore v1.3.0/go.mod h1:HMXIAklx0N49XfVDSw1orj80NgkzaLRO9MW/uEIzoD0=
cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
cloud.google.com/go/firestore v1.2.0 h1:zrl+2VJAYC/C6WzEPnkqZIBeHyHFs/UmtzJdXU4Bvmo=
cloud.google.com/go/firestore v1.2.0/go.mod h1:iISCjWnTpnoJT1R287xRdjvQHJrxQOpeah4phb5D3h0=
@@ -67,6 +78,8 @@
cloud.google.com/go/firestore v1.3.0/go.mod h1:Qt0gS9Qz9tROrmgFavo36+hdST1FXvmtnGnO0Dr03pU=
cloud.google.com/go/logging v1.0.0 h1:kaunpnoEh9L4hu6JUsBa8Y20LBfKnCuDhKUgdZp7oK8=
cloud.google.com/go/logging v1.0.0/go.mod h1:V1cc3ogwobYzQq5f2R7DS/GvRIrI4FKj01Gs5glwAls=
+cloud.google.com/go/logging v1.1.1 h1:mU+6wZyP0llWyobJ+aJFqeEfDzMp95R449wEPPILVX0=
+cloud.google.com/go/logging v1.1.1/go.mod h1:oShOorPr2XGlPEXXI9VUJQH10md4lW25RYpSJjhE0TM=
cloud.google.com/go/pubsub v1.0.1 h1:W9tAK3E57P75u0XLLR82LZyw8VpAnhmyTOxW9qzmyj8=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0 h1:9/vpR43S4aJaROxqQHQ3nH9lfyKKV0dC3vOmnw8ebQQ=
@@ -81,8 +94,11 @@
cloud.google.com/go/pubsub v1.6.0/go.mod h1:I6DkrTv7tKIvDQTZt+6rAFo1446FEoVDJeLXTu4pCcE=
cloud.google.com/go/pubsub v1.6.1 h1:lhCQrTgu7f5SjWm5yJO0geSsPORQ2OAD+Eq1AMyBW8Y=
cloud.google.com/go/pubsub v1.6.1/go.mod h1:kvW9rcn9OLEx6eTIzMBbWbpB8YsK3vu9jxgPolVz+p4=
+cloud.google.com/go/pubsub v1.8.2 h1:PpS9dq+D7eSjQ0YAx5fxO33LjqHVpAlXFrpvt/LoVy8=
+cloud.google.com/go/pubsub v1.8.2/go.mod h1:tQ1zYqOrDLXxRyNeL/CQW58NaVOTnPPDYFxmJQ1k3QI=
cloud.google.com/go/spanner v1.2.0/go.mod h1:LfwGAsK42Yz8IeLsd/oagGFBqTXt3xVWtm8/KD2vrEI=
cloud.google.com/go/spanner v1.8.0/go.mod h1:mdAPDiFUbE9vCmhHHlxyDUtaPPsIK+pUdf5KmHaUfT8=
+cloud.google.com/go/spanner v1.9.0/go.mod h1:xvlEn0NZ5v1iJPYsBnUVRDNvccDxsBTEi16pJRKQVws=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0 h1:RPUcBvDeYgQFMfQu1eBMq6piD1SXmLH+vK3qjewZPus=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
@@ -96,18 +112,26 @@
cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU=
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=
+cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4=
+cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho=
contrib.go.opencensus.io/exporter/stackdriver v0.13.1 h1:RX9W6FelAqTVnBi/bRXJLXr9n18v4QkQwZYIdnNS51I=
contrib.go.opencensus.io/exporter/stackdriver v0.13.1/go.mod h1:z2tyTZtPmQ2HvWH4cOmVDgtY+1lomfKdbLnkJvZdc8c=
contrib.go.opencensus.io/exporter/stackdriver v0.13.2 h1:5lKLBwUuq4S6pTbYaBtWmnay3eJfKNS3qL8M8HM5fM4=
contrib.go.opencensus.io/exporter/stackdriver v0.13.2/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
+contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc=
+contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
@@ -122,6 +146,9 @@
github.com/Jeffail/gabs/v2 v2.5.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
github.com/Jeffail/gabs/v2 v2.5.1 h1:ANfZYjpMlfTTKebycu4X1AgkVWumFVDYQl7JwOr4mDk=
github.com/Jeffail/gabs/v2 v2.5.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
+github.com/Jeffail/gabs/v2 v2.6.0 h1:WdCnGaDhNa4LSRTMwhLZzJ7SRDXjABNP13SOKvCpL5w=
+github.com/Jeffail/gabs/v2 v2.6.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
github.com/Kount/pq-timeouts v1.0.0 h1:6a23dhwmQ2PukftCWm56T4RPJ4zc2iE9y5E42TMAl6E=
github.com/Kount/pq-timeouts v1.0.0/go.mod h1:Y7rNVWI9KiI3xj1QxBmOSB12Eyv9g5Gjego8KFpV5PY=
github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg=
@@ -139,14 +166,18 @@
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/PuerkitoBio/goquery v1.6.0 h1:j7taAbelrdcsOlGeMenZxc2AWXD5fieT1/znArdnx94=
+github.com/PuerkitoBio/goquery v1.6.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
github.com/a8m/envsubst v1.1.0 h1:d+14SVq1lbI+JuxhEqYduWofZ0/qQHatwm3TBzvdzaE=
github.com/a8m/envsubst v1.1.0/go.mod h1:91m2Q6AZE0w4WD/laQam2MtWq6FxJVm7UqcB30DeYxw=
github.com/a8m/envsubst v1.2.0 h1:yvzAhJD2QKdo35Ut03wIfXQmg+ta3wC/1bskfZynz+Q=
github.com/a8m/envsubst v1.2.0/go.mod h1:PpvLvNWa+Rvu/10qXmFbFiGICIU5hZvFJNPCCkUaObg=
+github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
@@ -167,14 +198,18 @@
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/arrow/go/arrow v0.0.0-20200601151325-b2287a20f230/go.mod h1:QNYViu/X0HXDHw7m3KXzWSVXIbfUvJqBFe6Gj8/pYA0=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
+github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
+github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.29.11/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
github.com/aws/aws-sdk-go v1.30.11 h1:bJoa1QGyyAV4COx1SXpf+LElFVVnOreG6KM0jIxwZq0=
github.com/aws/aws-sdk-go v1.30.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
@@ -226,6 +261,9 @@
github.com/aws/aws-sdk-go v1.33.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.34.0 h1:brux2dRrlwCF5JhTL7MUT3WUwo9zfDHZZp3+g3Mvlmo=
github.com/aws/aws-sdk-go v1.34.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.35.17 h1:zhahppAMdPvJ9GP302SMOPW5SNoAbnjdOyaTmxA9WJU=
+github.com/aws/aws-sdk-go v1.35.17/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
+github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/bazelbuild/bazel-gazelle v0.21.1/go.mod h1:xM5AuwJJYa2OUDBT+YqrZrcD8DW//aauZ+U424Wadlo=
github.com/bazelbuild/buildtools v0.0.0-20190731111112-f720930ceb60/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
@@ -243,8 +281,10 @@
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk=
@@ -256,6 +296,7 @@
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -263,20 +304,29 @@
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051 h1:eApuUG8W2EtBVwxqLlY2wgoqDYOg3WvIHGvW4fUbbow=
github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
+github.com/cockroachdb/cockroach-go v2.0.1+incompatible h1:rkk9T7FViadPOz28xQ68o18jBSpyShru0mayVumxqYA=
+github.com/cockroachdb/cockroach-go v2.0.1+incompatible/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY=
github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
github.com/containerd/containerd v1.3.3 h1:LoIzb5y9x5l8VKAlyrbusNPXqBY0+kviRloxFUMFwKc=
github.com/containerd/containerd v1.3.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/containerd/containerd v1.4.1 h1:pASeJT3R3YyVn+94qEPk0SnU1OQ20Jd/T+SPKy9xehY=
+github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -287,6 +337,8 @@
github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8=
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 h1:X6mKGhCFOxrKeeHAjv/3UvT6e5RRxW6wRdlqlV6/H4w=
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37/go.mod h1:DC3JtzuG7kxMvJ6dZmf2ymjNyoXwgtklr7FN+Um2B0U=
+github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0 h1:IKVDBWlOZykX5WFI5DyYjX8oL+6+YuovdUvOf+1WHNQ=
+github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0/go.mod h1:DC3JtzuG7kxMvJ6dZmf2ymjNyoXwgtklr7FN+Um2B0U=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -301,6 +353,7 @@
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v1.4.2-0.20200213202729-31a86c4ab209 h1:tmV+YbYOUAYDmAiamzhRKqQXaAUyUY2xVt27Rv7rCzA=
github.com/docker/docker v1.4.2-0.20200213202729-31a86c4ab209/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -308,22 +361,27 @@
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
+github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fiorix/go-web v1.0.1-0.20150221144011-5b593f1e8966 h1:P/Czr+qFBdKELw4nys0x2e5nkT9niVq/2FS63ArJzm4=
github.com/fiorix/go-web v1.0.1-0.20150221144011-5b593f1e8966/go.mod h1:5OPf/2cFhfql2NdV8pCcv9fZJ0e0LC//L+72iX1cqDM=
@@ -333,6 +391,8 @@
github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633/go.mod h1:NJDK3/o7abx6PP54EOe0G0n0RLmhCo9xv61gUYpI0EY=
github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
+github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
+github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
@@ -347,9 +407,15 @@
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
+github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE=
+github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
@@ -367,11 +433,14 @@
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/golang-migrate/migrate v1.3.2 h1:QAlFV1QF9zdkzy/jujlBVkVu+L/+k18cg8tuY1/4JDY=
+github.com/golang-migrate/migrate v3.5.4+incompatible h1:R7OzwvCJTCgwapPCiX6DyBiu2czIUMDCB118gFTKTUA=
github.com/golang-migrate/migrate/v4 v4.10.0 h1:76R6UL3BGnDTpYeittMtfpaNvGBH5zMZatO/fCzIjWo=
github.com/golang-migrate/migrate/v4 v4.10.0/go.mod h1:Llx0NRzBKs/zbR/Pc0huEpJA2195sJVkGU5dCyjQ678=
github.com/golang-migrate/migrate/v4 v4.11.0 h1:uqtd0ysK5WyBQ/T1K2uDIooJV0o2Obt6uPwP062DupQ=
@@ -380,6 +449,8 @@
github.com/golang-migrate/migrate/v4 v4.12.1/go.mod h1:DhVtFaXkCVqQdd7RkBGlADeK1osPD0R4+nSVsLjSk+Y=
github.com/golang-migrate/migrate/v4 v4.12.2 h1:QI43Tlouiwpp2dK5Y767OouX0snJNRP/NubsVaArzDU=
github.com/golang-migrate/migrate/v4 v4.12.2/go.mod h1:HQ1DaC8uLHkg4afY8ZQ8D/P5SG+YW9X5INZBVvm+d2k=
+github.com/golang-migrate/migrate/v4 v4.13.0 h1:5S7HMjiq9u50X3+WXpzXPbUj1qUFuZRm8NCsX989Tn4=
+github.com/golang-migrate/migrate/v4 v4.13.0/go.mod h1:RUEXGkgYXTOdBY9Rbs9izc/SOalUK+dDi7YphFV/CUI=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -426,11 +497,15 @@
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
+github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCydnIczKteheJEzHRToSGK3Bnlw=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
@@ -450,6 +525,8 @@
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-github/v29 v29.0.3 h1:IktKCTwU//aFHnpA+2SLIi7Oo9uhAzgsdZNbcAqhgdc=
@@ -478,6 +555,8 @@
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
@@ -486,9 +565,14 @@
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201009210932-67992a1a5a35/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
@@ -498,12 +582,18 @@
github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
github.com/googleapis/gnostic v0.4.0 h1:BXDUo8p/DaxC+4FJY/SSx3gvnx9C1VdHNgaUkiEL5mk=
github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
+github.com/googleapis/gnostic v0.4.2 h1:uh5EXM/5/ki6d0p/FoUxuiN8KHpo1w572UXQdB2MnTg=
+github.com/googleapis/gnostic v0.4.2/go.mod h1:P0d+GwDcJO8XvMi7aihGGl/CkivFa9JX/V/FfjyYzI0=
+github.com/googleapis/gnostic v0.5.3 h1:2qsuRm+bzgwSIKikigPASa2GhW8H2Dn4Qq7UxD8K/48=
+github.com/googleapis/gnostic v0.5.3/go.mod h1:TRWw1s4gxBGjSe301Dai3c7wXJAZy57+/6tawkOvqHQ=
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f h1:TyqzGm2z1h3AGhjOoRYyeLcW4WlW81MDQkWa+rx/000=
github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
+github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gopherjs/gopherwasm v1.0.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/csrf v1.6.2 h1:QqQ/OWwuFp4jMKgBFAzJVW3FMULdyUW7JoM4pEWuqKg=
@@ -515,21 +605,30 @@
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026 h1:BpJ2o0OR5FV7vrkDYfXYVJQeMNWa8RhklZOpW2ITAIQ=
github.com/hako/durafmt v0.0.0-20200710122514-c0fb7b4da026/go.mod h1:5Scbynm8dF1XAPwIwkGPqzkM/shndPm79Jd1003hTjE=
github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
@@ -542,6 +641,7 @@
github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
@@ -560,14 +660,19 @@
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@@ -585,6 +690,8 @@
github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
github.com/jackc/pgconn v1.6.4 h1:S7T6cx5o2OqmxdHaXLH1ZeD1SbI8jBznyYE9Ec0RCQ8=
github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78=
+github.com/jackc/pgconn v1.7.0 h1:pwjzcYyfmz/HQOQlENvG1OcDqauTGaqlVahq934F0/U=
+github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA=
github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=
@@ -603,6 +710,8 @@
github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
github.com/jackc/pgproto3/v2 v2.0.4 h1:RHkX5ZUD9bl/kn0f9dYUWs1N7Nwvo1wwUYvKiR26Zco=
github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM=
+github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
@@ -615,6 +724,8 @@
github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
github.com/jackc/pgtype v1.4.2 h1:t+6LWm5eWPLX1H5Se702JSBcirq6uWa4jiG4wV1rAWY=
github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgtype v1.5.0 h1:jzBqRk2HFG2CV4AIwgCI2PwTgm6UUoCAK2ofHHRirtc=
+github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
github.com/jackc/pgx v3.6.2+incompatible h1:2zP5OD7kiyR3xzRYMhOcXVvkDZsImVXfj+yIyTQf3/o=
github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
@@ -626,11 +737,15 @@
github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
github.com/jackc/pgx/v4 v4.8.1 h1:SUbCLP2pXvf/Sr/25KsuI4aTxiFYIvpfk4l6aTSdyCw=
github.com/jackc/pgx/v4 v4.8.1/go.mod h1:4HOLxrl8wToZJReD04/yB20GDwf4KBYETvlHciCnwW0=
+github.com/jackc/pgx/v4 v4.9.0 h1:6STjDqppM2ROy5p1wNDcsC7zJTjSHeuCsguZmXyzx7c=
+github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms=
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.1 h1:PJAw7H/9hoWC4Kf3J8iNmL1SwA6E8vfsLqBiL+F6CtI=
github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.2 h1:mpQEXihFnWGDy6X98EOTh81JYuxn7txby8ilJ3iIPGM=
+github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jcgregorio/logger v0.1.2 h1:kHiF857oOObzlUer5ANZ95U08A7k2INjivnss4IyMCg=
@@ -643,12 +758,17 @@
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.8 h1:QiWkFLKq0T7mpzwOTu6BzNDbfTE8OLrYhVKYMLF46Ok=
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
@@ -671,9 +791,12 @@
github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ=
+github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -693,15 +816,26 @@
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
+github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
+github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
+github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f h1:Kkxfmkf53vnIADWIhzvJ0GvwVR/gz9U7F7Wqofqd7dU=
+github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f/go.mod h1:OjKOY0UvVOOH5nWXSIWTbQWESn8dDiGlaEZx6IAsWhU=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY=
+github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
github.com/mailru/easyjson v0.7.2 h1:V9ecaZWDYm7v9uJ15RZD6DajMu5sE0hdep0aoDwT9g4=
github.com/mailru/easyjson v0.7.2/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
github.com/maruel/subcommands v0.0.0-20200206125935-de1d40e70d4b h1:PlujZ2Y2Lq0VCaDu7SshaGpfm0iv4cML2AGUyS5By9I=
github.com/maruel/subcommands v0.0.0-20200206125935-de1d40e70d4b/go.mod h1:4cd1CVd4c9phb1z9fTkV+JbmnFm394Hp9rHEAOvD+vs=
@@ -712,11 +846,13 @@
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4=
github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
@@ -762,9 +898,18 @@
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mutecomm/go-sqlcipher/v4 v4.4.0/go.mod h1:PyN04SaWalavxRGH9E8ZftG6Ju7rsPrGmQRjrEaVpiY=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA=
+github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/neo4j-drivers/gobolt v1.7.4/go.mod h1:O9AUbip4Dgre+CD3p40dnMD4a4r52QBIfblg5k7CTbE=
github.com/neo4j/neo4j-go-driver v1.7.4/go.mod h1:aPO0vVr+WnhEJne+FgFjfsjzAnssPFLucHgGZ76Zb/U=
github.com/neo4j/neo4j-go-driver v1.8.0/go.mod h1:0A49wIv0oP3uQdnbceK7Kc+snlY5B0F6dmtYArM0ltk=
@@ -775,7 +920,14 @@
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 h1:E2B8qYyeSgv5MXpmzZXRNp8IAQ4vjxIjhpAf5hv/tAg=
github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.5 h1:obHEce3upls1IBn1gTw/o7bCv7OJb6Ib/o7wNO+4eKw=
+github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/olivere/elastic/v7 v7.0.12/go.mod h1:14rWX28Pnh3qCKYRVnSGXWLf9MbLonYS/4FDCY3LAPo=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -785,6 +937,9 @@
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
+github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -793,6 +948,9 @@
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg=
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
+github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
@@ -801,8 +959,14 @@
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
+github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
+github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
+github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
+github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc=
github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
github.com/otiai10/copy v1.1.1 h1:PH7IFlRQ6Fv9vYmuXbDRLdgTHoP1w483kPNUP2bskpo=
@@ -817,9 +981,11 @@
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
+github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -827,11 +993,15 @@
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
+github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
+github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
+github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/peterh/liner v1.1.0 h1:f+aAedNJA6uk7+6rXsYBnhdo4Xux7ESLe+kcuVUF5os=
github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg=
github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
+github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
@@ -840,6 +1010,7 @@
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -849,18 +1020,22 @@
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA=
github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=
github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw=
+github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
@@ -868,10 +1043,13 @@
github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4=
+github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
@@ -885,11 +1063,15 @@
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
+github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff h1:+6NUiITWwE5q1KO6SAfUX918c+Tab0+tGAM/mtdlUyA=
github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
+github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac h1:kYPjbEN6YPYWWHI6ky1J813KzIq/8+Wg4TO4xU7A/KU=
+github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
@@ -903,6 +1085,7 @@
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/s19-tech/protoc-gen-twirp_typescript v0.0.0-20191017103916-3ccab48e3ce6 h1:+B3eOysxkQ998A+rIxNsrXyx0s5XK+buVSs1JaYYqx8=
github.com/s19-tech/protoc-gen-twirp_typescript v0.0.0-20191017103916-3ccab48e3ce6/go.mod h1:51F13nJvsTFin0RTIOZL4z8RxGitAz4ww1TD21okMZs=
+github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
@@ -922,6 +1105,9 @@
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4 h1:KPlmEyLo5r9hnWZq8O0B0Rj4AcRv/tJMqEgS6p0JMeQ=
github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4/go.mod h1:TUH3112UTh2tzE4XSwBwt7bCKnQbI7TPpAd0cbQ9RzY=
github.com/skia-dev/go2ts v1.1.0 h1:jcd0AIOe7PxizwPsInBQA8X3cgLm4tGint/LMIKb1DE=
@@ -947,6 +1133,8 @@
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
@@ -954,6 +1142,7 @@
github.com/snowflakedb/glog v0.0.0-20180824191149-f5055e6f21ce/go.mod h1:EB/w24pR5VKI60ecFnKqXzxX3dOorz1rnVicQTQrGM0=
github.com/snowflakedb/gosnowflake v1.3.5/go.mod h1:13Ky+lxzIm3VqNDZJdyvu9MCGy+WgRdYFdXp96UcLZU=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
@@ -966,19 +1155,25 @@
github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=
github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
+github.com/spf13/afero v1.4.1 h1:asw9sl74539yqavKaglDM5hFpdJVK0Y5Dr/JOgQ89nQ=
+github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
+github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
+github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -994,6 +1189,10 @@
github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
+github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -1022,16 +1221,21 @@
github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U=
github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8=
github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/twitchtv/twirp v5.5.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
github.com/twitchtv/twirp v5.12.1+incompatible h1:UnrJ4Z8llkdjnQbLqJBWRBwaDGojBsU5lft3DrD/SvY=
github.com/twitchtv/twirp v5.12.1+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
+github.com/twitchtv/twirp v7.1.0+incompatible h1:3fNSDoSPyq+fTrifIvGue9XM/tptzuhiGY83rxPVNUg=
+github.com/twitchtv/twirp v7.1.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/unrolled/secure v1.0.7 h1:BcQHp3iKZyZCKj5gRqwQG+5urnGBF00wGgoPPwtheVQ=
github.com/unrolled/secure v1.0.7/go.mod h1:uGc1OcRF8gCVBA+ANksKmvM85Hka6SZtQIbrKc3sHS4=
github.com/unrolled/secure v1.0.8 h1:JaMvKbe4CRt8oyxVXn+xY+6jlqd7pyJNSVkmsBxxQsM=
github.com/unrolled/secure v1.0.8/go.mod h1:fO+mEan+FLB0CdEnHf6Q4ZZVNqG+5fuLFnP8p0BXDPI=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -1042,6 +1246,8 @@
github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ=
github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
+github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
+github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
@@ -1054,6 +1260,7 @@
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.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/zeebo/bencode v1.0.0 h1:zgop0Wu1nu4IexAZeCZ5qbsjU4O1vMrfCrVgUjbHVuA=
github.com/zeebo/bencode v1.0.0/go.mod h1:Ct7CkrWIQuLWAy9M3atFHYq4kG9Ao/SsY5cdtCXmp9Y=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
@@ -1120,11 +1327,16 @@
go.chromium.org/luci v0.0.0-20200807043940-4c427b3ff5d0/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
go.chromium.org/luci v0.0.0-20200810035958-a85648a14281 h1:i1oPNptavXrHcRzS0TkdlqUc7M0QsbySNT7olSHH0MM=
go.chromium.org/luci v0.0.0-20200810035958-a85648a14281/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
+go.chromium.org/luci v0.0.0-20201029061824-984e7bda0424 h1:yJtKfryXhQRjyAADc+1kW4/f5yYb2E61RD3CnpCenro=
+go.chromium.org/luci v0.0.0-20201029061824-984e7bda0424/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20200623200853-f5da1af25b54 h1:lCIdXBeomPpIFUOoUvW9Ofded16dqv1i+qvCJoZex9o=
go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20200623200853-f5da1af25b54/go.mod h1:51F13nJvsTFin0RTIOZL4z8RxGitAz4ww1TD21okMZs=
go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
@@ -1137,14 +1349,19 @@
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1162,6 +1379,7 @@
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo=
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
@@ -1183,6 +1401,8 @@
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/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-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1238,6 +1458,7 @@
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190225153610-fe579d43d832/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 h1:KaQtG+aDELoNmXYas3TVkGNYRuq8JQ1aa7LJt8EXVyo=
@@ -1281,6 +1502,7 @@
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/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-20200528225125-3c3fba18258b h1:IYiJPiJfzktmDAO1HQiwjMjwjlYKHAL7KzeD544RJPs=
golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
@@ -1290,6 +1512,14 @@
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201029055024-942e2f445f3c h1:rpcgRPA7OvNEOdprt2Wx8/Re2cBTd8NPo/lvo3AyMqk=
+golang.org/x/net v0.0.0-20201029055024-942e2f445f3c/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1298,6 +1528,8 @@
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
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=
@@ -1310,6 +1542,9 @@
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1338,12 +1573,15 @@
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1 h1:gZpLHxUX5BdYLA08Lj4YCJNN/jk7KtquiArPoeX0WvA=
@@ -1383,11 +1621,13 @@
golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0=
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 h1:X9xIZ1YU8bLZA3l6gqDUHSFiD0GFI9S548h6C8nDtOY=
@@ -1401,6 +1641,13 @@
golang.org/x/sys v0.0.0-20200806125547-5acd03effb82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9 h1:yi1hN8dcqI9l8klZfy4B8mJvFmmAxJEePIQQFNSd7Cs=
golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 h1:HlFl4V6pEMziuLXyRkm5BIYq1y1GAbb02pRlWvI54OM=
+golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1409,6 +1656,9 @@
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
@@ -1460,6 +1710,7 @@
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/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-20200128002243-345141a36859/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
@@ -1482,6 +1733,7 @@
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4 h1:kDtqNkeBrZb8B+atrj50B5XLHpzXXqcCdZPP/ApQ5NY=
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e h1:3Dzrrxi54Io7Aoyb0PYLsI47K2TxkRQg+cqUn+m04do=
golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -1554,6 +1806,21 @@
golang.org/x/tools v0.0.0-20200806234136-990129eca547/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
golang.org/x/tools v0.0.0-20200809012840-6f4f008689da h1:ml5G98G4/tdKT1XNq+ky5iSRdKKux0TANlLAzmXT/hg=
golang.org/x/tools v0.0.0-20200809012840-6f4f008689da/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20200910222312-571a207697e7 h1:SJWJaZU+0cpPpc8YPrjwTiNrjlqgNl09cAFXuSijD2k=
+golang.org/x/tools v0.0.0-20200910222312-571a207697e7/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20200916150407-587cf2330ce8/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201017001424-6003fad69a88/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201021122455-2be66b663cb6/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201029135353-690a3c245f28 h1:KmEPH4S/AVTMSlbgNWC4xKvfsqvw/dNDUo/bGDqbDdo=
+golang.org/x/tools v0.0.0-20201029135353-690a3c245f28/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1602,7 +1869,14 @@
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
google.golang.org/api v0.30.0 h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w=
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.31.0 h1:1w5Sz/puhxFo9lTtip2n47k7toB/U2nCqOKNHd3Yrbo=
+google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo=
+google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.33.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.34.0 h1:k40adF3uR+6x/+hO5Dh4ZFUqFp67vxvbpafFiJxl10A=
+google.golang.org/api v0.34.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1615,6 +1889,8 @@
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
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-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -1622,6 +1898,7 @@
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb h1:i1Ppqkc3WQXikh8bXiwHqAN5Rv3/qDCcRk0/Otx73BY=
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-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532 h1:5pOB7se0B2+IssELuQUs6uoBgYJenkU2AQlvopc2sRw=
google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 h1:Ygq9/SRJX9+dU0WCIICM8RkWvDw03lvB77hrhJnpxfU=
@@ -1711,13 +1988,27 @@
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200808173500-a06252235341 h1:Kceb+1TNS2X7Cj/A+IUTljNerF/4wOFjlFJ0RGHYKKE=
google.golang.org/genproto v0.0.0-20200808173500-a06252235341/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200916143405-f6a2fa72f0c4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201021134325-0d71844de594/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201028140639-c77dae4b0522 h1:7RoRaOmOAXwqnurgQ5g5/d0yCi9ha2UxuTZULXudK7A=
+google.golang.org/genproto v0.0.0-20201028140639-c77dae4b0522/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -1739,6 +2030,10 @@
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI=
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1 h1:DGeFlSan2f+WEtCERJ4J9GJWk15TxUi8QGagfI87Xyc=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1763,9 +2058,13 @@
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
@@ -1777,6 +2076,8 @@
gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/olivere/elastic.v5 v5.0.85 h1:GwBqEsvRIHVfCQVXDHYi9LHec2yEkc3GNKh9WB8G/es=
gopkg.in/olivere/elastic.v5 v5.0.85/go.mod h1:M3WNlsF+WhYn7api4D87NIflwTV/c0iVs8cqfWhK+68=
gopkg.in/olivere/elastic.v5 v5.0.86 h1:xFy6qRCGAmo5Wjx96srho9BitLhZl2fcnpuidPwduXM=
@@ -1836,6 +2137,8 @@
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k=
honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc=
+honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY=
k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
k8s.io/api v0.18.3 h1:2AJaUQdgUZLoDZHrun21PW2Nx9+ll6cUzvn3IKhSIn0=
@@ -1844,6 +2147,8 @@
k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk=
k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE=
k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
+k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU=
+k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs=
k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA=
k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
k8s.io/apimachinery v0.18.3 h1:pOGcbVAhxADgUYnjS08EFXs9QMl8qaH5U4fr5LGUrSk=
@@ -1852,6 +2157,8 @@
k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag=
k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
+k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc=
+k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/client-go v0.18.2 h1:aLB0iaD4nmwh7arT2wIn+lMnAq7OswjaejkQ8p9bBYE=
k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
k8s.io/client-go v0.18.3 h1:QaJzz92tsN67oorwzmoB0a9r9ZVHuD5ryjbCKP0U22k=
@@ -1860,18 +2167,34 @@
k8s.io/client-go v0.18.5/go.mod h1:EsiD+7Fx+bRckKWZXnAXRKKetm1WuzPagH4iOSC8x58=
k8s.io/client-go v0.18.6 h1:I+oWqJbibLSGsZj8Xs8F0aWVXJVIoUHWaaJV3kUN/Zw=
k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
+k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg=
+k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM=
+k8s.io/client-go v0.20.0-beta.0 h1:1ih3f0pNUgLVu+gugXjwc99FNK8119Jk5W8bXuD2rIY=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
+k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
+k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
+k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco=
+k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM=
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY=
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
+k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=
+k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
+k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=
+k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20201027101359-01387209bb0d h1:1qqs/6lQQGCeZhCu0tO7La4lAazDXic6BiCmpjWcWUo=
+k8s.io/utils v0.0.0-20201027101359-01387209bb0d/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
modernc.org/b v1.0.0/go.mod h1:uZWcZfRj1BpYzfN9JTerzlNUnnPsV9O2ZA8JsRcubNg=
modernc.org/db v1.0.0/go.mod h1:kYD/cO29L/29RM0hXYl4i3+Q5VojL31kTUVpVJDw0s8=
modernc.org/file v1.0.0/go.mod h1:uqEokAEn1u6e+J45e54dsEA/pw4o7zLrA2GwyntZzjw=
@@ -1895,7 +2218,10 @@
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
+sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=
+sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
diff --git a/go/cipd/mocks/CIPDClient.go b/go/cipd/mocks/CIPDClient.go
index 07ece5c..3a21fac 100644
--- a/go/cipd/mocks/CIPDClient.go
+++ b/go/cipd/mocks/CIPDClient.go
@@ -3,15 +3,15 @@
package mocks
import (
- clientcipd "go.chromium.org/luci/cipd/client/cipd"
- cipd "go.skia.org/infra/go/cipd"
-
+ cipd "go.chromium.org/luci/cipd/client/cipd"
common "go.chromium.org/luci/cipd/common"
context "context"
deployer "go.chromium.org/luci/cipd/client/cipd/deployer"
+ gocipd "go.skia.org/infra/go/cipd"
+
io "io"
mock "github.com/stretchr/testify/mock"
@@ -26,6 +26,20 @@
mock.Mock
}
+// AttachMetadataWhenReady provides a mock function with given fields: ctx, pin, md
+func (_m *CIPDClient) AttachMetadataWhenReady(ctx context.Context, pin common.Pin, md []cipd.Metadata) error {
+ ret := _m.Called(ctx, pin, md)
+
+ var r0 error
+ if rf, ok := ret.Get(0).(func(context.Context, common.Pin, []cipd.Metadata) error); ok {
+ r0 = rf(ctx, pin, md)
+ } else {
+ r0 = ret.Error(0)
+ }
+
+ return r0
+}
+
// AttachTagsWhenReady provides a mock function with given fields: ctx, pin, tags
func (_m *CIPDClient) AttachTagsWhenReady(ctx context.Context, pin common.Pin, tags []string) error {
ret := _m.Called(ctx, pin, tags)
@@ -46,15 +60,15 @@
}
// CheckDeployment provides a mock function with given fields: ctx, paranoia
-func (_m *CIPDClient) CheckDeployment(ctx context.Context, paranoia deployer.ParanoidMode) (clientcipd.ActionMap, error) {
+func (_m *CIPDClient) CheckDeployment(ctx context.Context, paranoia deployer.ParanoidMode) (cipd.ActionMap, error) {
ret := _m.Called(ctx, paranoia)
- var r0 clientcipd.ActionMap
- if rf, ok := ret.Get(0).(func(context.Context, deployer.ParanoidMode) clientcipd.ActionMap); ok {
+ var r0 cipd.ActionMap
+ if rf, ok := ret.Get(0).(func(context.Context, deployer.ParanoidMode) cipd.ActionMap); ok {
r0 = rf(ctx, paranoia)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(clientcipd.ActionMap)
+ r0 = ret.Get(0).(cipd.ActionMap)
}
}
@@ -69,15 +83,15 @@
}
// Describe provides a mock function with given fields: ctx, _a1, instance
-func (_m *CIPDClient) Describe(ctx context.Context, _a1 string, instance string) (*clientcipd.InstanceDescription, error) {
+func (_m *CIPDClient) Describe(ctx context.Context, _a1 string, instance string) (*cipd.InstanceDescription, error) {
ret := _m.Called(ctx, _a1, instance)
- var r0 *clientcipd.InstanceDescription
- if rf, ok := ret.Get(0).(func(context.Context, string, string) *clientcipd.InstanceDescription); ok {
+ var r0 *cipd.InstanceDescription
+ if rf, ok := ret.Get(0).(func(context.Context, string, string) *cipd.InstanceDescription); ok {
r0 = rf(ctx, _a1, instance)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(*clientcipd.InstanceDescription)
+ r0 = ret.Get(0).(*cipd.InstanceDescription)
}
}
@@ -92,15 +106,15 @@
}
// DescribeClient provides a mock function with given fields: ctx, pin
-func (_m *CIPDClient) DescribeClient(ctx context.Context, pin common.Pin) (*clientcipd.ClientDescription, error) {
+func (_m *CIPDClient) DescribeClient(ctx context.Context, pin common.Pin) (*cipd.ClientDescription, error) {
ret := _m.Called(ctx, pin)
- var r0 *clientcipd.ClientDescription
- if rf, ok := ret.Get(0).(func(context.Context, common.Pin) *clientcipd.ClientDescription); ok {
+ var r0 *cipd.ClientDescription
+ if rf, ok := ret.Get(0).(func(context.Context, common.Pin) *cipd.ClientDescription); ok {
r0 = rf(ctx, pin)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(*clientcipd.ClientDescription)
+ r0 = ret.Get(0).(*cipd.ClientDescription)
}
}
@@ -115,20 +129,20 @@
}
// DescribeInstance provides a mock function with given fields: ctx, pin, opts
-func (_m *CIPDClient) DescribeInstance(ctx context.Context, pin common.Pin, opts *clientcipd.DescribeInstanceOpts) (*clientcipd.InstanceDescription, error) {
+func (_m *CIPDClient) DescribeInstance(ctx context.Context, pin common.Pin, opts *cipd.DescribeInstanceOpts) (*cipd.InstanceDescription, error) {
ret := _m.Called(ctx, pin, opts)
- var r0 *clientcipd.InstanceDescription
- if rf, ok := ret.Get(0).(func(context.Context, common.Pin, *clientcipd.DescribeInstanceOpts) *clientcipd.InstanceDescription); ok {
+ var r0 *cipd.InstanceDescription
+ if rf, ok := ret.Get(0).(func(context.Context, common.Pin, *cipd.DescribeInstanceOpts) *cipd.InstanceDescription); ok {
r0 = rf(ctx, pin, opts)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(*clientcipd.InstanceDescription)
+ r0 = ret.Get(0).(*cipd.InstanceDescription)
}
}
var r1 error
- if rf, ok := ret.Get(1).(func(context.Context, common.Pin, *clientcipd.DescribeInstanceOpts) error); ok {
+ if rf, ok := ret.Get(1).(func(context.Context, common.Pin, *cipd.DescribeInstanceOpts) error); ok {
r1 = rf(ctx, pin, opts)
} else {
r1 = ret.Error(1)
@@ -143,7 +157,7 @@
}
// Ensure provides a mock function with given fields: ctx, packages
-func (_m *CIPDClient) Ensure(ctx context.Context, packages ...*cipd.Package) error {
+func (_m *CIPDClient) Ensure(ctx context.Context, packages ...*gocipd.Package) error {
_va := make([]interface{}, len(packages))
for _i := range packages {
_va[_i] = packages[_i]
@@ -154,7 +168,7 @@
ret := _m.Called(_ca...)
var r0 error
- if rf, ok := ret.Get(0).(func(context.Context, ...*cipd.Package) error); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, ...*gocipd.Package) error); ok {
r0 = rf(ctx, packages...)
} else {
r0 = ret.Error(0)
@@ -164,15 +178,15 @@
}
// EnsurePackages provides a mock function with given fields: ctx, pkgs, paranoia, maxThreads, dryRun
-func (_m *CIPDClient) EnsurePackages(ctx context.Context, pkgs common.PinSliceBySubdir, paranoia deployer.ParanoidMode, maxThreads int, dryRun bool) (clientcipd.ActionMap, error) {
+func (_m *CIPDClient) EnsurePackages(ctx context.Context, pkgs common.PinSliceBySubdir, paranoia deployer.ParanoidMode, maxThreads int, dryRun bool) (cipd.ActionMap, error) {
ret := _m.Called(ctx, pkgs, paranoia, maxThreads, dryRun)
- var r0 clientcipd.ActionMap
- if rf, ok := ret.Get(0).(func(context.Context, common.PinSliceBySubdir, deployer.ParanoidMode, int, bool) clientcipd.ActionMap); ok {
+ var r0 cipd.ActionMap
+ if rf, ok := ret.Get(0).(func(context.Context, common.PinSliceBySubdir, deployer.ParanoidMode, int, bool) cipd.ActionMap); ok {
r0 = rf(ctx, pkgs, paranoia, maxThreads, dryRun)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(clientcipd.ActionMap)
+ r0 = ret.Get(0).(cipd.ActionMap)
}
}
@@ -187,15 +201,15 @@
}
// FetchACL provides a mock function with given fields: ctx, prefix
-func (_m *CIPDClient) FetchACL(ctx context.Context, prefix string) ([]clientcipd.PackageACL, error) {
+func (_m *CIPDClient) FetchACL(ctx context.Context, prefix string) ([]cipd.PackageACL, error) {
ret := _m.Called(ctx, prefix)
- var r0 []clientcipd.PackageACL
- if rf, ok := ret.Get(0).(func(context.Context, string) []clientcipd.PackageACL); ok {
+ var r0 []cipd.PackageACL
+ if rf, ok := ret.Get(0).(func(context.Context, string) []cipd.PackageACL); ok {
r0 = rf(ctx, prefix)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).([]clientcipd.PackageACL)
+ r0 = ret.Get(0).([]cipd.PackageACL)
}
}
@@ -261,15 +275,15 @@
}
// FetchPackageRefs provides a mock function with given fields: ctx, packageName
-func (_m *CIPDClient) FetchPackageRefs(ctx context.Context, packageName string) ([]clientcipd.RefInfo, error) {
+func (_m *CIPDClient) FetchPackageRefs(ctx context.Context, packageName string) ([]cipd.RefInfo, error) {
ret := _m.Called(ctx, packageName)
- var r0 []clientcipd.RefInfo
- if rf, ok := ret.Get(0).(func(context.Context, string) []clientcipd.RefInfo); ok {
+ var r0 []cipd.RefInfo
+ if rf, ok := ret.Get(0).(func(context.Context, string) []cipd.RefInfo); ok {
r0 = rf(ctx, packageName)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).([]clientcipd.RefInfo)
+ r0 = ret.Get(0).([]cipd.RefInfo)
}
}
@@ -307,15 +321,15 @@
}
// ListInstances provides a mock function with given fields: ctx, packageName
-func (_m *CIPDClient) ListInstances(ctx context.Context, packageName string) (clientcipd.InstanceEnumerator, error) {
+func (_m *CIPDClient) ListInstances(ctx context.Context, packageName string) (cipd.InstanceEnumerator, error) {
ret := _m.Called(ctx, packageName)
- var r0 clientcipd.InstanceEnumerator
- if rf, ok := ret.Get(0).(func(context.Context, string) clientcipd.InstanceEnumerator); ok {
+ var r0 cipd.InstanceEnumerator
+ if rf, ok := ret.Get(0).(func(context.Context, string) cipd.InstanceEnumerator); ok {
r0 = rf(ctx, packageName)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(clientcipd.InstanceEnumerator)
+ r0 = ret.Get(0).(cipd.InstanceEnumerator)
}
}
@@ -353,11 +367,11 @@
}
// ModifyACL provides a mock function with given fields: ctx, prefix, changes
-func (_m *CIPDClient) ModifyACL(ctx context.Context, prefix string, changes []clientcipd.PackageACLChange) error {
+func (_m *CIPDClient) ModifyACL(ctx context.Context, prefix string, changes []cipd.PackageACLChange) error {
ret := _m.Called(ctx, prefix, changes)
var r0 error
- if rf, ok := ret.Get(0).(func(context.Context, string, []clientcipd.PackageACLChange) error); ok {
+ if rf, ok := ret.Get(0).(func(context.Context, string, []cipd.PackageACLChange) error); ok {
r0 = rf(ctx, prefix, changes)
} else {
r0 = ret.Error(0)
@@ -381,15 +395,15 @@
}
// RepairDeployment provides a mock function with given fields: ctx, paranoia, maxThreads
-func (_m *CIPDClient) RepairDeployment(ctx context.Context, paranoia deployer.ParanoidMode, maxThreads int) (clientcipd.ActionMap, error) {
+func (_m *CIPDClient) RepairDeployment(ctx context.Context, paranoia deployer.ParanoidMode, maxThreads int) (cipd.ActionMap, error) {
ret := _m.Called(ctx, paranoia, maxThreads)
- var r0 clientcipd.ActionMap
- if rf, ok := ret.Get(0).(func(context.Context, deployer.ParanoidMode, int) clientcipd.ActionMap); ok {
+ var r0 cipd.ActionMap
+ if rf, ok := ret.Get(0).(func(context.Context, deployer.ParanoidMode, int) cipd.ActionMap); ok {
r0 = rf(ctx, paranoia, maxThreads)
} else {
if ret.Get(0) != nil {
- r0 = ret.Get(0).(clientcipd.ActionMap)
+ r0 = ret.Get(0).(cipd.ActionMap)
}
}
diff --git a/go/cq/cmd/check-cq/main.go b/go/cq/cmd/check-cq/main.go
index 653b259..713dc07 100644
--- a/go/cq/cmd/check-cq/main.go
+++ b/go/cq/cmd/check-cq/main.go
@@ -9,7 +9,7 @@
"strings"
"github.com/golang/protobuf/proto"
- "go.chromium.org/luci/cq/api/config/v2"
+ "go.chromium.org/luci/cv/api/config/v2"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/cq"
"go.skia.org/infra/go/git"
diff --git a/go/cq/cmd/new-branch-cq/main.go b/go/cq/cmd/new-branch-cq/main.go
index febadd6..56f2e08 100644
--- a/go/cq/cmd/new-branch-cq/main.go
+++ b/go/cq/cmd/new-branch-cq/main.go
@@ -6,7 +6,7 @@
"io/ioutil"
"regexp"
- "go.chromium.org/luci/cq/api/config/v2"
+ "go.chromium.org/luci/cv/api/config/v2"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/cq"
"go.skia.org/infra/go/git"
diff --git a/go/cq/cq.go b/go/cq/cq.go
index fd78a1e..54f8e3a 100644
--- a/go/cq/cq.go
+++ b/go/cq/cq.go
@@ -12,7 +12,7 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
buildbucketpb "go.chromium.org/luci/buildbucket/proto"
- "go.chromium.org/luci/cq/api/config/v2"
+ "go.chromium.org/luci/cv/api/config/v2"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/gerrit"
"go.skia.org/infra/go/git"
diff --git a/go/cq/update.go b/go/cq/update.go
index b0bab27..2dd594c 100644
--- a/go/cq/update.go
+++ b/go/cq/update.go
@@ -8,7 +8,7 @@
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/duration"
- "go.chromium.org/luci/cq/api/config/v2"
+ "go.chromium.org/luci/cv/api/config/v2"
)
const (
diff --git a/go/cq/update_test.go b/go/cq/update_test.go
index 34eb52f..9640dde 100644
--- a/go/cq/update_test.go
+++ b/go/cq/update_test.go
@@ -6,7 +6,7 @@
"github.com/golang/protobuf/ptypes/duration"
"github.com/stretchr/testify/require"
- "go.chromium.org/luci/cq/api/config/v2"
+ "go.chromium.org/luci/cv/api/config/v2"
"go.skia.org/infra/go/deepequal/assertdeep"
"go.skia.org/infra/go/git"
"go.skia.org/infra/go/testutils/unittest"
diff --git a/go/isolate/isolate.go b/go/isolate/isolate.go
index b2ccbc1..d373f09 100644
--- a/go/isolate/isolate.go
+++ b/go/isolate/isolate.go
@@ -240,19 +240,11 @@
includes = make([]isolated.HexDigest, len(iso.Includes))
copy(includes, iso.Includes)
}
- var ro *isolated.ReadOnlyValue
- if iso.ReadOnly != nil {
- rov := *iso.ReadOnly
- ro = &rov
- }
return &isolated.Isolated{
- Algo: iso.Algo,
- Command: util.CopyStringSlice(iso.Command),
- Files: files,
- Includes: includes,
- ReadOnly: ro,
- RelativeCwd: iso.RelativeCwd,
- Version: iso.Version,
+ Algo: iso.Algo,
+ Files: files,
+ Includes: includes,
+ Version: iso.Version,
}
}
diff --git a/go/isolate/isolate_test.go b/go/isolate/isolate_test.go
index 5d43fe6..6a90344 100644
--- a/go/isolate/isolate_test.go
+++ b/go/isolate/isolate_test.go
@@ -25,10 +25,8 @@
link := "link"
mode := 777
size := int64(9000)
- ro := isolated.Writable
iso := &isolated.Isolated{
- Algo: "smrt",
- Command: []string{"sit", "shake"},
+ Algo: "smrt",
Files: map[string]isolated.File{
"my-file": {
Digest: "abc123",
@@ -38,10 +36,8 @@
Type: isolated.Basic,
},
},
- Includes: []isolated.HexDigest{"blah"},
- ReadOnly: &ro,
- RelativeCwd: "dot",
- Version: "NEW!",
+ Includes: []isolated.HexDigest{"blah"},
+ Version: "NEW!",
}
assertdeep.Copy(t, iso, CopyIsolated(iso))
@@ -214,10 +210,8 @@
link := "link"
mode := 777
size := int64(9000)
- ro := isolated.Writable
i1 := &isolated.Isolated{
- Algo: "smrt",
- Command: []string{"sit", "shake"},
+ Algo: "smrt",
Files: map[string]isolated.File{
"my-file": {
Digest: "abc123",
@@ -227,10 +221,8 @@
Type: isolated.Basic,
},
},
- Includes: []isolated.HexDigest{"blah"},
- ReadOnly: &ro,
- RelativeCwd: "dot",
- Version: "NEW!",
+ Includes: []isolated.HexDigest{"blah"},
+ Version: "NEW!",
}
// Initial upload.
hashes, err := c.ReUploadIsolatedFiles(ctx, []*isolated.Isolated{i1})
diff --git a/go/supported_branches/cmd/new-branch/main.go b/go/supported_branches/cmd/new-branch/main.go
index 4aa6988..6288904 100644
--- a/go/supported_branches/cmd/new-branch/main.go
+++ b/go/supported_branches/cmd/new-branch/main.go
@@ -10,7 +10,7 @@
"regexp"
"strings"
- cq_config "go.chromium.org/luci/cq/api/config/v2"
+ cq_config "go.chromium.org/luci/cv/api/config/v2"
"go.skia.org/infra/go/auth"
"go.skia.org/infra/go/common"
"go.skia.org/infra/go/cq"
diff --git a/status/go/rpc/status.twirp.go b/status/go/rpc/status.twirp.go
index b958e67..6d89b22 100644
--- a/status/go/rpc/status.twirp.go
+++ b/status/go/rpc/status.twirp.go
@@ -1,9 +1,9 @@
-// Code generated by protoc-gen-twirp v5.12.1, DO NOT EDIT.
+// Code generated by protoc-gen-twirp v7.1.0, DO NOT EDIT.
// source: status.proto
/*
Package rpc is a generated twirp stub package.
-This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.12.1.
+This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.1.0.
It is generated from these files:
status.proto
@@ -38,9 +38,17 @@
json "encoding/json"
+ path "path"
+
url "net/url"
)
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the twirp package used in your project.
+// A compilation error at this line likely means your copy of the
+// twirp package needs to be updated.
+const _ = twirp.TwirpPackageIsVersion7
+
// =======================
// StatusService Interface
// =======================
@@ -65,14 +73,15 @@
// =============================
type statusServiceProtobufClient struct {
- client HTTPClient
- urls [4]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [4]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewStatusServiceProtobufClient creates a Protobuf client that implements the StatusService interface.
// It communicates using Protobuf and can be configured with a custom HTTPClient.
-func NewStatusServiceProtobufClient(addr string, client HTTPClient, opts ...twirp.ClientOption) StatusService {
+func NewStatusServiceProtobufClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) StatusService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -82,18 +91,21 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + StatusServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "status", "StatusService")
urls := [4]string{
- prefix + "GetIncrementalCommits",
- prefix + "AddComment",
- prefix + "DeleteComment",
- prefix + "GetAutorollerStatuses",
+ serviceURL + "GetIncrementalCommits",
+ serviceURL + "AddComment",
+ serviceURL + "DeleteComment",
+ serviceURL + "GetAutorollerStatuses",
}
return &statusServiceProtobufClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -101,6 +113,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "GetIncrementalCommits")
+ caller := c.callGetIncrementalCommits
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetIncrementalCommitsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetIncrementalCommitsRequest) when calling interceptor")
+ }
+ return c.callGetIncrementalCommits(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetIncrementalCommitsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetIncrementalCommitsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceProtobufClient) callGetIncrementalCommits(ctx context.Context, in *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
out := new(GetIncrementalCommitsResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -121,6 +159,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "AddComment")
+ caller := c.callAddComment
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *AddCommentRequest) (*AddCommentResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddCommentRequest) when calling interceptor")
+ }
+ return c.callAddComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceProtobufClient) callAddComment(ctx context.Context, in *AddCommentRequest) (*AddCommentResponse, error) {
out := new(AddCommentResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -141,6 +205,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "DeleteComment")
+ caller := c.callDeleteComment
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *DeleteCommentRequest) (*DeleteCommentResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteCommentRequest) when calling interceptor")
+ }
+ return c.callDeleteComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceProtobufClient) callDeleteComment(ctx context.Context, in *DeleteCommentRequest) (*DeleteCommentResponse, error) {
out := new(DeleteCommentResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -161,6 +251,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "GetAutorollerStatuses")
+ caller := c.callGetAutorollerStatuses
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetAutorollerStatusesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetAutorollerStatusesRequest) when calling interceptor")
+ }
+ return c.callGetAutorollerStatuses(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetAutorollerStatusesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetAutorollerStatusesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceProtobufClient) callGetAutorollerStatuses(ctx context.Context, in *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
out := new(GetAutorollerStatusesResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -182,14 +298,15 @@
// =========================
type statusServiceJSONClient struct {
- client HTTPClient
- urls [4]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [4]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewStatusServiceJSONClient creates a JSON client that implements the StatusService interface.
// It communicates using JSON and can be configured with a custom HTTPClient.
-func NewStatusServiceJSONClient(addr string, client HTTPClient, opts ...twirp.ClientOption) StatusService {
+func NewStatusServiceJSONClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) StatusService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -199,18 +316,21 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + StatusServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "status", "StatusService")
urls := [4]string{
- prefix + "GetIncrementalCommits",
- prefix + "AddComment",
- prefix + "DeleteComment",
- prefix + "GetAutorollerStatuses",
+ serviceURL + "GetIncrementalCommits",
+ serviceURL + "AddComment",
+ serviceURL + "DeleteComment",
+ serviceURL + "GetAutorollerStatuses",
}
return &statusServiceJSONClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -218,6 +338,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "GetIncrementalCommits")
+ caller := c.callGetIncrementalCommits
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetIncrementalCommitsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetIncrementalCommitsRequest) when calling interceptor")
+ }
+ return c.callGetIncrementalCommits(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetIncrementalCommitsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetIncrementalCommitsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceJSONClient) callGetIncrementalCommits(ctx context.Context, in *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
out := new(GetIncrementalCommitsResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -238,6 +384,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "AddComment")
+ caller := c.callAddComment
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *AddCommentRequest) (*AddCommentResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddCommentRequest) when calling interceptor")
+ }
+ return c.callAddComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceJSONClient) callAddComment(ctx context.Context, in *AddCommentRequest) (*AddCommentResponse, error) {
out := new(AddCommentResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -258,6 +430,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "DeleteComment")
+ caller := c.callDeleteComment
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *DeleteCommentRequest) (*DeleteCommentResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteCommentRequest) when calling interceptor")
+ }
+ return c.callDeleteComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceJSONClient) callDeleteComment(ctx context.Context, in *DeleteCommentRequest) (*DeleteCommentResponse, error) {
out := new(DeleteCommentResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -278,6 +476,32 @@
ctx = ctxsetters.WithPackageName(ctx, "status")
ctx = ctxsetters.WithServiceName(ctx, "StatusService")
ctx = ctxsetters.WithMethodName(ctx, "GetAutorollerStatuses")
+ caller := c.callGetAutorollerStatuses
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetAutorollerStatusesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetAutorollerStatusesRequest) when calling interceptor")
+ }
+ return c.callGetAutorollerStatuses(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetAutorollerStatusesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetAutorollerStatusesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *statusServiceJSONClient) callGetAutorollerStatuses(ctx context.Context, in *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
out := new(GetAutorollerStatusesResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -300,13 +524,36 @@
type statusServiceServer struct {
StatusService
- hooks *twirp.ServerHooks
+ interceptor twirp.Interceptor
+ hooks *twirp.ServerHooks
+ pathPrefix string // prefix for routing
+ jsonSkipDefaults bool // do not include unpopulated fields (default values) in the response
}
-func NewStatusServiceServer(svc StatusService, hooks *twirp.ServerHooks) TwirpServer {
+// NewStatusServiceServer builds a TwirpServer that can be used as an http.Handler to handle
+// HTTP requests that are routed to the right method in the provided svc implementation.
+// The opts are twirp.ServerOption modifiers, for example twirp.WithServerHooks(hooks).
+func NewStatusServiceServer(svc StatusService, opts ...interface{}) TwirpServer {
+ serverOpts := twirp.ServerOptions{}
+ for _, opt := range opts {
+ switch o := opt.(type) {
+ case twirp.ServerOption:
+ o(&serverOpts)
+ case *twirp.ServerHooks: // backwards compatibility, allow to specify hooks as an argument
+ twirp.WithServerHooks(o)(&serverOpts)
+ case nil: // backwards compatibility, allow nil value for the argument
+ continue
+ default:
+ panic(fmt.Sprintf("Invalid option type %T on NewStatusServiceServer", o))
+ }
+ }
+
return &statusServiceServer{
- StatusService: svc,
- hooks: hooks,
+ StatusService: svc,
+ pathPrefix: serverOpts.PathPrefix(),
+ interceptor: twirp.ChainInterceptors(serverOpts.Interceptors...),
+ hooks: serverOpts.Hooks,
+ jsonSkipDefaults: serverOpts.JSONSkipDefaults,
}
}
@@ -316,9 +563,10 @@
writeError(ctx, resp, err, s.hooks)
}
-// StatusServicePathPrefix is used for all URL paths on a twirp StatusService server.
-// Requests are always: POST StatusServicePathPrefix/method
-// It can be used in an HTTP mux to route twirp requests along with non-twirp requests on other routes.
+// StatusServicePathPrefix is a convenience constant that could used to identify URL paths.
+// Should be used with caution, it only matches routes generated by Twirp Go clients,
+// that add a "/twirp" prefix by default, and use CamelCase service and method names.
+// More info: https://twitchtv.github.io/twirp/docs/routing.html
const StatusServicePathPrefix = "/twirp/status.StatusService/"
func (s *statusServiceServer) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
@@ -336,28 +584,39 @@
if req.Method != "POST" {
msg := fmt.Sprintf("unsupported method %q (only POST is allowed)", req.Method)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
- switch req.URL.Path {
- case "/twirp/status.StatusService/GetIncrementalCommits":
+ // Verify path format: [<prefix>]/<package>.<Service>/<Method>
+ prefix, pkgService, method := parseTwirpPath(req.URL.Path)
+ if pkgService != "status.StatusService" {
+ msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+ if prefix != s.pathPrefix {
+ msg := fmt.Sprintf("invalid path prefix %q, expected %q, on path %q", prefix, s.pathPrefix, req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+
+ switch method {
+ case "GetIncrementalCommits":
s.serveGetIncrementalCommits(ctx, resp, req)
return
- case "/twirp/status.StatusService/AddComment":
+ case "AddComment":
s.serveAddComment(ctx, resp, req)
return
- case "/twirp/status.StatusService/DeleteComment":
+ case "DeleteComment":
s.serveDeleteComment(ctx, resp, req)
return
- case "/twirp/status.StatusService/GetAutorollerStatuses":
+ case "GetAutorollerStatuses":
s.serveGetAutorollerStatuses(ctx, resp, req)
return
default:
msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
}
@@ -396,11 +655,34 @@
return
}
+ handler := s.StatusService.GetIncrementalCommits
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetIncrementalCommitsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetIncrementalCommitsRequest) when calling interceptor")
+ }
+ return s.StatusService.GetIncrementalCommits(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetIncrementalCommitsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetIncrementalCommitsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetIncrementalCommitsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.GetIncrementalCommits(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -415,7 +697,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -430,7 +712,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -455,11 +737,34 @@
return
}
+ handler := s.StatusService.GetIncrementalCommits
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetIncrementalCommitsRequest) (*GetIncrementalCommitsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetIncrementalCommitsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetIncrementalCommitsRequest) when calling interceptor")
+ }
+ return s.StatusService.GetIncrementalCommits(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetIncrementalCommitsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetIncrementalCommitsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetIncrementalCommitsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.GetIncrementalCommits(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -486,7 +791,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -525,11 +830,34 @@
return
}
+ handler := s.StatusService.AddComment
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *AddCommentRequest) (*AddCommentResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddCommentRequest) when calling interceptor")
+ }
+ return s.StatusService.AddComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *AddCommentResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.AddComment(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -544,7 +872,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -559,7 +887,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -584,11 +912,34 @@
return
}
+ handler := s.StatusService.AddComment
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *AddCommentRequest) (*AddCommentResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddCommentRequest) when calling interceptor")
+ }
+ return s.StatusService.AddComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *AddCommentResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.AddComment(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -615,7 +966,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -654,11 +1005,34 @@
return
}
+ handler := s.StatusService.DeleteComment
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *DeleteCommentRequest) (*DeleteCommentResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteCommentRequest) when calling interceptor")
+ }
+ return s.StatusService.DeleteComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *DeleteCommentResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.DeleteComment(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -673,7 +1047,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -688,7 +1062,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -713,11 +1087,34 @@
return
}
+ handler := s.StatusService.DeleteComment
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *DeleteCommentRequest) (*DeleteCommentResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteCommentRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteCommentRequest) when calling interceptor")
+ }
+ return s.StatusService.DeleteComment(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteCommentResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteCommentResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *DeleteCommentResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.DeleteComment(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -744,7 +1141,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -783,11 +1180,34 @@
return
}
+ handler := s.StatusService.GetAutorollerStatuses
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetAutorollerStatusesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetAutorollerStatusesRequest) when calling interceptor")
+ }
+ return s.StatusService.GetAutorollerStatuses(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetAutorollerStatusesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetAutorollerStatusesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetAutorollerStatusesResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.GetAutorollerStatuses(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -802,7 +1222,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -817,7 +1237,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -842,11 +1262,34 @@
return
}
+ handler := s.StatusService.GetAutorollerStatuses
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetAutorollerStatusesRequest) (*GetAutorollerStatusesResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetAutorollerStatusesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetAutorollerStatusesRequest) when calling interceptor")
+ }
+ return s.StatusService.GetAutorollerStatuses(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetAutorollerStatusesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetAutorollerStatusesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetAutorollerStatusesResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.StatusService.GetAutorollerStatuses(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -873,7 +1316,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -883,11 +1326,14 @@
}
func (s *statusServiceServer) ProtocGenTwirpVersion() string {
- return "v5.12.1"
+ return "v7.1.0"
}
+// PathPrefix returns the base service path, in the form: "/<prefix>/<package>.<Service>/"
+// that is everything in a Twirp route except for the <Method>. This can be used for routing,
+// for example to identify the requests that are targeted to this service in a mux.
func (s *statusServiceServer) PathPrefix() string {
- return StatusServicePathPrefix
+ return baseServicePath(s.pathPrefix, "status", "StatusService")
}
// =====
@@ -912,6 +1358,7 @@
// Most people can think of TwirpServers as just http.Handlers.
type TwirpServer interface {
http.Handler
+
// ServiceDescriptor returns gzipped bytes describing the .proto file that
// this service was generated from. Once unzipped, the bytes can be
// unmarshalled as a
@@ -921,12 +1368,15 @@
// FileDescriptorProto's 'Service' slice of ServiceDescriptorProtos. This is a
// low-level field, expected to be used for reflection.
ServiceDescriptor() ([]byte, int)
+
// ProtocGenTwirpVersion is the semantic version string of the version of
// twirp used to generate this file.
ProtocGenTwirpVersion() string
+
// PathPrefix returns the HTTP URL path prefix for all methods handled by this
- // service. This can be used with an HTTP mux to route twirp requests
- // alongside non-twirp requests on one HTTP listener.
+ // service. This can be used with an HTTP mux to route Twirp requests.
+ // The path prefix is in the form: "/<prefix>/<package>.<Service>/"
+ // that is, everything in a Twirp route except for the <Method> at the end.
PathPrefix() string
}
@@ -977,19 +1427,44 @@
callResponseSent(ctx, hooks)
}
-// urlBase helps ensure that addr specifies a scheme. If it is unparsable
-// as a URL, it returns addr unchanged.
-func urlBase(addr string) string {
- // If the addr specifies a scheme, use it. If not, default to
- // http. If url.Parse fails on it, return it unchanged.
- url, err := url.Parse(addr)
+// sanitizeBaseURL parses the the baseURL, and adds the "http" scheme if needed.
+// If the URL is unparsable, the baseURL is returned unchaged.
+func sanitizeBaseURL(baseURL string) string {
+ u, err := url.Parse(baseURL)
if err != nil {
- return addr
+ return baseURL // invalid URL will fail later when making requests
}
- if url.Scheme == "" {
- url.Scheme = "http"
+ if u.Scheme == "" {
+ u.Scheme = "http"
}
- return url.String()
+ return u.String()
+}
+
+// baseServicePath composes the path prefix for the service (without <Method>).
+// e.g.: baseServicePath("/twirp", "my.pkg", "MyService")
+// returns => "/twirp/my.pkg.MyService/"
+// e.g.: baseServicePath("", "", "MyService")
+// returns => "/MyService/"
+func baseServicePath(prefix, pkg, service string) string {
+ fullServiceName := service
+ if pkg != "" {
+ fullServiceName = pkg + "." + service
+ }
+ return path.Join("/", prefix, fullServiceName) + "/"
+}
+
+// parseTwirpPath extracts path components form a valid Twirp route.
+// Expected format: "[<prefix>]/<package>.<Service>/<Method>"
+// e.g.: prefix, pkgService, method := parseTwirpPath("/twirp/pkg.Svc/MakeHat")
+func parseTwirpPath(path string) (string, string, string) {
+ parts := strings.Split(path, "/")
+ if len(parts) < 2 {
+ return "", "", ""
+ }
+ method := parts[len(parts)-1]
+ pkgService := parts[len(parts)-2]
+ prefix := strings.Join(parts[0:len(parts)-2], "/")
+ return prefix, pkgService, method
}
// getCustomHTTPReqHeaders retrieves a copy of any headers that are set in
@@ -1024,7 +1499,7 @@
}
req.Header.Set("Accept", contentType)
req.Header.Set("Content-Type", contentType)
- req.Header.Set("Twirp-Version", "v5.12.1")
+ req.Header.Set("Twirp-Version", "v7.1.0")
return req, nil
}
@@ -1119,7 +1594,9 @@
code = twirp.PermissionDenied
case 404: // Not Found
code = twirp.BadRoute
- case 429, 502, 503, 504: // Too Many Requests, Bad Gateway, Service Unavailable, Gateway Timeout
+ case 429: // Too Many Requests
+ code = twirp.ResourceExhausted
+ case 502, 503, 504: // Bad Gateway, Service Unavailable, Gateway Timeout
code = twirp.Unavailable
default: // All other codes
code = twirp.Unknown
diff --git a/task_scheduler/go/isolate_cache/isolate_cache_test.go b/task_scheduler/go/isolate_cache/isolate_cache_test.go
index f68ef73..ef1fff2 100644
--- a/task_scheduler/go/isolate_cache/isolate_cache_test.go
+++ b/task_scheduler/go/isolate_cache/isolate_cache_test.go
@@ -50,10 +50,8 @@
link := "link"
mode := 777
size := int64(9000)
- ro := isolated.Writable
if1 := &isolated.Isolated{
- Algo: "smrt",
- Command: []string{"sit", "stay"},
+ Algo: "smrt",
Files: map[string]isolated.File{
"myfile": {
Digest: "abc123",
@@ -63,10 +61,8 @@
Type: isolated.Basic,
},
},
- Includes: []isolated.HexDigest{"def456"},
- ReadOnly: &ro,
- RelativeCwd: "dot",
- Version: "NEW!",
+ Includes: []isolated.HexDigest{"def456"},
+ Version: "NEW!",
}
fn := func(ctx context.Context) (*CachedValue, error) {
callCount++
diff --git a/task_scheduler/go/rpc/rpc.twirp.go b/task_scheduler/go/rpc/rpc.twirp.go
index 13bc974..b4567e4 100644
--- a/task_scheduler/go/rpc/rpc.twirp.go
+++ b/task_scheduler/go/rpc/rpc.twirp.go
@@ -1,9 +1,9 @@
-// Code generated by protoc-gen-twirp v5.12.1, DO NOT EDIT.
+// Code generated by protoc-gen-twirp v7.1.0, DO NOT EDIT.
// source: rpc.proto
/*
Package rpc is a generated twirp stub package.
-This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v5.12.1.
+This code was generated with github.com/twitchtv/twirp/protoc-gen-twirp v7.1.0.
It is generated from these files:
rpc.proto
@@ -38,9 +38,17 @@
json "encoding/json"
+ path "path"
+
url "net/url"
)
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the twirp package used in your project.
+// A compilation error at this line likely means your copy of the
+// twirp package needs to be updated.
+const _ = twirp.TwirpPackageIsVersion7
+
// ==============================
// TaskSchedulerService Interface
// ==============================
@@ -81,14 +89,15 @@
// ====================================
type taskSchedulerServiceProtobufClient struct {
- client HTTPClient
- urls [9]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [9]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewTaskSchedulerServiceProtobufClient creates a Protobuf client that implements the TaskSchedulerService interface.
// It communicates using Protobuf and can be configured with a custom HTTPClient.
-func NewTaskSchedulerServiceProtobufClient(addr string, client HTTPClient, opts ...twirp.ClientOption) TaskSchedulerService {
+func NewTaskSchedulerServiceProtobufClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) TaskSchedulerService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -98,23 +107,26 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + TaskSchedulerServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "task_scheduler.rpc", "TaskSchedulerService")
urls := [9]string{
- prefix + "TriggerJobs",
- prefix + "GetJob",
- prefix + "CancelJob",
- prefix + "SearchJobs",
- prefix + "GetTask",
- prefix + "SearchTasks",
- prefix + "GetSkipTaskRules",
- prefix + "AddSkipTaskRule",
- prefix + "DeleteSkipTaskRule",
+ serviceURL + "TriggerJobs",
+ serviceURL + "GetJob",
+ serviceURL + "CancelJob",
+ serviceURL + "SearchJobs",
+ serviceURL + "GetTask",
+ serviceURL + "SearchTasks",
+ serviceURL + "GetSkipTaskRules",
+ serviceURL + "AddSkipTaskRule",
+ serviceURL + "DeleteSkipTaskRule",
}
return &taskSchedulerServiceProtobufClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -122,6 +134,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "TriggerJobs")
+ caller := c.callTriggerJobs
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *TriggerJobsRequest) (*TriggerJobsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*TriggerJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*TriggerJobsRequest) when calling interceptor")
+ }
+ return c.callTriggerJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*TriggerJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*TriggerJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callTriggerJobs(ctx context.Context, in *TriggerJobsRequest) (*TriggerJobsResponse, error) {
out := new(TriggerJobsResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -142,6 +180,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetJob")
+ caller := c.callGetJob
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetJobRequest) (*GetJobResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetJobRequest) when calling interceptor")
+ }
+ return c.callGetJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callGetJob(ctx context.Context, in *GetJobRequest) (*GetJobResponse, error) {
out := new(GetJobResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -162,6 +226,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "CancelJob")
+ caller := c.callCancelJob
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *CancelJobRequest) (*CancelJobResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CancelJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CancelJobRequest) when calling interceptor")
+ }
+ return c.callCancelJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CancelJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CancelJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callCancelJob(ctx context.Context, in *CancelJobRequest) (*CancelJobResponse, error) {
out := new(CancelJobResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -182,6 +272,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "SearchJobs")
+ caller := c.callSearchJobs
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SearchJobsRequest) (*SearchJobsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchJobsRequest) when calling interceptor")
+ }
+ return c.callSearchJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callSearchJobs(ctx context.Context, in *SearchJobsRequest) (*SearchJobsResponse, error) {
out := new(SearchJobsResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -202,6 +318,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetTask")
+ caller := c.callGetTask
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetTaskRequest) (*GetTaskResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetTaskRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetTaskRequest) when calling interceptor")
+ }
+ return c.callGetTask(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetTaskResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetTaskResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callGetTask(ctx context.Context, in *GetTaskRequest) (*GetTaskResponse, error) {
out := new(GetTaskResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[4], in, out)
if err != nil {
@@ -222,6 +364,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "SearchTasks")
+ caller := c.callSearchTasks
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SearchTasksRequest) (*SearchTasksResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchTasksRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchTasksRequest) when calling interceptor")
+ }
+ return c.callSearchTasks(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchTasksResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchTasksResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callSearchTasks(ctx context.Context, in *SearchTasksRequest) (*SearchTasksResponse, error) {
out := new(SearchTasksResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[5], in, out)
if err != nil {
@@ -242,6 +410,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetSkipTaskRules")
+ caller := c.callGetSkipTaskRules
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetSkipTaskRulesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetSkipTaskRulesRequest) when calling interceptor")
+ }
+ return c.callGetSkipTaskRules(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetSkipTaskRulesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetSkipTaskRulesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callGetSkipTaskRules(ctx context.Context, in *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
out := new(GetSkipTaskRulesResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[6], in, out)
if err != nil {
@@ -262,6 +456,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "AddSkipTaskRule")
+ caller := c.callAddSkipTaskRule
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddSkipTaskRuleRequest) when calling interceptor")
+ }
+ return c.callAddSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callAddSkipTaskRule(ctx context.Context, in *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
out := new(AddSkipTaskRuleResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[7], in, out)
if err != nil {
@@ -282,6 +502,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "DeleteSkipTaskRule")
+ caller := c.callDeleteSkipTaskRule
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteSkipTaskRuleRequest) when calling interceptor")
+ }
+ return c.callDeleteSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceProtobufClient) callDeleteSkipTaskRule(ctx context.Context, in *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
out := new(DeleteSkipTaskRuleResponse)
ctx, err := doProtobufRequest(ctx, c.client, c.opts.Hooks, c.urls[8], in, out)
if err != nil {
@@ -303,14 +549,15 @@
// ================================
type taskSchedulerServiceJSONClient struct {
- client HTTPClient
- urls [9]string
- opts twirp.ClientOptions
+ client HTTPClient
+ urls [9]string
+ interceptor twirp.Interceptor
+ opts twirp.ClientOptions
}
// NewTaskSchedulerServiceJSONClient creates a JSON client that implements the TaskSchedulerService interface.
// It communicates using JSON and can be configured with a custom HTTPClient.
-func NewTaskSchedulerServiceJSONClient(addr string, client HTTPClient, opts ...twirp.ClientOption) TaskSchedulerService {
+func NewTaskSchedulerServiceJSONClient(baseURL string, client HTTPClient, opts ...twirp.ClientOption) TaskSchedulerService {
if c, ok := client.(*http.Client); ok {
client = withoutRedirects(c)
}
@@ -320,23 +567,26 @@
o(&clientOpts)
}
- prefix := urlBase(addr) + TaskSchedulerServicePathPrefix
+ // Build method URLs: <baseURL>[<prefix>]/<package>.<Service>/<Method>
+ serviceURL := sanitizeBaseURL(baseURL)
+ serviceURL += baseServicePath(clientOpts.PathPrefix(), "task_scheduler.rpc", "TaskSchedulerService")
urls := [9]string{
- prefix + "TriggerJobs",
- prefix + "GetJob",
- prefix + "CancelJob",
- prefix + "SearchJobs",
- prefix + "GetTask",
- prefix + "SearchTasks",
- prefix + "GetSkipTaskRules",
- prefix + "AddSkipTaskRule",
- prefix + "DeleteSkipTaskRule",
+ serviceURL + "TriggerJobs",
+ serviceURL + "GetJob",
+ serviceURL + "CancelJob",
+ serviceURL + "SearchJobs",
+ serviceURL + "GetTask",
+ serviceURL + "SearchTasks",
+ serviceURL + "GetSkipTaskRules",
+ serviceURL + "AddSkipTaskRule",
+ serviceURL + "DeleteSkipTaskRule",
}
return &taskSchedulerServiceJSONClient{
- client: client,
- urls: urls,
- opts: clientOpts,
+ client: client,
+ urls: urls,
+ interceptor: twirp.ChainInterceptors(clientOpts.Interceptors...),
+ opts: clientOpts,
}
}
@@ -344,6 +594,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "TriggerJobs")
+ caller := c.callTriggerJobs
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *TriggerJobsRequest) (*TriggerJobsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*TriggerJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*TriggerJobsRequest) when calling interceptor")
+ }
+ return c.callTriggerJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*TriggerJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*TriggerJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callTriggerJobs(ctx context.Context, in *TriggerJobsRequest) (*TriggerJobsResponse, error) {
out := new(TriggerJobsResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[0], in, out)
if err != nil {
@@ -364,6 +640,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetJob")
+ caller := c.callGetJob
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetJobRequest) (*GetJobResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetJobRequest) when calling interceptor")
+ }
+ return c.callGetJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callGetJob(ctx context.Context, in *GetJobRequest) (*GetJobResponse, error) {
out := new(GetJobResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[1], in, out)
if err != nil {
@@ -384,6 +686,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "CancelJob")
+ caller := c.callCancelJob
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *CancelJobRequest) (*CancelJobResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CancelJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CancelJobRequest) when calling interceptor")
+ }
+ return c.callCancelJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CancelJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CancelJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callCancelJob(ctx context.Context, in *CancelJobRequest) (*CancelJobResponse, error) {
out := new(CancelJobResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[2], in, out)
if err != nil {
@@ -404,6 +732,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "SearchJobs")
+ caller := c.callSearchJobs
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SearchJobsRequest) (*SearchJobsResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchJobsRequest) when calling interceptor")
+ }
+ return c.callSearchJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callSearchJobs(ctx context.Context, in *SearchJobsRequest) (*SearchJobsResponse, error) {
out := new(SearchJobsResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[3], in, out)
if err != nil {
@@ -424,6 +778,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetTask")
+ caller := c.callGetTask
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetTaskRequest) (*GetTaskResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetTaskRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetTaskRequest) when calling interceptor")
+ }
+ return c.callGetTask(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetTaskResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetTaskResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callGetTask(ctx context.Context, in *GetTaskRequest) (*GetTaskResponse, error) {
out := new(GetTaskResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[4], in, out)
if err != nil {
@@ -444,6 +824,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "SearchTasks")
+ caller := c.callSearchTasks
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *SearchTasksRequest) (*SearchTasksResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchTasksRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchTasksRequest) when calling interceptor")
+ }
+ return c.callSearchTasks(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchTasksResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchTasksResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callSearchTasks(ctx context.Context, in *SearchTasksRequest) (*SearchTasksResponse, error) {
out := new(SearchTasksResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[5], in, out)
if err != nil {
@@ -464,6 +870,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "GetSkipTaskRules")
+ caller := c.callGetSkipTaskRules
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetSkipTaskRulesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetSkipTaskRulesRequest) when calling interceptor")
+ }
+ return c.callGetSkipTaskRules(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetSkipTaskRulesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetSkipTaskRulesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callGetSkipTaskRules(ctx context.Context, in *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
out := new(GetSkipTaskRulesResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[6], in, out)
if err != nil {
@@ -484,6 +916,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "AddSkipTaskRule")
+ caller := c.callAddSkipTaskRule
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddSkipTaskRuleRequest) when calling interceptor")
+ }
+ return c.callAddSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callAddSkipTaskRule(ctx context.Context, in *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
out := new(AddSkipTaskRuleResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[7], in, out)
if err != nil {
@@ -504,6 +962,32 @@
ctx = ctxsetters.WithPackageName(ctx, "task_scheduler.rpc")
ctx = ctxsetters.WithServiceName(ctx, "TaskSchedulerService")
ctx = ctxsetters.WithMethodName(ctx, "DeleteSkipTaskRule")
+ caller := c.callDeleteSkipTaskRule
+ if c.interceptor != nil {
+ caller = func(ctx context.Context, req *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
+ resp, err := c.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteSkipTaskRuleRequest) when calling interceptor")
+ }
+ return c.callDeleteSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+ return caller(ctx, in)
+}
+
+func (c *taskSchedulerServiceJSONClient) callDeleteSkipTaskRule(ctx context.Context, in *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
out := new(DeleteSkipTaskRuleResponse)
ctx, err := doJSONRequest(ctx, c.client, c.opts.Hooks, c.urls[8], in, out)
if err != nil {
@@ -526,13 +1010,36 @@
type taskSchedulerServiceServer struct {
TaskSchedulerService
- hooks *twirp.ServerHooks
+ interceptor twirp.Interceptor
+ hooks *twirp.ServerHooks
+ pathPrefix string // prefix for routing
+ jsonSkipDefaults bool // do not include unpopulated fields (default values) in the response
}
-func NewTaskSchedulerServiceServer(svc TaskSchedulerService, hooks *twirp.ServerHooks) TwirpServer {
+// NewTaskSchedulerServiceServer builds a TwirpServer that can be used as an http.Handler to handle
+// HTTP requests that are routed to the right method in the provided svc implementation.
+// The opts are twirp.ServerOption modifiers, for example twirp.WithServerHooks(hooks).
+func NewTaskSchedulerServiceServer(svc TaskSchedulerService, opts ...interface{}) TwirpServer {
+ serverOpts := twirp.ServerOptions{}
+ for _, opt := range opts {
+ switch o := opt.(type) {
+ case twirp.ServerOption:
+ o(&serverOpts)
+ case *twirp.ServerHooks: // backwards compatibility, allow to specify hooks as an argument
+ twirp.WithServerHooks(o)(&serverOpts)
+ case nil: // backwards compatibility, allow nil value for the argument
+ continue
+ default:
+ panic(fmt.Sprintf("Invalid option type %T on NewTaskSchedulerServiceServer", o))
+ }
+ }
+
return &taskSchedulerServiceServer{
TaskSchedulerService: svc,
- hooks: hooks,
+ pathPrefix: serverOpts.PathPrefix(),
+ interceptor: twirp.ChainInterceptors(serverOpts.Interceptors...),
+ hooks: serverOpts.Hooks,
+ jsonSkipDefaults: serverOpts.JSONSkipDefaults,
}
}
@@ -542,9 +1049,10 @@
writeError(ctx, resp, err, s.hooks)
}
-// TaskSchedulerServicePathPrefix is used for all URL paths on a twirp TaskSchedulerService server.
-// Requests are always: POST TaskSchedulerServicePathPrefix/method
-// It can be used in an HTTP mux to route twirp requests along with non-twirp requests on other routes.
+// TaskSchedulerServicePathPrefix is a convenience constant that could used to identify URL paths.
+// Should be used with caution, it only matches routes generated by Twirp Go clients,
+// that add a "/twirp" prefix by default, and use CamelCase service and method names.
+// More info: https://twitchtv.github.io/twirp/docs/routing.html
const TaskSchedulerServicePathPrefix = "/twirp/task_scheduler.rpc.TaskSchedulerService/"
func (s *taskSchedulerServiceServer) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
@@ -562,43 +1070,54 @@
if req.Method != "POST" {
msg := fmt.Sprintf("unsupported method %q (only POST is allowed)", req.Method)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
- switch req.URL.Path {
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/TriggerJobs":
+ // Verify path format: [<prefix>]/<package>.<Service>/<Method>
+ prefix, pkgService, method := parseTwirpPath(req.URL.Path)
+ if pkgService != "task_scheduler.rpc.TaskSchedulerService" {
+ msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+ if prefix != s.pathPrefix {
+ msg := fmt.Sprintf("invalid path prefix %q, expected %q, on path %q", prefix, s.pathPrefix, req.URL.Path)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
+ return
+ }
+
+ switch method {
+ case "TriggerJobs":
s.serveTriggerJobs(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/GetJob":
+ case "GetJob":
s.serveGetJob(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/CancelJob":
+ case "CancelJob":
s.serveCancelJob(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/SearchJobs":
+ case "SearchJobs":
s.serveSearchJobs(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/GetTask":
+ case "GetTask":
s.serveGetTask(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/SearchTasks":
+ case "SearchTasks":
s.serveSearchTasks(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/GetSkipTaskRules":
+ case "GetSkipTaskRules":
s.serveGetSkipTaskRules(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/AddSkipTaskRule":
+ case "AddSkipTaskRule":
s.serveAddSkipTaskRule(ctx, resp, req)
return
- case "/twirp/task_scheduler.rpc.TaskSchedulerService/DeleteSkipTaskRule":
+ case "DeleteSkipTaskRule":
s.serveDeleteSkipTaskRule(ctx, resp, req)
return
default:
msg := fmt.Sprintf("no handler for path %q", req.URL.Path)
- err = badRouteError(msg, req.Method, req.URL.Path)
- s.writeError(ctx, resp, err)
+ s.writeError(ctx, resp, badRouteError(msg, req.Method, req.URL.Path))
return
}
}
@@ -637,11 +1156,34 @@
return
}
+ handler := s.TaskSchedulerService.TriggerJobs
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *TriggerJobsRequest) (*TriggerJobsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*TriggerJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*TriggerJobsRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.TriggerJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*TriggerJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*TriggerJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *TriggerJobsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.TriggerJobs(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -656,7 +1198,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -671,7 +1213,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -696,11 +1238,34 @@
return
}
+ handler := s.TaskSchedulerService.TriggerJobs
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *TriggerJobsRequest) (*TriggerJobsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*TriggerJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*TriggerJobsRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.TriggerJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*TriggerJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*TriggerJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *TriggerJobsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.TriggerJobs(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -727,7 +1292,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -766,11 +1331,34 @@
return
}
+ handler := s.TaskSchedulerService.GetJob
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetJobRequest) (*GetJobResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetJobRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetJobResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetJob(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -785,7 +1373,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -800,7 +1388,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -825,11 +1413,34 @@
return
}
+ handler := s.TaskSchedulerService.GetJob
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetJobRequest) (*GetJobResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetJobRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetJobResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetJob(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -856,7 +1467,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -895,11 +1506,34 @@
return
}
+ handler := s.TaskSchedulerService.CancelJob
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *CancelJobRequest) (*CancelJobResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CancelJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CancelJobRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.CancelJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CancelJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CancelJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *CancelJobResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.CancelJob(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -914,7 +1548,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -929,7 +1563,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -954,11 +1588,34 @@
return
}
+ handler := s.TaskSchedulerService.CancelJob
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *CancelJobRequest) (*CancelJobResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*CancelJobRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*CancelJobRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.CancelJob(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*CancelJobResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*CancelJobResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *CancelJobResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.CancelJob(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -985,7 +1642,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1024,11 +1681,34 @@
return
}
+ handler := s.TaskSchedulerService.SearchJobs
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SearchJobsRequest) (*SearchJobsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchJobsRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.SearchJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SearchJobsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.SearchJobs(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1043,7 +1723,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1058,7 +1738,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1083,11 +1763,34 @@
return
}
+ handler := s.TaskSchedulerService.SearchJobs
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SearchJobsRequest) (*SearchJobsResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchJobsRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchJobsRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.SearchJobs(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchJobsResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchJobsResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SearchJobsResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.SearchJobs(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1114,7 +1817,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1153,11 +1856,34 @@
return
}
+ handler := s.TaskSchedulerService.GetTask
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetTaskRequest) (*GetTaskResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetTaskRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetTaskRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetTask(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetTaskResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetTaskResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetTaskResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetTask(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1172,7 +1898,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1187,7 +1913,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1212,11 +1938,34 @@
return
}
+ handler := s.TaskSchedulerService.GetTask
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetTaskRequest) (*GetTaskResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetTaskRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetTaskRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetTask(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetTaskResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetTaskResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetTaskResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetTask(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1243,7 +1992,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1282,11 +2031,34 @@
return
}
+ handler := s.TaskSchedulerService.SearchTasks
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SearchTasksRequest) (*SearchTasksResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchTasksRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchTasksRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.SearchTasks(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchTasksResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchTasksResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SearchTasksResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.SearchTasks(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1301,7 +2073,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1316,7 +2088,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1341,11 +2113,34 @@
return
}
+ handler := s.TaskSchedulerService.SearchTasks
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *SearchTasksRequest) (*SearchTasksResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*SearchTasksRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*SearchTasksRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.SearchTasks(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*SearchTasksResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*SearchTasksResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *SearchTasksResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.SearchTasks(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1372,7 +2167,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1411,11 +2206,34 @@
return
}
+ handler := s.TaskSchedulerService.GetSkipTaskRules
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetSkipTaskRulesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetSkipTaskRulesRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetSkipTaskRules(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetSkipTaskRulesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetSkipTaskRulesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetSkipTaskRulesResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetSkipTaskRules(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1430,7 +2248,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1445,7 +2263,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1470,11 +2288,34 @@
return
}
+ handler := s.TaskSchedulerService.GetSkipTaskRules
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *GetSkipTaskRulesRequest) (*GetSkipTaskRulesResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*GetSkipTaskRulesRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*GetSkipTaskRulesRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.GetSkipTaskRules(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*GetSkipTaskRulesResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*GetSkipTaskRulesResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *GetSkipTaskRulesResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.GetSkipTaskRules(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1501,7 +2342,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1540,11 +2381,34 @@
return
}
+ handler := s.TaskSchedulerService.AddSkipTaskRule
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddSkipTaskRuleRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.AddSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *AddSkipTaskRuleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.AddSkipTaskRule(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1559,7 +2423,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1574,7 +2438,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1599,11 +2463,34 @@
return
}
+ handler := s.TaskSchedulerService.AddSkipTaskRule
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *AddSkipTaskRuleRequest) (*AddSkipTaskRuleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*AddSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*AddSkipTaskRuleRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.AddSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*AddSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*AddSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *AddSkipTaskRuleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.AddSkipTaskRule(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1630,7 +2517,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1669,11 +2556,34 @@
return
}
+ handler := s.TaskSchedulerService.DeleteSkipTaskRule
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteSkipTaskRuleRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.DeleteSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *DeleteSkipTaskRuleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.DeleteSkipTaskRule(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1688,7 +2598,7 @@
ctx = callResponsePrepared(ctx, s.hooks)
var buf bytes.Buffer
- marshaler := &jsonpb.Marshaler{OrigName: true}
+ marshaler := &jsonpb.Marshaler{OrigName: true, EmitDefaults: !s.jsonSkipDefaults}
if err = marshaler.Marshal(&buf, respContent); err != nil {
s.writeError(ctx, resp, wrapInternal(err, "failed to marshal json response"))
return
@@ -1703,7 +2613,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1728,11 +2638,34 @@
return
}
+ handler := s.TaskSchedulerService.DeleteSkipTaskRule
+ if s.interceptor != nil {
+ handler = func(ctx context.Context, req *DeleteSkipTaskRuleRequest) (*DeleteSkipTaskRuleResponse, error) {
+ resp, err := s.interceptor(
+ func(ctx context.Context, req interface{}) (interface{}, error) {
+ typedReq, ok := req.(*DeleteSkipTaskRuleRequest)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion req.(*DeleteSkipTaskRuleRequest) when calling interceptor")
+ }
+ return s.TaskSchedulerService.DeleteSkipTaskRule(ctx, typedReq)
+ },
+ )(ctx, req)
+ if resp != nil {
+ typedResp, ok := resp.(*DeleteSkipTaskRuleResponse)
+ if !ok {
+ return nil, twirp.InternalError("failed type assertion resp.(*DeleteSkipTaskRuleResponse) when calling interceptor")
+ }
+ return typedResp, err
+ }
+ return nil, err
+ }
+ }
+
// Call service method
var respContent *DeleteSkipTaskRuleResponse
func() {
defer ensurePanicResponses(ctx, resp, s.hooks)
- respContent, err = s.TaskSchedulerService.DeleteSkipTaskRule(ctx, reqContent)
+ respContent, err = handler(ctx, reqContent)
}()
if err != nil {
@@ -1759,7 +2692,7 @@
if n, err := resp.Write(respBytes); err != nil {
msg := fmt.Sprintf("failed to write response, %d of %d bytes written: %s", n, len(respBytes), err.Error())
twerr := twirp.NewError(twirp.Unknown, msg)
- callError(ctx, s.hooks, twerr)
+ ctx = callError(ctx, s.hooks, twerr)
}
callResponseSent(ctx, s.hooks)
}
@@ -1769,11 +2702,14 @@
}
func (s *taskSchedulerServiceServer) ProtocGenTwirpVersion() string {
- return "v5.12.1"
+ return "v7.1.0"
}
+// PathPrefix returns the base service path, in the form: "/<prefix>/<package>.<Service>/"
+// that is everything in a Twirp route except for the <Method>. This can be used for routing,
+// for example to identify the requests that are targeted to this service in a mux.
func (s *taskSchedulerServiceServer) PathPrefix() string {
- return TaskSchedulerServicePathPrefix
+ return baseServicePath(s.pathPrefix, "task_scheduler.rpc", "TaskSchedulerService")
}
// =====
@@ -1798,6 +2734,7 @@
// Most people can think of TwirpServers as just http.Handlers.
type TwirpServer interface {
http.Handler
+
// ServiceDescriptor returns gzipped bytes describing the .proto file that
// this service was generated from. Once unzipped, the bytes can be
// unmarshalled as a
@@ -1807,12 +2744,15 @@
// FileDescriptorProto's 'Service' slice of ServiceDescriptorProtos. This is a
// low-level field, expected to be used for reflection.
ServiceDescriptor() ([]byte, int)
+
// ProtocGenTwirpVersion is the semantic version string of the version of
// twirp used to generate this file.
ProtocGenTwirpVersion() string
+
// PathPrefix returns the HTTP URL path prefix for all methods handled by this
- // service. This can be used with an HTTP mux to route twirp requests
- // alongside non-twirp requests on one HTTP listener.
+ // service. This can be used with an HTTP mux to route Twirp requests.
+ // The path prefix is in the form: "/<prefix>/<package>.<Service>/"
+ // that is, everything in a Twirp route except for the <Method> at the end.
PathPrefix() string
}
@@ -1863,19 +2803,44 @@
callResponseSent(ctx, hooks)
}
-// urlBase helps ensure that addr specifies a scheme. If it is unparsable
-// as a URL, it returns addr unchanged.
-func urlBase(addr string) string {
- // If the addr specifies a scheme, use it. If not, default to
- // http. If url.Parse fails on it, return it unchanged.
- url, err := url.Parse(addr)
+// sanitizeBaseURL parses the the baseURL, and adds the "http" scheme if needed.
+// If the URL is unparsable, the baseURL is returned unchaged.
+func sanitizeBaseURL(baseURL string) string {
+ u, err := url.Parse(baseURL)
if err != nil {
- return addr
+ return baseURL // invalid URL will fail later when making requests
}
- if url.Scheme == "" {
- url.Scheme = "http"
+ if u.Scheme == "" {
+ u.Scheme = "http"
}
- return url.String()
+ return u.String()
+}
+
+// baseServicePath composes the path prefix for the service (without <Method>).
+// e.g.: baseServicePath("/twirp", "my.pkg", "MyService")
+// returns => "/twirp/my.pkg.MyService/"
+// e.g.: baseServicePath("", "", "MyService")
+// returns => "/MyService/"
+func baseServicePath(prefix, pkg, service string) string {
+ fullServiceName := service
+ if pkg != "" {
+ fullServiceName = pkg + "." + service
+ }
+ return path.Join("/", prefix, fullServiceName) + "/"
+}
+
+// parseTwirpPath extracts path components form a valid Twirp route.
+// Expected format: "[<prefix>]/<package>.<Service>/<Method>"
+// e.g.: prefix, pkgService, method := parseTwirpPath("/twirp/pkg.Svc/MakeHat")
+func parseTwirpPath(path string) (string, string, string) {
+ parts := strings.Split(path, "/")
+ if len(parts) < 2 {
+ return "", "", ""
+ }
+ method := parts[len(parts)-1]
+ pkgService := parts[len(parts)-2]
+ prefix := strings.Join(parts[0:len(parts)-2], "/")
+ return prefix, pkgService, method
}
// getCustomHTTPReqHeaders retrieves a copy of any headers that are set in
@@ -1910,7 +2875,7 @@
}
req.Header.Set("Accept", contentType)
req.Header.Set("Content-Type", contentType)
- req.Header.Set("Twirp-Version", "v5.12.1")
+ req.Header.Set("Twirp-Version", "v7.1.0")
return req, nil
}
@@ -2005,7 +2970,9 @@
code = twirp.PermissionDenied
case 404: // Not Found
code = twirp.BadRoute
- case 429, 502, 503, 504: // Too Many Requests, Bad Gateway, Service Unavailable, Gateway Timeout
+ case 429: // Too Many Requests
+ code = twirp.ResourceExhausted
+ case 502, 503, 504: // Bad Gateway, Service Unavailable, Gateway Timeout
code = twirp.Unavailable
default: // All other codes
code = twirp.Unknown
diff --git a/task_scheduler/go/scheduling/task_scheduler_test.go b/task_scheduler/go/scheduling/task_scheduler_test.go
index 1d09754..47895b3 100644
--- a/task_scheduler/go/scheduling/task_scheduler_test.go
+++ b/task_scheduler/go/scheduling/task_scheduler_test.go
@@ -2338,8 +2338,7 @@
hashes := gb.CommitN(ctx, 1)
isolateContents := &isolated.Isolated{
- Algo: "sha1",
- Command: []string{"python", "recipes.py", "run"},
+ Algo: "sha1",
Files: map[string]isolated.File{
"../../somefile.txt": {
Digest: "abc123",
