From 23d1214947c54349a1a3e477368010feb9f01e57 Mon Sep 17 00:00:00 2001 From: Lang Martin Date: Tue, 27 Aug 2019 12:58:12 -0400 Subject: [PATCH] match pinned versions for sub-modules --- vendor/github.com/golang/protobuf/LICENSE | 3 + .../googleapis/rpc/status/status.pb.go | 92 +++++++++++-------- vendor/vendor.json | 6 +- 3 files changed, 60 insertions(+), 41 deletions(-) diff --git a/vendor/github.com/golang/protobuf/LICENSE b/vendor/github.com/golang/protobuf/LICENSE index 0f646931a46..1b1b1921efa 100644 --- a/vendor/github.com/golang/protobuf/LICENSE +++ b/vendor/github.com/golang/protobuf/LICENSE @@ -1,4 +1,7 @@ +Go support for Protocol Buffers - Google's data interchange format + Copyright 2010 The Go Authors. All rights reserved. +https://github.com/golang/protobuf Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go index 40e79375bf0..a203bd452aa 100644 --- a/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go +++ b/vendor/google.golang.org/genproto/googleapis/rpc/status/status.pb.go @@ -1,21 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: google/rpc/status.proto -/* -Package status is a generated protocol buffer package. - -It is generated from these files: - google/rpc/status.proto - -It has these top-level messages: - Status -*/ -package status +package status // import "google.golang.org/genproto/googleapis/rpc/status" import proto "github.com/golang/protobuf/proto" import fmt "fmt" import math "math" -import google_protobuf "github.com/golang/protobuf/ptypes/any" +import any "github.com/golang/protobuf/ptypes/any" // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -28,24 +19,25 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package -// The `Status` type defines a logical error model that is suitable for different -// programming environments, including REST APIs and RPC APIs. It is used by -// [gRPC](https://github.com/grpc). The error model is designed to be: +// The `Status` type defines a logical error model that is suitable for +// different programming environments, including REST APIs and RPC APIs. It is +// used by [gRPC](https://github.com/grpc). The error model is designed to be: // // - Simple to use and understand for most users // - Flexible enough to meet unexpected needs // // # Overview // -// The `Status` message contains three pieces of data: error code, error message, -// and error details. The error code should be an enum value of -// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes if needed. The -// error message should be a developer-facing English message that helps -// developers *understand* and *resolve* the error. If a localized user-facing -// error message is needed, put the localized message in the error details or -// localize it in the client. The optional error details may contain arbitrary -// information about the error. There is a predefined set of error detail types -// in the package `google.rpc` which can be used for common error conditions. +// The `Status` message contains three pieces of data: error code, error +// message, and error details. The error code should be an enum value of +// [google.rpc.Code][google.rpc.Code], but it may accept additional error codes +// if needed. The error message should be a developer-facing English message +// that helps developers *understand* and *resolve* the error. If a localized +// user-facing error message is needed, put the localized message in the error +// details or localize it in the client. The optional error details may contain +// arbitrary information about the error. There is a predefined set of error +// detail types in the package `google.rpc` that can be used for common error +// conditions. // // # Language mapping // @@ -68,7 +60,7 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // errors. // // - Workflow errors. A typical workflow has multiple steps. Each step may -// have a `Status` message for error reporting purpose. +// have a `Status` message for error reporting. // // - Batch operations. If a client uses batch request and batch response, the // `Status` message should be used directly inside batch response, one for @@ -81,21 +73,45 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package // - Logging. If some API errors are stored in logs, the message `Status` could // be used directly after any stripping needed for security/privacy reasons. type Status struct { - // The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]. - Code int32 `protobuf:"varint,1,opt,name=code" json:"code,omitempty"` + // The status code, which should be an enum value of + // [google.rpc.Code][google.rpc.Code]. + Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // A developer-facing error message, which should be in English. Any // user-facing error message should be localized and sent in the - // [google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client. - Message string `protobuf:"bytes,2,opt,name=message" json:"message,omitempty"` - // A list of messages that carry the error details. There will be a - // common set of message types for APIs to use. - Details []*google_protobuf.Any `protobuf:"bytes,3,rep,name=details" json:"details,omitempty"` + // [google.rpc.Status.details][google.rpc.Status.details] field, or localized + // by the client. + Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` + // A list of messages that carry the error details. There is a common set of + // message types for APIs to use. + Details []*any.Any `protobuf:"bytes,3,rep,name=details,proto3" json:"details,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Status) Reset() { *m = Status{} } +func (m *Status) String() string { return proto.CompactTextString(m) } +func (*Status) ProtoMessage() {} +func (*Status) Descriptor() ([]byte, []int) { + return fileDescriptor_status_8a460da8fb0891c1, []int{0} +} +func (m *Status) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Status.Unmarshal(m, b) +} +func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Status.Marshal(b, m, deterministic) +} +func (dst *Status) XXX_Merge(src proto.Message) { + xxx_messageInfo_Status.Merge(dst, src) +} +func (m *Status) XXX_Size() int { + return xxx_messageInfo_Status.Size(m) +} +func (m *Status) XXX_DiscardUnknown() { + xxx_messageInfo_Status.DiscardUnknown(m) } -func (m *Status) Reset() { *m = Status{} } -func (m *Status) String() string { return proto.CompactTextString(m) } -func (*Status) ProtoMessage() {} -func (*Status) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } +var xxx_messageInfo_Status proto.InternalMessageInfo func (m *Status) GetCode() int32 { if m != nil { @@ -111,7 +127,7 @@ func (m *Status) GetMessage() string { return "" } -func (m *Status) GetDetails() []*google_protobuf.Any { +func (m *Status) GetDetails() []*any.Any { if m != nil { return m.Details } @@ -122,9 +138,9 @@ func init() { proto.RegisterType((*Status)(nil), "google.rpc.Status") } -func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor0) } +func init() { proto.RegisterFile("google/rpc/status.proto", fileDescriptor_status_8a460da8fb0891c1) } -var fileDescriptor0 = []byte{ +var fileDescriptor_status_8a460da8fb0891c1 = []byte{ // 209 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0xd6, 0x2b, 0x28, diff --git a/vendor/vendor.json b/vendor/vendor.json index 6dec249f212..a9b01f59fd1 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -4,7 +4,7 @@ "package": [ {"path":"cloud.google.com/go/compute/metadata","checksumSHA1":"b1KgRkWqz0RmrEBK6IJ8kOJva6w=","revision":"4bdb329835f9d945a6dad7b2ed60534497faa857","revisionTime":"2019-08-08T17:09:53Z"}, {"path":"cloud.google.com/go/iam","checksumSHA1":"+S/9jBntS1iHZwxkR64vsy97Gh8=","revision":"511b7f3f2624e2d3c4bf2697da4ab69ed5359aac","revisionTime":"2019-08-21T09:16:34Z"}, - {"path":"cloud.google.com/go/internal","checksumSHA1":"JfGXEtr79UaxukcL05IERkjYm/g=","revision":"511b7f3f2624e2d3c4bf2697da4ab69ed5359aac","revisionTime":"2019-08-21T09:16:34Z"}, + {"path":"cloud.google.com/go/internal","checksumSHA1":"JfGXEtr79UaxukcL05IERkjYm/g=","revision":"f6872d26e2099733e489f2322a878213384f731a","revisionTime":"2019-08-26T22:18:59Z"}, {"path":"cloud.google.com/go/internal/optional","checksumSHA1":"wQ4uGuRwMb24vG16pPQDOOCPkFo=","revision":"511b7f3f2624e2d3c4bf2697da4ab69ed5359aac","revisionTime":"2019-08-21T09:16:34Z"}, {"path":"cloud.google.com/go/internal/trace","checksumSHA1":"jHOn3QLqvr1luNqyOg24/BXLrsM=","revision":"511b7f3f2624e2d3c4bf2697da4ab69ed5359aac","revisionTime":"2019-08-21T09:16:34Z"}, {"path":"cloud.google.com/go/internal/version","checksumSHA1":"CRid/VCcJ3Vfwg/R/gbmzcHVOwQ=","revision":"511b7f3f2624e2d3c4bf2697da4ab69ed5359aac","revisionTime":"2019-08-21T09:16:34Z"}, @@ -152,7 +152,7 @@ {"path":"github.com/godbus/dbus","checksumSHA1":"bFplS7sPkJNtlKKCIszFQkAsmGI=","origin":"github.com/opencontainers/runc/vendor/github.com/godbus/dbus","revision":"459bfaec1fc6c17d8bfb12d0a0f69e7e7271ed2a","revisionTime":"2018-08-23T14:46:37Z"}, {"path":"github.com/gogo/protobuf/proto","checksumSHA1":"I460dM/HmGE9DWimQvd1hJkYosU=","revision":"616a82ed12d78d24d4839363e8f3c5d3f20627cf","revisionTime":"2017-11-09T18:15:19Z"}, {"path":"github.com/golang/protobuf/proto","checksumSHA1":"Pyou8mceOASSFxc7GeXZuVdSMi0=","revision":"b4deda0973fb4c70b50d226b1af49f3da59f5265","revisionTime":"2018-04-30T18:52:41Z","version":"v1","versionExact":"v1.1.0"}, - {"path":"github.com/golang/protobuf/protoc-gen-go/descriptor","checksumSHA1":"DA2cyOt1W92RTyXAqKQ4JWKGR8U=","revision":"aa810b61a9c79d51363740d207bb46cf8e620ed5","revisionTime":"2018-08-14T21:14:27Z","version":"v1.2.0","versionExact":"v1.2.0"}, + {"path":"github.com/golang/protobuf/protoc-gen-go/descriptor","checksumSHA1":"DA2cyOt1W92RTyXAqKQ4JWKGR8U=","revision":"b4deda0973fb4c70b50d226b1af49f3da59f5265","revisionTime":"2018-04-30T18:52:41Z","version":"v1.1.0","versionExact":"v1.1.0"}, {"path":"github.com/golang/protobuf/ptypes","checksumSHA1":"/s0InJhSrxhTpqw5FIKgSMknCfM=","revision":"b4deda0973fb4c70b50d226b1af49f3da59f5265","revisionTime":"2018-04-30T18:52:41Z","version":"v1","versionExact":"v1.1.0"}, {"path":"github.com/golang/protobuf/ptypes/any","checksumSHA1":"3eqU9o+NMZSLM/coY5WDq7C1uKg=","revision":"b4deda0973fb4c70b50d226b1af49f3da59f5265","revisionTime":"2018-04-30T18:52:41Z","version":"v1","versionExact":"v1.1.0"}, {"path":"github.com/golang/protobuf/ptypes/duration","checksumSHA1":"ZIF0rnVzNLluFPqUebtJrVonMr4=","revision":"b4deda0973fb4c70b50d226b1af49f3da59f5265","revisionTime":"2018-04-30T18:52:41Z","version":"v1","versionExact":"v1.1.0"}, @@ -479,7 +479,7 @@ {"path":"google.golang.org/genproto/googleapis/api/annotations","checksumSHA1":"xmp0GjeJfZUWSmGfoUA/pxlKc0Q=","revision":"b515fa19cec88c32f305a962f34ae60068947aea","revisionTime":"2019-05-08T19:38:15Z"}, {"path":"google.golang.org/genproto/googleapis/iam/v1","checksumSHA1":"3hrELKtivO5PZZfzCL4JVOX3/Kw=","revision":"b515fa19cec88c32f305a962f34ae60068947aea","revisionTime":"2019-05-08T19:38:15Z"}, {"path":"google.golang.org/genproto/googleapis/rpc/code","checksumSHA1":"74OOKlkosdNECTQ8HvRmtMsqJZg=","revision":"b515fa19cec88c32f305a962f34ae60068947aea","revisionTime":"2019-05-08T19:38:15Z"}, - {"path":"google.golang.org/genproto/googleapis/rpc/status","checksumSHA1":"AvVpgwhxhJgjoSledwDtYrEKVE4=","revision":"b0a3dcfcd1a9bd48e63634bd8802960804cf8315","revisionTime":"2017-07-11T23:52:30Z"}, + {"path":"google.golang.org/genproto/googleapis/rpc/status","checksumSHA1":"Q0bDd8ApwAloBd/JQw0uZD4DbZM=","revision":"b515fa19cec88c32f305a962f34ae60068947aea","revisionTime":"2019-05-08T19:38:15Z"}, {"path":"google.golang.org/genproto/googleapis/type/expr","checksumSHA1":"AyISVQkdxcMLS/tagl6PJFTs8Bs=","revision":"b515fa19cec88c32f305a962f34ae60068947aea","revisionTime":"2019-05-08T19:38:15Z"}, {"path":"google.golang.org/grpc","checksumSHA1":"UKBaAnKJu1ydInKNkSvnJ4s18QQ=","revision":"b534d2d20e596ca053e3070dc1745432d0cc91a6","revisionTime":"2018-07-17T15:26:04Z"}, {"path":"google.golang.org/grpc/codes","checksumSHA1":"/eTpFgjvMq5Bc9hYnw5fzKG4B6I=","revision":"0c41876308d45bc82e587965971e28be659a1aca","revisionTime":"2017-07-21T17:58:12Z"},