diff options
author | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
---|---|---|
committer | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
commit | 107c1cdb09c575aa2f61d97f48d8587eb6bada4c (patch) | |
tree | ca7d008643efc555c388baeaf1d986e0b6b3e28c /vendor/github.com/golang/protobuf/ptypes | |
parent | 844b5a68d8af4791755b8f0ad293cc99f5959183 (diff) | |
download | terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.gz terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.zst terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.zip |
Upgrade to 0.12
Diffstat (limited to 'vendor/github.com/golang/protobuf/ptypes')
7 files changed, 81 insertions, 61 deletions
diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go index e3c56d3..78ee523 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go | |||
@@ -1,11 +1,13 @@ | |||
1 | // Code generated by protoc-gen-go. DO NOT EDIT. | 1 | // Code generated by protoc-gen-go. DO NOT EDIT. |
2 | // source: google/protobuf/any.proto | 2 | // source: google/protobuf/any.proto |
3 | 3 | ||
4 | package any // import "github.com/golang/protobuf/ptypes/any" | 4 | package any |
5 | 5 | ||
6 | import proto "github.com/golang/protobuf/proto" | 6 | import ( |
7 | import fmt "fmt" | 7 | fmt "fmt" |
8 | import math "math" | 8 | proto "github.com/golang/protobuf/proto" |
9 | math "math" | ||
10 | ) | ||
9 | 11 | ||
10 | // Reference imports to suppress errors if they are not otherwise used. | 12 | // Reference imports to suppress errors if they are not otherwise used. |
11 | var _ = proto.Marshal | 13 | var _ = proto.Marshal |
@@ -16,7 +18,7 @@ var _ = math.Inf | |||
16 | // is compatible with the proto package it is being compiled against. | 18 | // is compatible with the proto package it is being compiled against. |
17 | // A compilation error at this line likely means your copy of the | 19 | // A compilation error at this line likely means your copy of the |
18 | // proto package needs to be updated. | 20 | // proto package needs to be updated. |
19 | const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | 21 | const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package |
20 | 22 | ||
21 | // `Any` contains an arbitrary serialized protocol buffer message along with a | 23 | // `Any` contains an arbitrary serialized protocol buffer message along with a |
22 | // URL that describes the type of the serialized message. | 24 | // URL that describes the type of the serialized message. |
@@ -99,17 +101,18 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | |||
99 | // } | 101 | // } |
100 | // | 102 | // |
101 | type Any struct { | 103 | type Any struct { |
102 | // A URL/resource name whose content describes the type of the | 104 | // A URL/resource name that uniquely identifies the type of the serialized |
103 | // serialized protocol buffer message. | 105 | // protocol buffer message. The last segment of the URL's path must represent |
106 | // the fully qualified name of the type (as in | ||
107 | // `path/google.protobuf.Duration`). The name should be in a canonical form | ||
108 | // (e.g., leading "." is not accepted). | ||
104 | // | 109 | // |
105 | // For URLs which use the scheme `http`, `https`, or no scheme, the | 110 | // In practice, teams usually precompile into the binary all types that they |
106 | // following restrictions and interpretations apply: | 111 | // expect it to use in the context of Any. However, for URLs which use the |
112 | // scheme `http`, `https`, or no scheme, one can optionally set up a type | ||
113 | // server that maps type URLs to message definitions as follows: | ||
107 | // | 114 | // |
108 | // * If no scheme is provided, `https` is assumed. | 115 | // * If no scheme is provided, `https` is assumed. |
109 | // * The last segment of the URL's path must represent the fully | ||
110 | // qualified name of the type (as in `path/google.protobuf.Duration`). | ||
111 | // The name should be in a canonical form (e.g., leading "." is | ||
112 | // not accepted). | ||
113 | // * An HTTP GET on the URL must yield a [google.protobuf.Type][] | 116 | // * An HTTP GET on the URL must yield a [google.protobuf.Type][] |
114 | // value in binary format, or produce an error. | 117 | // value in binary format, or produce an error. |
115 | // * Applications are allowed to cache lookup results based on the | 118 | // * Applications are allowed to cache lookup results based on the |
@@ -118,6 +121,10 @@ type Any struct { | |||
118 | // on changes to types. (Use versioned type names to manage | 121 | // on changes to types. (Use versioned type names to manage |
119 | // breaking changes.) | 122 | // breaking changes.) |
120 | // | 123 | // |
124 | // Note: this functionality is not currently available in the official | ||
125 | // protobuf release, and it is not used for type URLs beginning with | ||
126 | // type.googleapis.com. | ||
127 | // | ||
121 | // Schemes other than `http`, `https` (or the empty scheme) might be | 128 | // Schemes other than `http`, `https` (or the empty scheme) might be |
122 | // used with implementation specific semantics. | 129 | // used with implementation specific semantics. |
123 | // | 130 | // |
@@ -133,17 +140,19 @@ func (m *Any) Reset() { *m = Any{} } | |||
133 | func (m *Any) String() string { return proto.CompactTextString(m) } | 140 | func (m *Any) String() string { return proto.CompactTextString(m) } |
134 | func (*Any) ProtoMessage() {} | 141 | func (*Any) ProtoMessage() {} |
135 | func (*Any) Descriptor() ([]byte, []int) { | 142 | func (*Any) Descriptor() ([]byte, []int) { |
136 | return fileDescriptor_any_744b9ca530f228db, []int{0} | 143 | return fileDescriptor_b53526c13ae22eb4, []int{0} |
137 | } | 144 | } |
145 | |||
138 | func (*Any) XXX_WellKnownType() string { return "Any" } | 146 | func (*Any) XXX_WellKnownType() string { return "Any" } |
147 | |||
139 | func (m *Any) XXX_Unmarshal(b []byte) error { | 148 | func (m *Any) XXX_Unmarshal(b []byte) error { |
140 | return xxx_messageInfo_Any.Unmarshal(m, b) | 149 | return xxx_messageInfo_Any.Unmarshal(m, b) |
141 | } | 150 | } |
142 | func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { | 151 | func (m *Any) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { |
143 | return xxx_messageInfo_Any.Marshal(b, m, deterministic) | 152 | return xxx_messageInfo_Any.Marshal(b, m, deterministic) |
144 | } | 153 | } |
145 | func (dst *Any) XXX_Merge(src proto.Message) { | 154 | func (m *Any) XXX_Merge(src proto.Message) { |
146 | xxx_messageInfo_Any.Merge(dst, src) | 155 | xxx_messageInfo_Any.Merge(m, src) |
147 | } | 156 | } |
148 | func (m *Any) XXX_Size() int { | 157 | func (m *Any) XXX_Size() int { |
149 | return xxx_messageInfo_Any.Size(m) | 158 | return xxx_messageInfo_Any.Size(m) |
@@ -172,9 +181,9 @@ func init() { | |||
172 | proto.RegisterType((*Any)(nil), "google.protobuf.Any") | 181 | proto.RegisterType((*Any)(nil), "google.protobuf.Any") |
173 | } | 182 | } |
174 | 183 | ||
175 | func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_any_744b9ca530f228db) } | 184 | func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor_b53526c13ae22eb4) } |
176 | 185 | ||
177 | var fileDescriptor_any_744b9ca530f228db = []byte{ | 186 | var fileDescriptor_b53526c13ae22eb4 = []byte{ |
178 | // 185 bytes of a gzipped FileDescriptorProto | 187 | // 185 bytes of a gzipped FileDescriptorProto |
179 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, | 188 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, |
180 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4, | 189 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4, |
diff --git a/vendor/github.com/golang/protobuf/ptypes/any/any.proto b/vendor/github.com/golang/protobuf/ptypes/any/any.proto index c748667..4932942 100644 --- a/vendor/github.com/golang/protobuf/ptypes/any/any.proto +++ b/vendor/github.com/golang/protobuf/ptypes/any/any.proto | |||
@@ -120,17 +120,18 @@ option objc_class_prefix = "GPB"; | |||
120 | // } | 120 | // } |
121 | // | 121 | // |
122 | message Any { | 122 | message Any { |
123 | // A URL/resource name whose content describes the type of the | 123 | // A URL/resource name that uniquely identifies the type of the serialized |
124 | // serialized protocol buffer message. | 124 | // protocol buffer message. The last segment of the URL's path must represent |
125 | // the fully qualified name of the type (as in | ||
126 | // `path/google.protobuf.Duration`). The name should be in a canonical form | ||
127 | // (e.g., leading "." is not accepted). | ||
125 | // | 128 | // |
126 | // For URLs which use the scheme `http`, `https`, or no scheme, the | 129 | // In practice, teams usually precompile into the binary all types that they |
127 | // following restrictions and interpretations apply: | 130 | // expect it to use in the context of Any. However, for URLs which use the |
131 | // scheme `http`, `https`, or no scheme, one can optionally set up a type | ||
132 | // server that maps type URLs to message definitions as follows: | ||
128 | // | 133 | // |
129 | // * If no scheme is provided, `https` is assumed. | 134 | // * If no scheme is provided, `https` is assumed. |
130 | // * The last segment of the URL's path must represent the fully | ||
131 | // qualified name of the type (as in `path/google.protobuf.Duration`). | ||
132 | // The name should be in a canonical form (e.g., leading "." is | ||
133 | // not accepted). | ||
134 | // * An HTTP GET on the URL must yield a [google.protobuf.Type][] | 135 | // * An HTTP GET on the URL must yield a [google.protobuf.Type][] |
135 | // value in binary format, or produce an error. | 136 | // value in binary format, or produce an error. |
136 | // * Applications are allowed to cache lookup results based on the | 137 | // * Applications are allowed to cache lookup results based on the |
@@ -139,6 +140,10 @@ message Any { | |||
139 | // on changes to types. (Use versioned type names to manage | 140 | // on changes to types. (Use versioned type names to manage |
140 | // breaking changes.) | 141 | // breaking changes.) |
141 | // | 142 | // |
143 | // Note: this functionality is not currently available in the official | ||
144 | // protobuf release, and it is not used for type URLs beginning with | ||
145 | // type.googleapis.com. | ||
146 | // | ||
142 | // Schemes other than `http`, `https` (or the empty scheme) might be | 147 | // Schemes other than `http`, `https` (or the empty scheme) might be |
143 | // used with implementation specific semantics. | 148 | // used with implementation specific semantics. |
144 | // | 149 | // |
diff --git a/vendor/github.com/golang/protobuf/ptypes/duration.go b/vendor/github.com/golang/protobuf/ptypes/duration.go index 65cb0f8..26d1ca2 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration.go | |||
@@ -82,7 +82,7 @@ func Duration(p *durpb.Duration) (time.Duration, error) { | |||
82 | return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) | 82 | return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) |
83 | } | 83 | } |
84 | if p.Nanos != 0 { | 84 | if p.Nanos != 0 { |
85 | d += time.Duration(p.Nanos) | 85 | d += time.Duration(p.Nanos) * time.Nanosecond |
86 | if (d < 0) != (p.Nanos < 0) { | 86 | if (d < 0) != (p.Nanos < 0) { |
87 | return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) | 87 | return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p) |
88 | } | 88 | } |
diff --git a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go index a7beb2c..0d681ee 100644 --- a/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go | |||
@@ -1,11 +1,13 @@ | |||
1 | // Code generated by protoc-gen-go. DO NOT EDIT. | 1 | // Code generated by protoc-gen-go. DO NOT EDIT. |
2 | // source: google/protobuf/duration.proto | 2 | // source: google/protobuf/duration.proto |
3 | 3 | ||
4 | package duration // import "github.com/golang/protobuf/ptypes/duration" | 4 | package duration |
5 | 5 | ||
6 | import proto "github.com/golang/protobuf/proto" | 6 | import ( |
7 | import fmt "fmt" | 7 | fmt "fmt" |
8 | import math "math" | 8 | proto "github.com/golang/protobuf/proto" |
9 | math "math" | ||
10 | ) | ||
9 | 11 | ||
10 | // Reference imports to suppress errors if they are not otherwise used. | 12 | // Reference imports to suppress errors if they are not otherwise used. |
11 | var _ = proto.Marshal | 13 | var _ = proto.Marshal |
@@ -16,7 +18,7 @@ var _ = math.Inf | |||
16 | // is compatible with the proto package it is being compiled against. | 18 | // is compatible with the proto package it is being compiled against. |
17 | // A compilation error at this line likely means your copy of the | 19 | // A compilation error at this line likely means your copy of the |
18 | // proto package needs to be updated. | 20 | // proto package needs to be updated. |
19 | const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | 21 | const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package |
20 | 22 | ||
21 | // A Duration represents a signed, fixed-length span of time represented | 23 | // A Duration represents a signed, fixed-length span of time represented |
22 | // as a count of seconds and fractions of seconds at nanosecond | 24 | // as a count of seconds and fractions of seconds at nanosecond |
@@ -99,17 +101,19 @@ func (m *Duration) Reset() { *m = Duration{} } | |||
99 | func (m *Duration) String() string { return proto.CompactTextString(m) } | 101 | func (m *Duration) String() string { return proto.CompactTextString(m) } |
100 | func (*Duration) ProtoMessage() {} | 102 | func (*Duration) ProtoMessage() {} |
101 | func (*Duration) Descriptor() ([]byte, []int) { | 103 | func (*Duration) Descriptor() ([]byte, []int) { |
102 | return fileDescriptor_duration_e7d612259e3f0613, []int{0} | 104 | return fileDescriptor_23597b2ebd7ac6c5, []int{0} |
103 | } | 105 | } |
106 | |||
104 | func (*Duration) XXX_WellKnownType() string { return "Duration" } | 107 | func (*Duration) XXX_WellKnownType() string { return "Duration" } |
108 | |||
105 | func (m *Duration) XXX_Unmarshal(b []byte) error { | 109 | func (m *Duration) XXX_Unmarshal(b []byte) error { |
106 | return xxx_messageInfo_Duration.Unmarshal(m, b) | 110 | return xxx_messageInfo_Duration.Unmarshal(m, b) |
107 | } | 111 | } |
108 | func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { | 112 | func (m *Duration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { |
109 | return xxx_messageInfo_Duration.Marshal(b, m, deterministic) | 113 | return xxx_messageInfo_Duration.Marshal(b, m, deterministic) |
110 | } | 114 | } |
111 | func (dst *Duration) XXX_Merge(src proto.Message) { | 115 | func (m *Duration) XXX_Merge(src proto.Message) { |
112 | xxx_messageInfo_Duration.Merge(dst, src) | 116 | xxx_messageInfo_Duration.Merge(m, src) |
113 | } | 117 | } |
114 | func (m *Duration) XXX_Size() int { | 118 | func (m *Duration) XXX_Size() int { |
115 | return xxx_messageInfo_Duration.Size(m) | 119 | return xxx_messageInfo_Duration.Size(m) |
@@ -138,11 +142,9 @@ func init() { | |||
138 | proto.RegisterType((*Duration)(nil), "google.protobuf.Duration") | 142 | proto.RegisterType((*Duration)(nil), "google.protobuf.Duration") |
139 | } | 143 | } |
140 | 144 | ||
141 | func init() { | 145 | func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_23597b2ebd7ac6c5) } |
142 | proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor_duration_e7d612259e3f0613) | ||
143 | } | ||
144 | 146 | ||
145 | var fileDescriptor_duration_e7d612259e3f0613 = []byte{ | 147 | var fileDescriptor_23597b2ebd7ac6c5 = []byte{ |
146 | // 190 bytes of a gzipped FileDescriptorProto | 148 | // 190 bytes of a gzipped FileDescriptorProto |
147 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, | 149 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f, |
148 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a, | 150 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a, |
diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp.go b/vendor/github.com/golang/protobuf/ptypes/timestamp.go index 47f10db..8da0df0 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp.go | |||
@@ -111,11 +111,9 @@ func TimestampNow() *tspb.Timestamp { | |||
111 | // TimestampProto converts the time.Time to a google.protobuf.Timestamp proto. | 111 | // TimestampProto converts the time.Time to a google.protobuf.Timestamp proto. |
112 | // It returns an error if the resulting Timestamp is invalid. | 112 | // It returns an error if the resulting Timestamp is invalid. |
113 | func TimestampProto(t time.Time) (*tspb.Timestamp, error) { | 113 | func TimestampProto(t time.Time) (*tspb.Timestamp, error) { |
114 | seconds := t.Unix() | ||
115 | nanos := int32(t.Sub(time.Unix(seconds, 0))) | ||
116 | ts := &tspb.Timestamp{ | 114 | ts := &tspb.Timestamp{ |
117 | Seconds: seconds, | 115 | Seconds: t.Unix(), |
118 | Nanos: nanos, | 116 | Nanos: int32(t.Nanosecond()), |
119 | } | 117 | } |
120 | if err := validateTimestamp(ts); err != nil { | 118 | if err := validateTimestamp(ts); err != nil { |
121 | return nil, err | 119 | return nil, err |
diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go index 8e76ae9..31cd846 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go | |||
@@ -1,11 +1,13 @@ | |||
1 | // Code generated by protoc-gen-go. DO NOT EDIT. | 1 | // Code generated by protoc-gen-go. DO NOT EDIT. |
2 | // source: google/protobuf/timestamp.proto | 2 | // source: google/protobuf/timestamp.proto |
3 | 3 | ||
4 | package timestamp // import "github.com/golang/protobuf/ptypes/timestamp" | 4 | package timestamp |
5 | 5 | ||
6 | import proto "github.com/golang/protobuf/proto" | 6 | import ( |
7 | import fmt "fmt" | 7 | fmt "fmt" |
8 | import math "math" | 8 | proto "github.com/golang/protobuf/proto" |
9 | math "math" | ||
10 | ) | ||
9 | 11 | ||
10 | // Reference imports to suppress errors if they are not otherwise used. | 12 | // Reference imports to suppress errors if they are not otherwise used. |
11 | var _ = proto.Marshal | 13 | var _ = proto.Marshal |
@@ -16,7 +18,7 @@ var _ = math.Inf | |||
16 | // is compatible with the proto package it is being compiled against. | 18 | // is compatible with the proto package it is being compiled against. |
17 | // A compilation error at this line likely means your copy of the | 19 | // A compilation error at this line likely means your copy of the |
18 | // proto package needs to be updated. | 20 | // proto package needs to be updated. |
19 | const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | 21 | const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package |
20 | 22 | ||
21 | // A Timestamp represents a point in time independent of any time zone | 23 | // A Timestamp represents a point in time independent of any time zone |
22 | // or calendar, represented as seconds and fractions of seconds at | 24 | // or calendar, represented as seconds and fractions of seconds at |
@@ -81,7 +83,9 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | |||
81 | // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional | 83 | // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional |
82 | // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), | 84 | // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), |
83 | // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone | 85 | // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone |
84 | // is required, though only UTC (as indicated by "Z") is presently supported. | 86 | // is required. A proto3 JSON serializer should always use UTC (as indicated by |
87 | // "Z") when printing the Timestamp type and a proto3 JSON parser should be | ||
88 | // able to accept both UTC and other timezones (as indicated by an offset). | ||
85 | // | 89 | // |
86 | // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past | 90 | // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past |
87 | // 01:30 UTC on January 15, 2017. | 91 | // 01:30 UTC on January 15, 2017. |
@@ -92,8 +96,8 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package | |||
92 | // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) | 96 | // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) |
93 | // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one | 97 | // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one |
94 | // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( | 98 | // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( |
95 | // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) | 99 | // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- |
96 | // to obtain a formatter capable of generating timestamps in this format. | 100 | // ) to obtain a formatter capable of generating timestamps in this format. |
97 | // | 101 | // |
98 | // | 102 | // |
99 | type Timestamp struct { | 103 | type Timestamp struct { |
@@ -115,17 +119,19 @@ func (m *Timestamp) Reset() { *m = Timestamp{} } | |||
115 | func (m *Timestamp) String() string { return proto.CompactTextString(m) } | 119 | func (m *Timestamp) String() string { return proto.CompactTextString(m) } |
116 | func (*Timestamp) ProtoMessage() {} | 120 | func (*Timestamp) ProtoMessage() {} |
117 | func (*Timestamp) Descriptor() ([]byte, []int) { | 121 | func (*Timestamp) Descriptor() ([]byte, []int) { |
118 | return fileDescriptor_timestamp_b826e8e5fba671a8, []int{0} | 122 | return fileDescriptor_292007bbfe81227e, []int{0} |
119 | } | 123 | } |
124 | |||
120 | func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" } | 125 | func (*Timestamp) XXX_WellKnownType() string { return "Timestamp" } |
126 | |||
121 | func (m *Timestamp) XXX_Unmarshal(b []byte) error { | 127 | func (m *Timestamp) XXX_Unmarshal(b []byte) error { |
122 | return xxx_messageInfo_Timestamp.Unmarshal(m, b) | 128 | return xxx_messageInfo_Timestamp.Unmarshal(m, b) |
123 | } | 129 | } |
124 | func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { | 130 | func (m *Timestamp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { |
125 | return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic) | 131 | return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic) |
126 | } | 132 | } |
127 | func (dst *Timestamp) XXX_Merge(src proto.Message) { | 133 | func (m *Timestamp) XXX_Merge(src proto.Message) { |
128 | xxx_messageInfo_Timestamp.Merge(dst, src) | 134 | xxx_messageInfo_Timestamp.Merge(m, src) |
129 | } | 135 | } |
130 | func (m *Timestamp) XXX_Size() int { | 136 | func (m *Timestamp) XXX_Size() int { |
131 | return xxx_messageInfo_Timestamp.Size(m) | 137 | return xxx_messageInfo_Timestamp.Size(m) |
@@ -154,11 +160,9 @@ func init() { | |||
154 | proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp") | 160 | proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp") |
155 | } | 161 | } |
156 | 162 | ||
157 | func init() { | 163 | func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_292007bbfe81227e) } |
158 | proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor_timestamp_b826e8e5fba671a8) | ||
159 | } | ||
160 | 164 | ||
161 | var fileDescriptor_timestamp_b826e8e5fba671a8 = []byte{ | 165 | var fileDescriptor_292007bbfe81227e = []byte{ |
162 | // 191 bytes of a gzipped FileDescriptorProto | 166 | // 191 bytes of a gzipped FileDescriptorProto |
163 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, | 167 | 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f, |
164 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d, | 168 | 0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d, |
diff --git a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto index 06750ab..eafb3fa 100644 --- a/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto +++ b/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto | |||
@@ -103,7 +103,9 @@ option objc_class_prefix = "GPB"; | |||
103 | // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional | 103 | // {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional |
104 | // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), | 104 | // seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), |
105 | // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone | 105 | // are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone |
106 | // is required, though only UTC (as indicated by "Z") is presently supported. | 106 | // is required. A proto3 JSON serializer should always use UTC (as indicated by |
107 | // "Z") when printing the Timestamp type and a proto3 JSON parser should be | ||
108 | // able to accept both UTC and other timezones (as indicated by an offset). | ||
107 | // | 109 | // |
108 | // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past | 110 | // For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past |
109 | // 01:30 UTC on January 15, 2017. | 111 | // 01:30 UTC on January 15, 2017. |
@@ -114,8 +116,8 @@ option objc_class_prefix = "GPB"; | |||
114 | // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) | 116 | // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) |
115 | // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one | 117 | // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one |
116 | // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( | 118 | // can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( |
117 | // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--) | 119 | // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime-- |
118 | // to obtain a formatter capable of generating timestamps in this format. | 120 | // ) to obtain a formatter capable of generating timestamps in this format. |
119 | // | 121 | // |
120 | // | 122 | // |
121 | message Timestamp { | 123 | message Timestamp { |