diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2021-04-20 14:42:05 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-20 17:01:57 -0400 |
commit | 463435dbd1bf8bed51171ca748f7d8363089bbe5 (patch) | |
tree | 0029055fe2705a9cf992db0d24043d5a115bcb1d | |
parent | d2942eabef79d57dc13b3db07066af67f52257a4 (diff) | |
download | meta-virtualization-463435dbd1bf8bed51171ca748f7d8363089bbe5.tar.gz |
containerd: fix CVE-2021-3121
The master branch contains an uprev for containerd that includes the
fix, so backport the patch separately for hardknott.
Tested by pulling a hello-world image with podman to
core-image-full-cmdline, with the following added to local.conf:
DISTRO_FEATURES_append = " systemd seccomp"
VIRTUAL-RUNTIME_init_manager = "systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
NETWORK_MANAGER = "systemd"
IMAGE_ROOTFS_EXTRA_SPACE = "8192000"
PREFERRED_PROVIDER_virtual/containerd = "containerd-opencontainers"
IMAGE_INSTALL_append = " podman virtual/containerd"
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/containerd/containerd-opencontainers_git.bb | 1 | ||||
-rw-r--r-- | recipes-containers/containerd/files/CVE-2021-3121.patch | 4035 |
2 files changed, 4036 insertions, 0 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index efa3626f..9d336764 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb | |||
@@ -9,6 +9,7 @@ SRCREV = "33d90b72d1e44987118ac111d4f7a108d412099b" | |||
9 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ | 9 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ |
10 | file://0001-build-use-oe-provided-GO-and-flags.patch \ | 10 | file://0001-build-use-oe-provided-GO-and-flags.patch \ |
11 | file://0001-Add-build-option-GODEBUG-1.patch \ | 11 | file://0001-Add-build-option-GODEBUG-1.patch \ |
12 | file://CVE-2021-3121.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | # Apache-2.0 for containerd | 15 | # Apache-2.0 for containerd |
diff --git a/recipes-containers/containerd/files/CVE-2021-3121.patch b/recipes-containers/containerd/files/CVE-2021-3121.patch new file mode 100644 index 00000000..1a2c0f4f --- /dev/null +++ b/recipes-containers/containerd/files/CVE-2021-3121.patch | |||
@@ -0,0 +1,4035 @@ | |||
1 | From 9bd7f1043ce566d4600a8c61cd45bc99b2b17e36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
3 | Date: Tue, 20 Apr 2021 11:21:08 -0400 | ||
4 | Subject: [PATCH] CVE-2021-3121 | ||
5 | |||
6 | Backports the fix at https://github.com/containerd/containerd/commit/1423e919, | ||
7 | but with extra refactors for pulled in from later versions to make the | ||
8 | fix apply correctly. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | CVE: CVE-2021-3121 | ||
12 | |||
13 | Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> | ||
14 | --- | ||
15 | src/import/api/events/container.pb.go | 22 +- | ||
16 | src/import/api/events/content.pb.go | 5 +- | ||
17 | src/import/api/events/image.pb.go | 19 +- | ||
18 | src/import/api/events/namespace.pb.go | 19 +- | ||
19 | src/import/api/events/snapshot.pb.go | 15 +- | ||
20 | src/import/api/events/task.pb.go | 55 +- | ||
21 | src/import/api/services/containers/v1/containers.pb.go | 64 +-- | ||
22 | src/import/api/services/content/v1/content.pb.go | 94 +--- | ||
23 | src/import/api/services/diff/v1/diff.pb.go | 24 +- | ||
24 | src/import/api/services/events/v1/events.pb.go | 20 +- | ||
25 | src/import/api/services/images/v1/images.pb.go | 52 +- | ||
26 | src/import/.../introspection/v1/introspection.pb.go | 22 +- | ||
27 | src/import/api/services/leases/v1/leases.pb.go | 59 +-- | ||
28 | src/import/api/services/namespaces/v1/namespace.pb.go | 52 +- | ||
29 | src/import/api/services/snapshots/v1/snapshots.pb.go | 98 +--- | ||
30 | src/import/api/services/tasks/v1/tasks.pb.go | 484 +++++++++++------- | ||
31 | src/import/api/services/ttrpc/events/v1/events.pb.go | 10 +- | ||
32 | src/import/api/services/version/v1/version.pb.go | 5 +- | ||
33 | src/import/api/types/descriptor.pb.go | 7 +- | ||
34 | src/import/api/types/metrics.pb.go | 5 +- | ||
35 | src/import/api/types/mount.pb.go | 5 +- | ||
36 | src/import/api/types/platform.pb.go | 5 +- | ||
37 | src/import/api/types/task/task.pb.go | 10 +- | ||
38 | src/import/runtime/linux/runctypes/runc.pb.go | 20 +- | ||
39 | src/import/runtime/v1/shim/v1/shim.pb.go | 100 +--- | ||
40 | src/import/runtime/v2/runc/options/oci.pb.go | 15 +- | ||
41 | src/import/runtime/v2/task/shim.pb.go | 470 ++++++++++------- | ||
42 | src/import/.../protobuf/plugin/unmarshal/unmarshal.go | 16 +- | ||
43 | src/import/.../gogo/protobuf/proto/text_parser.go | 2 +- | ||
44 | src/import/.../github.com/gogo/protobuf/types/any.pb.go | 5 +- | ||
45 | src/import/.../github.com/gogo/protobuf/types/api.pb.go | 15 +- | ||
46 | src/import/.../gogo/protobuf/types/duration.pb.go | 5 +- | ||
47 | src/import/.../gogo/protobuf/types/empty.pb.go | 5 +- | ||
48 | src/import/.../gogo/protobuf/types/field_mask.pb.go | 5 +- | ||
49 | src/import/.../gogo/protobuf/types/source_context.pb.go | 5 +- | ||
50 | src/import/.../gogo/protobuf/types/struct.pb.go | 17 +- | ||
51 | src/import/.../gogo/protobuf/types/timestamp.pb.go | 5 +- | ||
52 | src/import/.../github.com/gogo/protobuf/types/type.pb.go | 25 +- | ||
53 | src/import/.../gogo/protobuf/types/wrappers.pb.go | 45 +- | ||
54 | 39 files changed, 773 insertions(+), 1133 deletions(-) | ||
55 | |||
56 | diff --git a/src/import/api/events/container.pb.go b/src/import/api/events/container.pb.go | ||
57 | index 0c1e0a939..fe002e073 100644 | ||
58 | --- a/src/import/api/events/container.pb.go | ||
59 | +++ b/src/import/api/events/container.pb.go | ||
60 | @@ -835,10 +835,7 @@ func (m *ContainerCreate) Unmarshal(dAtA []byte) error { | ||
61 | if err != nil { | ||
62 | return err | ||
63 | } | ||
64 | - if skippy < 0 { | ||
65 | - return ErrInvalidLengthContainer | ||
66 | - } | ||
67 | - if (iNdEx + skippy) < 0 { | ||
68 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
69 | return ErrInvalidLengthContainer | ||
70 | } | ||
71 | if (iNdEx + skippy) > l { | ||
72 | @@ -957,10 +954,7 @@ func (m *ContainerCreate_Runtime) Unmarshal(dAtA []byte) error { | ||
73 | if err != nil { | ||
74 | return err | ||
75 | } | ||
76 | - if skippy < 0 { | ||
77 | - return ErrInvalidLengthContainer | ||
78 | - } | ||
79 | - if (iNdEx + skippy) < 0 { | ||
80 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
81 | return ErrInvalidLengthContainer | ||
82 | } | ||
83 | if (iNdEx + skippy) > l { | ||
84 | @@ -1185,7 +1179,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { | ||
85 | if err != nil { | ||
86 | return err | ||
87 | } | ||
88 | - if skippy < 0 { | ||
89 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
90 | return ErrInvalidLengthContainer | ||
91 | } | ||
92 | if (iNdEx + skippy) > postIndex { | ||
93 | @@ -1234,10 +1228,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { | ||
94 | if err != nil { | ||
95 | return err | ||
96 | } | ||
97 | - if skippy < 0 { | ||
98 | - return ErrInvalidLengthContainer | ||
99 | - } | ||
100 | - if (iNdEx + skippy) < 0 { | ||
101 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
102 | return ErrInvalidLengthContainer | ||
103 | } | ||
104 | if (iNdEx + skippy) > l { | ||
105 | @@ -1320,10 +1311,7 @@ func (m *ContainerDelete) Unmarshal(dAtA []byte) error { | ||
106 | if err != nil { | ||
107 | return err | ||
108 | } | ||
109 | - if skippy < 0 { | ||
110 | - return ErrInvalidLengthContainer | ||
111 | - } | ||
112 | - if (iNdEx + skippy) < 0 { | ||
113 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
114 | return ErrInvalidLengthContainer | ||
115 | } | ||
116 | if (iNdEx + skippy) > l { | ||
117 | diff --git a/src/import/api/events/content.pb.go b/src/import/api/events/content.pb.go | ||
118 | index 959ea72d8..0a7ec9325 100644 | ||
119 | --- a/src/import/api/events/content.pb.go | ||
120 | +++ b/src/import/api/events/content.pb.go | ||
121 | @@ -257,10 +257,7 @@ func (m *ContentDelete) Unmarshal(dAtA []byte) error { | ||
122 | if err != nil { | ||
123 | return err | ||
124 | } | ||
125 | - if skippy < 0 { | ||
126 | - return ErrInvalidLengthContent | ||
127 | - } | ||
128 | - if (iNdEx + skippy) < 0 { | ||
129 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
130 | return ErrInvalidLengthContent | ||
131 | } | ||
132 | if (iNdEx + skippy) > l { | ||
133 | diff --git a/src/import/api/events/image.pb.go b/src/import/api/events/image.pb.go | ||
134 | index 13f60b017..747026945 100644 | ||
135 | --- a/src/import/api/events/image.pb.go | ||
136 | +++ b/src/import/api/events/image.pb.go | ||
137 | @@ -697,7 +697,7 @@ func (m *ImageCreate) Unmarshal(dAtA []byte) error { | ||
138 | if err != nil { | ||
139 | return err | ||
140 | } | ||
141 | - if skippy < 0 { | ||
142 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
143 | return ErrInvalidLengthImage | ||
144 | } | ||
145 | if (iNdEx + skippy) > postIndex { | ||
146 | @@ -714,10 +714,7 @@ func (m *ImageCreate) Unmarshal(dAtA []byte) error { | ||
147 | if err != nil { | ||
148 | return err | ||
149 | } | ||
150 | - if skippy < 0 { | ||
151 | - return ErrInvalidLengthImage | ||
152 | - } | ||
153 | - if (iNdEx + skippy) < 0 { | ||
154 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
155 | return ErrInvalidLengthImage | ||
156 | } | ||
157 | if (iNdEx + skippy) > l { | ||
158 | @@ -910,7 +907,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []byte) error { | ||
159 | if err != nil { | ||
160 | return err | ||
161 | } | ||
162 | - if skippy < 0 { | ||
163 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
164 | return ErrInvalidLengthImage | ||
165 | } | ||
166 | if (iNdEx + skippy) > postIndex { | ||
167 | @@ -927,10 +924,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []byte) error { | ||
168 | if err != nil { | ||
169 | return err | ||
170 | } | ||
171 | - if skippy < 0 { | ||
172 | - return ErrInvalidLengthImage | ||
173 | - } | ||
174 | - if (iNdEx + skippy) < 0 { | ||
175 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
176 | return ErrInvalidLengthImage | ||
177 | } | ||
178 | if (iNdEx + skippy) > l { | ||
179 | @@ -1013,10 +1007,7 @@ func (m *ImageDelete) Unmarshal(dAtA []byte) error { | ||
180 | if err != nil { | ||
181 | return err | ||
182 | } | ||
183 | - if skippy < 0 { | ||
184 | - return ErrInvalidLengthImage | ||
185 | - } | ||
186 | - if (iNdEx + skippy) < 0 { | ||
187 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
188 | return ErrInvalidLengthImage | ||
189 | } | ||
190 | if (iNdEx + skippy) > l { | ||
191 | diff --git a/src/import/api/events/namespace.pb.go b/src/import/api/events/namespace.pb.go | ||
192 | index 37c3b78cf..d406a987e 100644 | ||
193 | --- a/src/import/api/events/namespace.pb.go | ||
194 | +++ b/src/import/api/events/namespace.pb.go | ||
195 | @@ -697,7 +697,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA []byte) error { | ||
196 | if err != nil { | ||
197 | return err | ||
198 | } | ||
199 | - if skippy < 0 { | ||
200 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
201 | return ErrInvalidLengthNamespace | ||
202 | } | ||
203 | if (iNdEx + skippy) > postIndex { | ||
204 | @@ -714,10 +714,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA []byte) error { | ||
205 | if err != nil { | ||
206 | return err | ||
207 | } | ||
208 | - if skippy < 0 { | ||
209 | - return ErrInvalidLengthNamespace | ||
210 | - } | ||
211 | - if (iNdEx + skippy) < 0 { | ||
212 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
213 | return ErrInvalidLengthNamespace | ||
214 | } | ||
215 | if (iNdEx + skippy) > l { | ||
216 | @@ -910,7 +907,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA []byte) error { | ||
217 | if err != nil { | ||
218 | return err | ||
219 | } | ||
220 | - if skippy < 0 { | ||
221 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
222 | return ErrInvalidLengthNamespace | ||
223 | } | ||
224 | if (iNdEx + skippy) > postIndex { | ||
225 | @@ -927,10 +924,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA []byte) error { | ||
226 | if err != nil { | ||
227 | return err | ||
228 | } | ||
229 | - if skippy < 0 { | ||
230 | - return ErrInvalidLengthNamespace | ||
231 | - } | ||
232 | - if (iNdEx + skippy) < 0 { | ||
233 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
234 | return ErrInvalidLengthNamespace | ||
235 | } | ||
236 | if (iNdEx + skippy) > l { | ||
237 | @@ -1013,10 +1007,7 @@ func (m *NamespaceDelete) Unmarshal(dAtA []byte) error { | ||
238 | if err != nil { | ||
239 | return err | ||
240 | } | ||
241 | - if skippy < 0 { | ||
242 | - return ErrInvalidLengthNamespace | ||
243 | - } | ||
244 | - if (iNdEx + skippy) < 0 { | ||
245 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
246 | return ErrInvalidLengthNamespace | ||
247 | } | ||
248 | if (iNdEx + skippy) > l { | ||
249 | diff --git a/src/import/api/events/snapshot.pb.go b/src/import/api/events/snapshot.pb.go | ||
250 | index 539297004..bec25c3a7 100644 | ||
251 | --- a/src/import/api/events/snapshot.pb.go | ||
252 | +++ b/src/import/api/events/snapshot.pb.go | ||
253 | @@ -548,10 +548,7 @@ func (m *SnapshotPrepare) Unmarshal(dAtA []byte) error { | ||
254 | if err != nil { | ||
255 | return err | ||
256 | } | ||
257 | - if skippy < 0 { | ||
258 | - return ErrInvalidLengthSnapshot | ||
259 | - } | ||
260 | - if (iNdEx + skippy) < 0 { | ||
261 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
262 | return ErrInvalidLengthSnapshot | ||
263 | } | ||
264 | if (iNdEx + skippy) > l { | ||
265 | @@ -666,10 +663,7 @@ func (m *SnapshotCommit) Unmarshal(dAtA []byte) error { | ||
266 | if err != nil { | ||
267 | return err | ||
268 | } | ||
269 | - if skippy < 0 { | ||
270 | - return ErrInvalidLengthSnapshot | ||
271 | - } | ||
272 | - if (iNdEx + skippy) < 0 { | ||
273 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
274 | return ErrInvalidLengthSnapshot | ||
275 | } | ||
276 | if (iNdEx + skippy) > l { | ||
277 | @@ -752,10 +746,7 @@ func (m *SnapshotRemove) Unmarshal(dAtA []byte) error { | ||
278 | if err != nil { | ||
279 | return err | ||
280 | } | ||
281 | - if skippy < 0 { | ||
282 | - return ErrInvalidLengthSnapshot | ||
283 | - } | ||
284 | - if (iNdEx + skippy) < 0 { | ||
285 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
286 | return ErrInvalidLengthSnapshot | ||
287 | } | ||
288 | if (iNdEx + skippy) > l { | ||
289 | diff --git a/src/import/api/events/task.pb.go b/src/import/api/events/task.pb.go | ||
290 | index 0f16695e3..f8f3a3f3d 100644 | ||
291 | --- a/src/import/api/events/task.pb.go | ||
292 | +++ b/src/import/api/events/task.pb.go | ||
293 | @@ -1905,10 +1905,7 @@ func (m *TaskCreate) Unmarshal(dAtA []byte) error { | ||
294 | if err != nil { | ||
295 | return err | ||
296 | } | ||
297 | - if skippy < 0 { | ||
298 | - return ErrInvalidLengthTask | ||
299 | - } | ||
300 | - if (iNdEx + skippy) < 0 { | ||
301 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
302 | return ErrInvalidLengthTask | ||
303 | } | ||
304 | if (iNdEx + skippy) > l { | ||
305 | @@ -2010,10 +2007,7 @@ func (m *TaskStart) Unmarshal(dAtA []byte) error { | ||
306 | if err != nil { | ||
307 | return err | ||
308 | } | ||
309 | - if skippy < 0 { | ||
310 | - return ErrInvalidLengthTask | ||
311 | - } | ||
312 | - if (iNdEx + skippy) < 0 { | ||
313 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
314 | return ErrInvalidLengthTask | ||
315 | } | ||
316 | if (iNdEx + skippy) > l { | ||
317 | @@ -2199,10 +2193,7 @@ func (m *TaskDelete) Unmarshal(dAtA []byte) error { | ||
318 | if err != nil { | ||
319 | return err | ||
320 | } | ||
321 | - if skippy < 0 { | ||
322 | - return ErrInvalidLengthTask | ||
323 | - } | ||
324 | - if (iNdEx + skippy) < 0 { | ||
325 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
326 | return ErrInvalidLengthTask | ||
327 | } | ||
328 | if (iNdEx + skippy) > l { | ||
329 | @@ -2369,10 +2360,7 @@ func (m *TaskIO) Unmarshal(dAtA []byte) error { | ||
330 | if err != nil { | ||
331 | return err | ||
332 | } | ||
333 | - if skippy < 0 { | ||
334 | - return ErrInvalidLengthTask | ||
335 | - } | ||
336 | - if (iNdEx + skippy) < 0 { | ||
337 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
338 | return ErrInvalidLengthTask | ||
339 | } | ||
340 | if (iNdEx + skippy) > l { | ||
341 | @@ -2558,10 +2546,7 @@ func (m *TaskExit) Unmarshal(dAtA []byte) error { | ||
342 | if err != nil { | ||
343 | return err | ||
344 | } | ||
345 | - if skippy < 0 { | ||
346 | - return ErrInvalidLengthTask | ||
347 | - } | ||
348 | - if (iNdEx + skippy) < 0 { | ||
349 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
350 | return ErrInvalidLengthTask | ||
351 | } | ||
352 | if (iNdEx + skippy) > l { | ||
353 | @@ -2644,10 +2629,7 @@ func (m *TaskOOM) Unmarshal(dAtA []byte) error { | ||
354 | if err != nil { | ||
355 | return err | ||
356 | } | ||
357 | - if skippy < 0 { | ||
358 | - return ErrInvalidLengthTask | ||
359 | - } | ||
360 | - if (iNdEx + skippy) < 0 { | ||
361 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
362 | return ErrInvalidLengthTask | ||
363 | } | ||
364 | if (iNdEx + skippy) > l { | ||
365 | @@ -2762,10 +2744,7 @@ func (m *TaskExecAdded) Unmarshal(dAtA []byte) error { | ||
366 | if err != nil { | ||
367 | return err | ||
368 | } | ||
369 | - if skippy < 0 { | ||
370 | - return ErrInvalidLengthTask | ||
371 | - } | ||
372 | - if (iNdEx + skippy) < 0 { | ||
373 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
374 | return ErrInvalidLengthTask | ||
375 | } | ||
376 | if (iNdEx + skippy) > l { | ||
377 | @@ -2899,10 +2878,7 @@ func (m *TaskExecStarted) Unmarshal(dAtA []byte) error { | ||
378 | if err != nil { | ||
379 | return err | ||
380 | } | ||
381 | - if skippy < 0 { | ||
382 | - return ErrInvalidLengthTask | ||
383 | - } | ||
384 | - if (iNdEx + skippy) < 0 { | ||
385 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
386 | return ErrInvalidLengthTask | ||
387 | } | ||
388 | if (iNdEx + skippy) > l { | ||
389 | @@ -2985,10 +2961,7 @@ func (m *TaskPaused) Unmarshal(dAtA []byte) error { | ||
390 | if err != nil { | ||
391 | return err | ||
392 | } | ||
393 | - if skippy < 0 { | ||
394 | - return ErrInvalidLengthTask | ||
395 | - } | ||
396 | - if (iNdEx + skippy) < 0 { | ||
397 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
398 | return ErrInvalidLengthTask | ||
399 | } | ||
400 | if (iNdEx + skippy) > l { | ||
401 | @@ -3071,10 +3044,7 @@ func (m *TaskResumed) Unmarshal(dAtA []byte) error { | ||
402 | if err != nil { | ||
403 | return err | ||
404 | } | ||
405 | - if skippy < 0 { | ||
406 | - return ErrInvalidLengthTask | ||
407 | - } | ||
408 | - if (iNdEx + skippy) < 0 { | ||
409 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
410 | return ErrInvalidLengthTask | ||
411 | } | ||
412 | if (iNdEx + skippy) > l { | ||
413 | @@ -3189,10 +3159,7 @@ func (m *TaskCheckpointed) Unmarshal(dAtA []byte) error { | ||
414 | if err != nil { | ||
415 | return err | ||
416 | } | ||
417 | - if skippy < 0 { | ||
418 | - return ErrInvalidLengthTask | ||
419 | - } | ||
420 | - if (iNdEx + skippy) < 0 { | ||
421 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
422 | return ErrInvalidLengthTask | ||
423 | } | ||
424 | if (iNdEx + skippy) > l { | ||
425 | diff --git a/src/import/api/services/containers/v1/containers.pb.go b/src/import/api/services/containers/v1/containers.pb.go | ||
426 | index d951b2683..af56c7de2 100644 | ||
427 | --- a/src/import/api/services/containers/v1/containers.pb.go | ||
428 | +++ b/src/import/api/services/containers/v1/containers.pb.go | ||
429 | @@ -2106,7 +2106,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | ||
430 | if err != nil { | ||
431 | return err | ||
432 | } | ||
433 | - if skippy < 0 { | ||
434 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
435 | return ErrInvalidLengthContainers | ||
436 | } | ||
437 | if (iNdEx + skippy) > postIndex { | ||
438 | @@ -2469,7 +2469,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | ||
439 | if err != nil { | ||
440 | return err | ||
441 | } | ||
442 | - if skippy < 0 { | ||
443 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
444 | return ErrInvalidLengthContainers | ||
445 | } | ||
446 | if (iNdEx + skippy) > postIndex { | ||
447 | @@ -2486,10 +2486,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | ||
448 | if err != nil { | ||
449 | return err | ||
450 | } | ||
451 | - if skippy < 0 { | ||
452 | - return ErrInvalidLengthContainers | ||
453 | - } | ||
454 | - if (iNdEx + skippy) < 0 { | ||
455 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
456 | return ErrInvalidLengthContainers | ||
457 | } | ||
458 | if (iNdEx + skippy) > l { | ||
459 | @@ -2608,10 +2605,7 @@ func (m *Container_Runtime) Unmarshal(dAtA []byte) error { | ||
460 | if err != nil { | ||
461 | return err | ||
462 | } | ||
463 | - if skippy < 0 { | ||
464 | - return ErrInvalidLengthContainers | ||
465 | - } | ||
466 | - if (iNdEx + skippy) < 0 { | ||
467 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
468 | return ErrInvalidLengthContainers | ||
469 | } | ||
470 | if (iNdEx + skippy) > l { | ||
471 | @@ -2694,10 +2688,7 @@ func (m *GetContainerRequest) Unmarshal(dAtA []byte) error { | ||
472 | if err != nil { | ||
473 | return err | ||
474 | } | ||
475 | - if skippy < 0 { | ||
476 | - return ErrInvalidLengthContainers | ||
477 | - } | ||
478 | - if (iNdEx + skippy) < 0 { | ||
479 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
480 | return ErrInvalidLengthContainers | ||
481 | } | ||
482 | if (iNdEx + skippy) > l { | ||
483 | @@ -2781,10 +2772,7 @@ func (m *GetContainerResponse) Unmarshal(dAtA []byte) error { | ||
484 | if err != nil { | ||
485 | return err | ||
486 | } | ||
487 | - if skippy < 0 { | ||
488 | - return ErrInvalidLengthContainers | ||
489 | - } | ||
490 | - if (iNdEx + skippy) < 0 { | ||
491 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
492 | return ErrInvalidLengthContainers | ||
493 | } | ||
494 | if (iNdEx + skippy) > l { | ||
495 | @@ -2867,10 +2855,7 @@ func (m *ListContainersRequest) Unmarshal(dAtA []byte) error { | ||
496 | if err != nil { | ||
497 | return err | ||
498 | } | ||
499 | - if skippy < 0 { | ||
500 | - return ErrInvalidLengthContainers | ||
501 | - } | ||
502 | - if (iNdEx + skippy) < 0 { | ||
503 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
504 | return ErrInvalidLengthContainers | ||
505 | } | ||
506 | if (iNdEx + skippy) > l { | ||
507 | @@ -2955,10 +2940,7 @@ func (m *ListContainersResponse) Unmarshal(dAtA []byte) error { | ||
508 | if err != nil { | ||
509 | return err | ||
510 | } | ||
511 | - if skippy < 0 { | ||
512 | - return ErrInvalidLengthContainers | ||
513 | - } | ||
514 | - if (iNdEx + skippy) < 0 { | ||
515 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
516 | return ErrInvalidLengthContainers | ||
517 | } | ||
518 | if (iNdEx + skippy) > l { | ||
519 | @@ -3042,10 +3024,7 @@ func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { | ||
520 | if err != nil { | ||
521 | return err | ||
522 | } | ||
523 | - if skippy < 0 { | ||
524 | - return ErrInvalidLengthContainers | ||
525 | - } | ||
526 | - if (iNdEx + skippy) < 0 { | ||
527 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
528 | return ErrInvalidLengthContainers | ||
529 | } | ||
530 | if (iNdEx + skippy) > l { | ||
531 | @@ -3129,10 +3108,7 @@ func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { | ||
532 | if err != nil { | ||
533 | return err | ||
534 | } | ||
535 | - if skippy < 0 { | ||
536 | - return ErrInvalidLengthContainers | ||
537 | - } | ||
538 | - if (iNdEx + skippy) < 0 { | ||
539 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
540 | return ErrInvalidLengthContainers | ||
541 | } | ||
542 | if (iNdEx + skippy) > l { | ||
543 | @@ -3252,10 +3228,7 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { | ||
544 | if err != nil { | ||
545 | return err | ||
546 | } | ||
547 | - if skippy < 0 { | ||
548 | - return ErrInvalidLengthContainers | ||
549 | - } | ||
550 | - if (iNdEx + skippy) < 0 { | ||
551 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
552 | return ErrInvalidLengthContainers | ||
553 | } | ||
554 | if (iNdEx + skippy) > l { | ||
555 | @@ -3339,10 +3312,7 @@ func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { | ||
556 | if err != nil { | ||
557 | return err | ||
558 | } | ||
559 | - if skippy < 0 { | ||
560 | - return ErrInvalidLengthContainers | ||
561 | - } | ||
562 | - if (iNdEx + skippy) < 0 { | ||
563 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
564 | return ErrInvalidLengthContainers | ||
565 | } | ||
566 | if (iNdEx + skippy) > l { | ||
567 | @@ -3425,10 +3395,7 @@ func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { | ||
568 | if err != nil { | ||
569 | return err | ||
570 | } | ||
571 | - if skippy < 0 { | ||
572 | - return ErrInvalidLengthContainers | ||
573 | - } | ||
574 | - if (iNdEx + skippy) < 0 { | ||
575 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
576 | return ErrInvalidLengthContainers | ||
577 | } | ||
578 | if (iNdEx + skippy) > l { | ||
579 | @@ -3515,10 +3482,7 @@ func (m *ListContainerMessage) Unmarshal(dAtA []byte) error { | ||
580 | if err != nil { | ||
581 | return err | ||
582 | } | ||
583 | - if skippy < 0 { | ||
584 | - return ErrInvalidLengthContainers | ||
585 | - } | ||
586 | - if (iNdEx + skippy) < 0 { | ||
587 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
588 | return ErrInvalidLengthContainers | ||
589 | } | ||
590 | if (iNdEx + skippy) > l { | ||
591 | diff --git a/src/import/api/services/content/v1/content.pb.go b/src/import/api/services/content/v1/content.pb.go | ||
592 | index 1cf0aaa91..97c7d4a92 100644 | ||
593 | --- a/src/import/api/services/content/v1/content.pb.go | ||
594 | +++ b/src/import/api/services/content/v1/content.pb.go | ||
595 | @@ -3280,7 +3280,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | ||
596 | if err != nil { | ||
597 | return err | ||
598 | } | ||
599 | - if skippy < 0 { | ||
600 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
601 | return ErrInvalidLengthContent | ||
602 | } | ||
603 | if (iNdEx + skippy) > postIndex { | ||
604 | @@ -3297,10 +3297,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | ||
605 | if err != nil { | ||
606 | return err | ||
607 | } | ||
608 | - if skippy < 0 { | ||
609 | - return ErrInvalidLengthContent | ||
610 | - } | ||
611 | - if (iNdEx + skippy) < 0 { | ||
612 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
613 | return ErrInvalidLengthContent | ||
614 | } | ||
615 | if (iNdEx + skippy) > l { | ||
616 | @@ -3383,10 +3380,7 @@ func (m *InfoRequest) Unmarshal(dAtA []byte) error { | ||
617 | if err != nil { | ||
618 | return err | ||
619 | } | ||
620 | - if skippy < 0 { | ||
621 | - return ErrInvalidLengthContent | ||
622 | - } | ||
623 | - if (iNdEx + skippy) < 0 { | ||
624 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
625 | return ErrInvalidLengthContent | ||
626 | } | ||
627 | if (iNdEx + skippy) > l { | ||
628 | @@ -3470,10 +3464,7 @@ func (m *InfoResponse) Unmarshal(dAtA []byte) error { | ||
629 | if err != nil { | ||
630 | return err | ||
631 | } | ||
632 | - if skippy < 0 { | ||
633 | - return ErrInvalidLengthContent | ||
634 | - } | ||
635 | - if (iNdEx + skippy) < 0 { | ||
636 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
637 | return ErrInvalidLengthContent | ||
638 | } | ||
639 | if (iNdEx + skippy) > l { | ||
640 | @@ -3593,10 +3584,7 @@ func (m *UpdateRequest) Unmarshal(dAtA []byte) error { | ||
641 | if err != nil { | ||
642 | return err | ||
643 | } | ||
644 | - if skippy < 0 { | ||
645 | - return ErrInvalidLengthContent | ||
646 | - } | ||
647 | - if (iNdEx + skippy) < 0 { | ||
648 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
649 | return ErrInvalidLengthContent | ||
650 | } | ||
651 | if (iNdEx + skippy) > l { | ||
652 | @@ -3680,10 +3668,7 @@ func (m *UpdateResponse) Unmarshal(dAtA []byte) error { | ||
653 | if err != nil { | ||
654 | return err | ||
655 | } | ||
656 | - if skippy < 0 { | ||
657 | - return ErrInvalidLengthContent | ||
658 | - } | ||
659 | - if (iNdEx + skippy) < 0 { | ||
660 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
661 | return ErrInvalidLengthContent | ||
662 | } | ||
663 | if (iNdEx + skippy) > l { | ||
664 | @@ -3766,10 +3751,7 @@ func (m *ListContentRequest) Unmarshal(dAtA []byte) error { | ||
665 | if err != nil { | ||
666 | return err | ||
667 | } | ||
668 | - if skippy < 0 { | ||
669 | - return ErrInvalidLengthContent | ||
670 | - } | ||
671 | - if (iNdEx + skippy) < 0 { | ||
672 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
673 | return ErrInvalidLengthContent | ||
674 | } | ||
675 | if (iNdEx + skippy) > l { | ||
676 | @@ -3854,10 +3836,7 @@ func (m *ListContentResponse) Unmarshal(dAtA []byte) error { | ||
677 | if err != nil { | ||
678 | return err | ||
679 | } | ||
680 | - if skippy < 0 { | ||
681 | - return ErrInvalidLengthContent | ||
682 | - } | ||
683 | - if (iNdEx + skippy) < 0 { | ||
684 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
685 | return ErrInvalidLengthContent | ||
686 | } | ||
687 | if (iNdEx + skippy) > l { | ||
688 | @@ -3940,10 +3919,7 @@ func (m *DeleteContentRequest) Unmarshal(dAtA []byte) error { | ||
689 | if err != nil { | ||
690 | return err | ||
691 | } | ||
692 | - if skippy < 0 { | ||
693 | - return ErrInvalidLengthContent | ||
694 | - } | ||
695 | - if (iNdEx + skippy) < 0 { | ||
696 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
697 | return ErrInvalidLengthContent | ||
698 | } | ||
699 | if (iNdEx + skippy) > l { | ||
700 | @@ -4064,10 +4040,7 @@ func (m *ReadContentRequest) Unmarshal(dAtA []byte) error { | ||
701 | if err != nil { | ||
702 | return err | ||
703 | } | ||
704 | - if skippy < 0 { | ||
705 | - return ErrInvalidLengthContent | ||
706 | - } | ||
707 | - if (iNdEx + skippy) < 0 { | ||
708 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
709 | return ErrInvalidLengthContent | ||
710 | } | ||
711 | if (iNdEx + skippy) > l { | ||
712 | @@ -4171,10 +4144,7 @@ func (m *ReadContentResponse) Unmarshal(dAtA []byte) error { | ||
713 | if err != nil { | ||
714 | return err | ||
715 | } | ||
716 | - if skippy < 0 { | ||
717 | - return ErrInvalidLengthContent | ||
718 | - } | ||
719 | - if (iNdEx + skippy) < 0 { | ||
720 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
721 | return ErrInvalidLengthContent | ||
722 | } | ||
723 | if (iNdEx + skippy) > l { | ||
724 | @@ -4393,10 +4363,7 @@ func (m *Status) Unmarshal(dAtA []byte) error { | ||
725 | if err != nil { | ||
726 | return err | ||
727 | } | ||
728 | - if skippy < 0 { | ||
729 | - return ErrInvalidLengthContent | ||
730 | - } | ||
731 | - if (iNdEx + skippy) < 0 { | ||
732 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
733 | return ErrInvalidLengthContent | ||
734 | } | ||
735 | if (iNdEx + skippy) > l { | ||
736 | @@ -4479,10 +4446,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error { | ||
737 | if err != nil { | ||
738 | return err | ||
739 | } | ||
740 | - if skippy < 0 { | ||
741 | - return ErrInvalidLengthContent | ||
742 | - } | ||
743 | - if (iNdEx + skippy) < 0 { | ||
744 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
745 | return ErrInvalidLengthContent | ||
746 | } | ||
747 | if (iNdEx + skippy) > l { | ||
748 | @@ -4569,10 +4533,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error { | ||
749 | if err != nil { | ||
750 | return err | ||
751 | } | ||
752 | - if skippy < 0 { | ||
753 | - return ErrInvalidLengthContent | ||
754 | - } | ||
755 | - if (iNdEx + skippy) < 0 { | ||
756 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
757 | return ErrInvalidLengthContent | ||
758 | } | ||
759 | if (iNdEx + skippy) > l { | ||
760 | @@ -4655,10 +4616,7 @@ func (m *ListStatusesRequest) Unmarshal(dAtA []byte) error { | ||
761 | if err != nil { | ||
762 | return err | ||
763 | } | ||
764 | - if skippy < 0 { | ||
765 | - return ErrInvalidLengthContent | ||
766 | - } | ||
767 | - if (iNdEx + skippy) < 0 { | ||
768 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
769 | return ErrInvalidLengthContent | ||
770 | } | ||
771 | if (iNdEx + skippy) > l { | ||
772 | @@ -4743,10 +4701,7 @@ func (m *ListStatusesResponse) Unmarshal(dAtA []byte) error { | ||
773 | if err != nil { | ||
774 | return err | ||
775 | } | ||
776 | - if skippy < 0 { | ||
777 | - return ErrInvalidLengthContent | ||
778 | - } | ||
779 | - if (iNdEx + skippy) < 0 { | ||
780 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
781 | return ErrInvalidLengthContent | ||
782 | } | ||
783 | if (iNdEx + skippy) > l { | ||
784 | @@ -5062,7 +5017,7 @@ func (m *WriteContentRequest) Unmarshal(dAtA []byte) error { | ||
785 | if err != nil { | ||
786 | return err | ||
787 | } | ||
788 | - if skippy < 0 { | ||
789 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
790 | return ErrInvalidLengthContent | ||
791 | } | ||
792 | if (iNdEx + skippy) > postIndex { | ||
793 | @@ -5079,10 +5034,7 @@ func (m *WriteContentRequest) Unmarshal(dAtA []byte) error { | ||
794 | if err != nil { | ||
795 | return err | ||
796 | } | ||
797 | - if skippy < 0 { | ||
798 | - return ErrInvalidLengthContent | ||
799 | - } | ||
800 | - if (iNdEx + skippy) < 0 { | ||
801 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
802 | return ErrInvalidLengthContent | ||
803 | } | ||
804 | if (iNdEx + skippy) > l { | ||
805 | @@ -5288,10 +5240,7 @@ func (m *WriteContentResponse) Unmarshal(dAtA []byte) error { | ||
806 | if err != nil { | ||
807 | return err | ||
808 | } | ||
809 | - if skippy < 0 { | ||
810 | - return ErrInvalidLengthContent | ||
811 | - } | ||
812 | - if (iNdEx + skippy) < 0 { | ||
813 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
814 | return ErrInvalidLengthContent | ||
815 | } | ||
816 | if (iNdEx + skippy) > l { | ||
817 | @@ -5374,10 +5323,7 @@ func (m *AbortRequest) Unmarshal(dAtA []byte) error { | ||
818 | if err != nil { | ||
819 | return err | ||
820 | } | ||
821 | - if skippy < 0 { | ||
822 | - return ErrInvalidLengthContent | ||
823 | - } | ||
824 | - if (iNdEx + skippy) < 0 { | ||
825 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
826 | return ErrInvalidLengthContent | ||
827 | } | ||
828 | if (iNdEx + skippy) > l { | ||
829 | diff --git a/src/import/api/services/diff/v1/diff.pb.go b/src/import/api/services/diff/v1/diff.pb.go | ||
830 | index 48379234d..b1450ceb8 100644 | ||
831 | --- a/src/import/api/services/diff/v1/diff.pb.go | ||
832 | +++ b/src/import/api/services/diff/v1/diff.pb.go | ||
833 | @@ -1063,7 +1063,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error { | ||
834 | if err != nil { | ||
835 | return err | ||
836 | } | ||
837 | - if skippy < 0 { | ||
838 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
839 | return ErrInvalidLengthDiff | ||
840 | } | ||
841 | if (iNdEx + skippy) > postIndex { | ||
842 | @@ -1080,10 +1080,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error { | ||
843 | if err != nil { | ||
844 | return err | ||
845 | } | ||
846 | - if skippy < 0 { | ||
847 | - return ErrInvalidLengthDiff | ||
848 | - } | ||
849 | - if (iNdEx + skippy) < 0 { | ||
850 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
851 | return ErrInvalidLengthDiff | ||
852 | } | ||
853 | if (iNdEx + skippy) > l { | ||
854 | @@ -1170,10 +1167,7 @@ func (m *ApplyResponse) Unmarshal(dAtA []byte) error { | ||
855 | if err != nil { | ||
856 | return err | ||
857 | } | ||
858 | - if skippy < 0 { | ||
859 | - return ErrInvalidLengthDiff | ||
860 | - } | ||
861 | - if (iNdEx + skippy) < 0 { | ||
862 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
863 | return ErrInvalidLengthDiff | ||
864 | } | ||
865 | if (iNdEx + skippy) > l { | ||
866 | @@ -1466,7 +1460,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error { | ||
867 | if err != nil { | ||
868 | return err | ||
869 | } | ||
870 | - if skippy < 0 { | ||
871 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
872 | return ErrInvalidLengthDiff | ||
873 | } | ||
874 | if (iNdEx + skippy) > postIndex { | ||
875 | @@ -1483,10 +1477,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error { | ||
876 | if err != nil { | ||
877 | return err | ||
878 | } | ||
879 | - if skippy < 0 { | ||
880 | - return ErrInvalidLengthDiff | ||
881 | - } | ||
882 | - if (iNdEx + skippy) < 0 { | ||
883 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
884 | return ErrInvalidLengthDiff | ||
885 | } | ||
886 | if (iNdEx + skippy) > l { | ||
887 | @@ -1573,10 +1564,7 @@ func (m *DiffResponse) Unmarshal(dAtA []byte) error { | ||
888 | if err != nil { | ||
889 | return err | ||
890 | } | ||
891 | - if skippy < 0 { | ||
892 | - return ErrInvalidLengthDiff | ||
893 | - } | ||
894 | - if (iNdEx + skippy) < 0 { | ||
895 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
896 | return ErrInvalidLengthDiff | ||
897 | } | ||
898 | if (iNdEx + skippy) > l { | ||
899 | diff --git a/src/import/api/services/events/v1/events.pb.go b/src/import/api/services/events/v1/events.pb.go | ||
900 | index a1674f862..4373f3bf2 100644 | ||
901 | --- a/src/import/api/services/events/v1/events.pb.go | ||
902 | +++ b/src/import/api/services/events/v1/events.pb.go | ||
903 | @@ -916,10 +916,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { | ||
904 | if err != nil { | ||
905 | return err | ||
906 | } | ||
907 | - if skippy < 0 { | ||
908 | - return ErrInvalidLengthEvents | ||
909 | - } | ||
910 | - if (iNdEx + skippy) < 0 { | ||
911 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
912 | return ErrInvalidLengthEvents | ||
913 | } | ||
914 | if (iNdEx + skippy) > l { | ||
915 | @@ -1006,10 +1003,7 @@ func (m *ForwardRequest) Unmarshal(dAtA []byte) error { | ||
916 | if err != nil { | ||
917 | return err | ||
918 | } | ||
919 | - if skippy < 0 { | ||
920 | - return ErrInvalidLengthEvents | ||
921 | - } | ||
922 | - if (iNdEx + skippy) < 0 { | ||
923 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
924 | return ErrInvalidLengthEvents | ||
925 | } | ||
926 | if (iNdEx + skippy) > l { | ||
927 | @@ -1092,10 +1086,7 @@ func (m *SubscribeRequest) Unmarshal(dAtA []byte) error { | ||
928 | if err != nil { | ||
929 | return err | ||
930 | } | ||
931 | - if skippy < 0 { | ||
932 | - return ErrInvalidLengthEvents | ||
933 | - } | ||
934 | - if (iNdEx + skippy) < 0 { | ||
935 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
936 | return ErrInvalidLengthEvents | ||
937 | } | ||
938 | if (iNdEx + skippy) > l { | ||
939 | @@ -1279,10 +1270,7 @@ func (m *Envelope) Unmarshal(dAtA []byte) error { | ||
940 | if err != nil { | ||
941 | return err | ||
942 | } | ||
943 | - if skippy < 0 { | ||
944 | - return ErrInvalidLengthEvents | ||
945 | - } | ||
946 | - if (iNdEx + skippy) < 0 { | ||
947 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
948 | return ErrInvalidLengthEvents | ||
949 | } | ||
950 | if (iNdEx + skippy) > l { | ||
951 | diff --git a/src/import/api/services/images/v1/images.pb.go b/src/import/api/services/images/v1/images.pb.go | ||
952 | index db912b68b..de08cc083 100644 | ||
953 | --- a/src/import/api/services/images/v1/images.pb.go | ||
954 | +++ b/src/import/api/services/images/v1/images.pb.go | ||
955 | @@ -1707,7 +1707,7 @@ func (m *Image) Unmarshal(dAtA []byte) error { | ||
956 | if err != nil { | ||
957 | return err | ||
958 | } | ||
959 | - if skippy < 0 { | ||
960 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
961 | return ErrInvalidLengthImages | ||
962 | } | ||
963 | if (iNdEx + skippy) > postIndex { | ||
964 | @@ -1823,10 +1823,7 @@ func (m *Image) Unmarshal(dAtA []byte) error { | ||
965 | if err != nil { | ||
966 | return err | ||
967 | } | ||
968 | - if skippy < 0 { | ||
969 | - return ErrInvalidLengthImages | ||
970 | - } | ||
971 | - if (iNdEx + skippy) < 0 { | ||
972 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
973 | return ErrInvalidLengthImages | ||
974 | } | ||
975 | if (iNdEx + skippy) > l { | ||
976 | @@ -1909,10 +1906,7 @@ func (m *GetImageRequest) Unmarshal(dAtA []byte) error { | ||
977 | if err != nil { | ||
978 | return err | ||
979 | } | ||
980 | - if skippy < 0 { | ||
981 | - return ErrInvalidLengthImages | ||
982 | - } | ||
983 | - if (iNdEx + skippy) < 0 { | ||
984 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
985 | return ErrInvalidLengthImages | ||
986 | } | ||
987 | if (iNdEx + skippy) > l { | ||
988 | @@ -1999,10 +1993,7 @@ func (m *GetImageResponse) Unmarshal(dAtA []byte) error { | ||
989 | if err != nil { | ||
990 | return err | ||
991 | } | ||
992 | - if skippy < 0 { | ||
993 | - return ErrInvalidLengthImages | ||
994 | - } | ||
995 | - if (iNdEx + skippy) < 0 { | ||
996 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
997 | return ErrInvalidLengthImages | ||
998 | } | ||
999 | if (iNdEx + skippy) > l { | ||
1000 | @@ -2086,10 +2077,7 @@ func (m *CreateImageRequest) Unmarshal(dAtA []byte) error { | ||
1001 | if err != nil { | ||
1002 | return err | ||
1003 | } | ||
1004 | - if skippy < 0 { | ||
1005 | - return ErrInvalidLengthImages | ||
1006 | - } | ||
1007 | - if (iNdEx + skippy) < 0 { | ||
1008 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1009 | return ErrInvalidLengthImages | ||
1010 | } | ||
1011 | if (iNdEx + skippy) > l { | ||
1012 | @@ -2173,10 +2161,7 @@ func (m *CreateImageResponse) Unmarshal(dAtA []byte) error { | ||
1013 | if err != nil { | ||
1014 | return err | ||
1015 | } | ||
1016 | - if skippy < 0 { | ||
1017 | - return ErrInvalidLengthImages | ||
1018 | - } | ||
1019 | - if (iNdEx + skippy) < 0 { | ||
1020 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1021 | return ErrInvalidLengthImages | ||
1022 | } | ||
1023 | if (iNdEx + skippy) > l { | ||
1024 | @@ -2296,10 +2281,7 @@ func (m *UpdateImageRequest) Unmarshal(dAtA []byte) error { | ||
1025 | if err != nil { | ||
1026 | return err | ||
1027 | } | ||
1028 | - if skippy < 0 { | ||
1029 | - return ErrInvalidLengthImages | ||
1030 | - } | ||
1031 | - if (iNdEx + skippy) < 0 { | ||
1032 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1033 | return ErrInvalidLengthImages | ||
1034 | } | ||
1035 | if (iNdEx + skippy) > l { | ||
1036 | @@ -2383,10 +2365,7 @@ func (m *UpdateImageResponse) Unmarshal(dAtA []byte) error { | ||
1037 | if err != nil { | ||
1038 | return err | ||
1039 | } | ||
1040 | - if skippy < 0 { | ||
1041 | - return ErrInvalidLengthImages | ||
1042 | - } | ||
1043 | - if (iNdEx + skippy) < 0 { | ||
1044 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1045 | return ErrInvalidLengthImages | ||
1046 | } | ||
1047 | if (iNdEx + skippy) > l { | ||
1048 | @@ -2469,10 +2448,7 @@ func (m *ListImagesRequest) Unmarshal(dAtA []byte) error { | ||
1049 | if err != nil { | ||
1050 | return err | ||
1051 | } | ||
1052 | - if skippy < 0 { | ||
1053 | - return ErrInvalidLengthImages | ||
1054 | - } | ||
1055 | - if (iNdEx + skippy) < 0 { | ||
1056 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1057 | return ErrInvalidLengthImages | ||
1058 | } | ||
1059 | if (iNdEx + skippy) > l { | ||
1060 | @@ -2557,10 +2533,7 @@ func (m *ListImagesResponse) Unmarshal(dAtA []byte) error { | ||
1061 | if err != nil { | ||
1062 | return err | ||
1063 | } | ||
1064 | - if skippy < 0 { | ||
1065 | - return ErrInvalidLengthImages | ||
1066 | - } | ||
1067 | - if (iNdEx + skippy) < 0 { | ||
1068 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1069 | return ErrInvalidLengthImages | ||
1070 | } | ||
1071 | if (iNdEx + skippy) > l { | ||
1072 | @@ -2663,10 +2636,7 @@ func (m *DeleteImageRequest) Unmarshal(dAtA []byte) error { | ||
1073 | if err != nil { | ||
1074 | return err | ||
1075 | } | ||
1076 | - if skippy < 0 { | ||
1077 | - return ErrInvalidLengthImages | ||
1078 | - } | ||
1079 | - if (iNdEx + skippy) < 0 { | ||
1080 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1081 | return ErrInvalidLengthImages | ||
1082 | } | ||
1083 | if (iNdEx + skippy) > l { | ||
1084 | diff --git a/src/import/api/services/introspection/v1/introspection.pb.go b/src/import/api/services/introspection/v1/introspection.pb.go | ||
1085 | index b9f912b09..d23c8b61a 100644 | ||
1086 | --- a/src/import/api/services/introspection/v1/introspection.pb.go | ||
1087 | +++ b/src/import/api/services/introspection/v1/introspection.pb.go | ||
1088 | @@ -1098,7 +1098,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error { | ||
1089 | if err != nil { | ||
1090 | return err | ||
1091 | } | ||
1092 | - if skippy < 0 { | ||
1093 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1094 | return ErrInvalidLengthIntrospection | ||
1095 | } | ||
1096 | if (iNdEx + skippy) > postIndex { | ||
1097 | @@ -1183,10 +1183,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error { | ||
1098 | if err != nil { | ||
1099 | return err | ||
1100 | } | ||
1101 | - if skippy < 0 { | ||
1102 | - return ErrInvalidLengthIntrospection | ||
1103 | - } | ||
1104 | - if (iNdEx + skippy) < 0 { | ||
1105 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1106 | return ErrInvalidLengthIntrospection | ||
1107 | } | ||
1108 | if (iNdEx + skippy) > l { | ||
1109 | @@ -1269,10 +1266,7 @@ func (m *PluginsRequest) Unmarshal(dAtA []byte) error { | ||
1110 | if err != nil { | ||
1111 | return err | ||
1112 | } | ||
1113 | - if skippy < 0 { | ||
1114 | - return ErrInvalidLengthIntrospection | ||
1115 | - } | ||
1116 | - if (iNdEx + skippy) < 0 { | ||
1117 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1118 | return ErrInvalidLengthIntrospection | ||
1119 | } | ||
1120 | if (iNdEx + skippy) > l { | ||
1121 | @@ -1357,10 +1351,7 @@ func (m *PluginsResponse) Unmarshal(dAtA []byte) error { | ||
1122 | if err != nil { | ||
1123 | return err | ||
1124 | } | ||
1125 | - if skippy < 0 { | ||
1126 | - return ErrInvalidLengthIntrospection | ||
1127 | - } | ||
1128 | - if (iNdEx + skippy) < 0 { | ||
1129 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1130 | return ErrInvalidLengthIntrospection | ||
1131 | } | ||
1132 | if (iNdEx + skippy) > l { | ||
1133 | @@ -1443,10 +1434,7 @@ func (m *ServerResponse) Unmarshal(dAtA []byte) error { | ||
1134 | if err != nil { | ||
1135 | return err | ||
1136 | } | ||
1137 | - if skippy < 0 { | ||
1138 | - return ErrInvalidLengthIntrospection | ||
1139 | - } | ||
1140 | - if (iNdEx + skippy) < 0 { | ||
1141 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1142 | return ErrInvalidLengthIntrospection | ||
1143 | } | ||
1144 | if (iNdEx + skippy) > l { | ||
1145 | diff --git a/src/import/api/services/leases/v1/leases.pb.go b/src/import/api/services/leases/v1/leases.pb.go | ||
1146 | index 4dbac3e09..5e7cab71f 100644 | ||
1147 | --- a/src/import/api/services/leases/v1/leases.pb.go | ||
1148 | +++ b/src/import/api/services/leases/v1/leases.pb.go | ||
1149 | @@ -1906,7 +1906,7 @@ func (m *Lease) Unmarshal(dAtA []byte) error { | ||
1150 | if err != nil { | ||
1151 | return err | ||
1152 | } | ||
1153 | - if skippy < 0 { | ||
1154 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1155 | return ErrInvalidLengthLeases | ||
1156 | } | ||
1157 | if (iNdEx + skippy) > postIndex { | ||
1158 | @@ -1923,10 +1923,7 @@ func (m *Lease) Unmarshal(dAtA []byte) error { | ||
1159 | if err != nil { | ||
1160 | return err | ||
1161 | } | ||
1162 | - if skippy < 0 { | ||
1163 | - return ErrInvalidLengthLeases | ||
1164 | - } | ||
1165 | - if (iNdEx + skippy) < 0 { | ||
1166 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1167 | return ErrInvalidLengthLeases | ||
1168 | } | ||
1169 | if (iNdEx + skippy) > l { | ||
1170 | @@ -2119,7 +2116,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { | ||
1171 | if err != nil { | ||
1172 | return err | ||
1173 | } | ||
1174 | - if skippy < 0 { | ||
1175 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1176 | return ErrInvalidLengthLeases | ||
1177 | } | ||
1178 | if (iNdEx + skippy) > postIndex { | ||
1179 | @@ -2136,10 +2133,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { | ||
1180 | if err != nil { | ||
1181 | return err | ||
1182 | } | ||
1183 | - if skippy < 0 { | ||
1184 | - return ErrInvalidLengthLeases | ||
1185 | - } | ||
1186 | - if (iNdEx + skippy) < 0 { | ||
1187 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1188 | return ErrInvalidLengthLeases | ||
1189 | } | ||
1190 | if (iNdEx + skippy) > l { | ||
1191 | @@ -2226,10 +2220,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { | ||
1192 | if err != nil { | ||
1193 | return err | ||
1194 | } | ||
1195 | - if skippy < 0 { | ||
1196 | - return ErrInvalidLengthLeases | ||
1197 | - } | ||
1198 | - if (iNdEx + skippy) < 0 { | ||
1199 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1200 | return ErrInvalidLengthLeases | ||
1201 | } | ||
1202 | if (iNdEx + skippy) > l { | ||
1203 | @@ -2332,10 +2323,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { | ||
1204 | if err != nil { | ||
1205 | return err | ||
1206 | } | ||
1207 | - if skippy < 0 { | ||
1208 | - return ErrInvalidLengthLeases | ||
1209 | - } | ||
1210 | - if (iNdEx + skippy) < 0 { | ||
1211 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1212 | return ErrInvalidLengthLeases | ||
1213 | } | ||
1214 | if (iNdEx + skippy) > l { | ||
1215 | @@ -2418,10 +2406,7 @@ func (m *ListRequest) Unmarshal(dAtA []byte) error { | ||
1216 | if err != nil { | ||
1217 | return err | ||
1218 | } | ||
1219 | - if skippy < 0 { | ||
1220 | - return ErrInvalidLengthLeases | ||
1221 | - } | ||
1222 | - if (iNdEx + skippy) < 0 { | ||
1223 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1224 | return ErrInvalidLengthLeases | ||
1225 | } | ||
1226 | if (iNdEx + skippy) > l { | ||
1227 | @@ -2506,10 +2491,7 @@ func (m *ListResponse) Unmarshal(dAtA []byte) error { | ||
1228 | if err != nil { | ||
1229 | return err | ||
1230 | } | ||
1231 | - if skippy < 0 { | ||
1232 | - return ErrInvalidLengthLeases | ||
1233 | - } | ||
1234 | - if (iNdEx + skippy) < 0 { | ||
1235 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1236 | return ErrInvalidLengthLeases | ||
1237 | } | ||
1238 | if (iNdEx + skippy) > l { | ||
1239 | @@ -2624,10 +2606,7 @@ func (m *Resource) Unmarshal(dAtA []byte) error { | ||
1240 | if err != nil { | ||
1241 | return err | ||
1242 | } | ||
1243 | - if skippy < 0 { | ||
1244 | - return ErrInvalidLengthLeases | ||
1245 | - } | ||
1246 | - if (iNdEx + skippy) < 0 { | ||
1247 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1248 | return ErrInvalidLengthLeases | ||
1249 | } | ||
1250 | if (iNdEx + skippy) > l { | ||
1251 | @@ -2743,10 +2722,7 @@ func (m *AddResourceRequest) Unmarshal(dAtA []byte) error { | ||
1252 | if err != nil { | ||
1253 | return err | ||
1254 | } | ||
1255 | - if skippy < 0 { | ||
1256 | - return ErrInvalidLengthLeases | ||
1257 | - } | ||
1258 | - if (iNdEx + skippy) < 0 { | ||
1259 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1260 | return ErrInvalidLengthLeases | ||
1261 | } | ||
1262 | if (iNdEx + skippy) > l { | ||
1263 | @@ -2862,10 +2838,7 @@ func (m *DeleteResourceRequest) Unmarshal(dAtA []byte) error { | ||
1264 | if err != nil { | ||
1265 | return err | ||
1266 | } | ||
1267 | - if skippy < 0 { | ||
1268 | - return ErrInvalidLengthLeases | ||
1269 | - } | ||
1270 | - if (iNdEx + skippy) < 0 { | ||
1271 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1272 | return ErrInvalidLengthLeases | ||
1273 | } | ||
1274 | if (iNdEx + skippy) > l { | ||
1275 | @@ -2948,10 +2921,7 @@ func (m *ListResourcesRequest) Unmarshal(dAtA []byte) error { | ||
1276 | if err != nil { | ||
1277 | return err | ||
1278 | } | ||
1279 | - if skippy < 0 { | ||
1280 | - return ErrInvalidLengthLeases | ||
1281 | - } | ||
1282 | - if (iNdEx + skippy) < 0 { | ||
1283 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1284 | return ErrInvalidLengthLeases | ||
1285 | } | ||
1286 | if (iNdEx + skippy) > l { | ||
1287 | @@ -3036,10 +3006,7 @@ func (m *ListResourcesResponse) Unmarshal(dAtA []byte) error { | ||
1288 | if err != nil { | ||
1289 | return err | ||
1290 | } | ||
1291 | - if skippy < 0 { | ||
1292 | - return ErrInvalidLengthLeases | ||
1293 | - } | ||
1294 | - if (iNdEx + skippy) < 0 { | ||
1295 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1296 | return ErrInvalidLengthLeases | ||
1297 | } | ||
1298 | if (iNdEx + skippy) > l { | ||
1299 | diff --git a/src/import/api/services/namespaces/v1/namespace.pb.go b/src/import/api/services/namespaces/v1/namespace.pb.go | ||
1300 | index 0d1d650ba..76f9e1172 100644 | ||
1301 | --- a/src/import/api/services/namespaces/v1/namespace.pb.go | ||
1302 | +++ b/src/import/api/services/namespaces/v1/namespace.pb.go | ||
1303 | @@ -1609,7 +1609,7 @@ func (m *Namespace) Unmarshal(dAtA []byte) error { | ||
1304 | if err != nil { | ||
1305 | return err | ||
1306 | } | ||
1307 | - if skippy < 0 { | ||
1308 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1309 | return ErrInvalidLengthNamespace | ||
1310 | } | ||
1311 | if (iNdEx + skippy) > postIndex { | ||
1312 | @@ -1626,10 +1626,7 @@ func (m *Namespace) Unmarshal(dAtA []byte) error { | ||
1313 | if err != nil { | ||
1314 | return err | ||
1315 | } | ||
1316 | - if skippy < 0 { | ||
1317 | - return ErrInvalidLengthNamespace | ||
1318 | - } | ||
1319 | - if (iNdEx + skippy) < 0 { | ||
1320 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1321 | return ErrInvalidLengthNamespace | ||
1322 | } | ||
1323 | if (iNdEx + skippy) > l { | ||
1324 | @@ -1712,10 +1709,7 @@ func (m *GetNamespaceRequest) Unmarshal(dAtA []byte) error { | ||
1325 | if err != nil { | ||
1326 | return err | ||
1327 | } | ||
1328 | - if skippy < 0 { | ||
1329 | - return ErrInvalidLengthNamespace | ||
1330 | - } | ||
1331 | - if (iNdEx + skippy) < 0 { | ||
1332 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1333 | return ErrInvalidLengthNamespace | ||
1334 | } | ||
1335 | if (iNdEx + skippy) > l { | ||
1336 | @@ -1799,10 +1793,7 @@ func (m *GetNamespaceResponse) Unmarshal(dAtA []byte) error { | ||
1337 | if err != nil { | ||
1338 | return err | ||
1339 | } | ||
1340 | - if skippy < 0 { | ||
1341 | - return ErrInvalidLengthNamespace | ||
1342 | - } | ||
1343 | - if (iNdEx + skippy) < 0 { | ||
1344 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1345 | return ErrInvalidLengthNamespace | ||
1346 | } | ||
1347 | if (iNdEx + skippy) > l { | ||
1348 | @@ -1885,10 +1876,7 @@ func (m *ListNamespacesRequest) Unmarshal(dAtA []byte) error { | ||
1349 | if err != nil { | ||
1350 | return err | ||
1351 | } | ||
1352 | - if skippy < 0 { | ||
1353 | - return ErrInvalidLengthNamespace | ||
1354 | - } | ||
1355 | - if (iNdEx + skippy) < 0 { | ||
1356 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1357 | return ErrInvalidLengthNamespace | ||
1358 | } | ||
1359 | if (iNdEx + skippy) > l { | ||
1360 | @@ -1973,10 +1961,7 @@ func (m *ListNamespacesResponse) Unmarshal(dAtA []byte) error { | ||
1361 | if err != nil { | ||
1362 | return err | ||
1363 | } | ||
1364 | - if skippy < 0 { | ||
1365 | - return ErrInvalidLengthNamespace | ||
1366 | - } | ||
1367 | - if (iNdEx + skippy) < 0 { | ||
1368 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1369 | return ErrInvalidLengthNamespace | ||
1370 | } | ||
1371 | if (iNdEx + skippy) > l { | ||
1372 | @@ -2060,10 +2045,7 @@ func (m *CreateNamespaceRequest) Unmarshal(dAtA []byte) error { | ||
1373 | if err != nil { | ||
1374 | return err | ||
1375 | } | ||
1376 | - if skippy < 0 { | ||
1377 | - return ErrInvalidLengthNamespace | ||
1378 | - } | ||
1379 | - if (iNdEx + skippy) < 0 { | ||
1380 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1381 | return ErrInvalidLengthNamespace | ||
1382 | } | ||
1383 | if (iNdEx + skippy) > l { | ||
1384 | @@ -2147,10 +2129,7 @@ func (m *CreateNamespaceResponse) Unmarshal(dAtA []byte) error { | ||
1385 | if err != nil { | ||
1386 | return err | ||
1387 | } | ||
1388 | - if skippy < 0 { | ||
1389 | - return ErrInvalidLengthNamespace | ||
1390 | - } | ||
1391 | - if (iNdEx + skippy) < 0 { | ||
1392 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1393 | return ErrInvalidLengthNamespace | ||
1394 | } | ||
1395 | if (iNdEx + skippy) > l { | ||
1396 | @@ -2270,10 +2249,7 @@ func (m *UpdateNamespaceRequest) Unmarshal(dAtA []byte) error { | ||
1397 | if err != nil { | ||
1398 | return err | ||
1399 | } | ||
1400 | - if skippy < 0 { | ||
1401 | - return ErrInvalidLengthNamespace | ||
1402 | - } | ||
1403 | - if (iNdEx + skippy) < 0 { | ||
1404 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1405 | return ErrInvalidLengthNamespace | ||
1406 | } | ||
1407 | if (iNdEx + skippy) > l { | ||
1408 | @@ -2357,10 +2333,7 @@ func (m *UpdateNamespaceResponse) Unmarshal(dAtA []byte) error { | ||
1409 | if err != nil { | ||
1410 | return err | ||
1411 | } | ||
1412 | - if skippy < 0 { | ||
1413 | - return ErrInvalidLengthNamespace | ||
1414 | - } | ||
1415 | - if (iNdEx + skippy) < 0 { | ||
1416 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1417 | return ErrInvalidLengthNamespace | ||
1418 | } | ||
1419 | if (iNdEx + skippy) > l { | ||
1420 | @@ -2443,10 +2416,7 @@ func (m *DeleteNamespaceRequest) Unmarshal(dAtA []byte) error { | ||
1421 | if err != nil { | ||
1422 | return err | ||
1423 | } | ||
1424 | - if skippy < 0 { | ||
1425 | - return ErrInvalidLengthNamespace | ||
1426 | - } | ||
1427 | - if (iNdEx + skippy) < 0 { | ||
1428 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1429 | return ErrInvalidLengthNamespace | ||
1430 | } | ||
1431 | if (iNdEx + skippy) > l { | ||
1432 | diff --git a/src/import/api/services/snapshots/v1/snapshots.pb.go b/src/import/api/services/snapshots/v1/snapshots.pb.go | ||
1433 | index 1877afded..046c97b01 100644 | ||
1434 | --- a/src/import/api/services/snapshots/v1/snapshots.pb.go | ||
1435 | +++ b/src/import/api/services/snapshots/v1/snapshots.pb.go | ||
1436 | @@ -3140,7 +3140,7 @@ func (m *PrepareSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1437 | if err != nil { | ||
1438 | return err | ||
1439 | } | ||
1440 | - if skippy < 0 { | ||
1441 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1442 | return ErrInvalidLengthSnapshots | ||
1443 | } | ||
1444 | if (iNdEx + skippy) > postIndex { | ||
1445 | @@ -3157,10 +3157,7 @@ func (m *PrepareSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1446 | if err != nil { | ||
1447 | return err | ||
1448 | } | ||
1449 | - if skippy < 0 { | ||
1450 | - return ErrInvalidLengthSnapshots | ||
1451 | - } | ||
1452 | - if (iNdEx + skippy) < 0 { | ||
1453 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1454 | return ErrInvalidLengthSnapshots | ||
1455 | } | ||
1456 | if (iNdEx + skippy) > l { | ||
1457 | @@ -3245,10 +3242,7 @@ func (m *PrepareSnapshotResponse) Unmarshal(dAtA []byte) error { | ||
1458 | if err != nil { | ||
1459 | return err | ||
1460 | } | ||
1461 | - if skippy < 0 { | ||
1462 | - return ErrInvalidLengthSnapshots | ||
1463 | - } | ||
1464 | - if (iNdEx + skippy) < 0 { | ||
1465 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1466 | return ErrInvalidLengthSnapshots | ||
1467 | } | ||
1468 | if (iNdEx + skippy) > l { | ||
1469 | @@ -3505,7 +3499,7 @@ func (m *ViewSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1470 | if err != nil { | ||
1471 | return err | ||
1472 | } | ||
1473 | - if skippy < 0 { | ||
1474 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1475 | return ErrInvalidLengthSnapshots | ||
1476 | } | ||
1477 | if (iNdEx + skippy) > postIndex { | ||
1478 | @@ -3522,10 +3516,7 @@ func (m *ViewSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1479 | if err != nil { | ||
1480 | return err | ||
1481 | } | ||
1482 | - if skippy < 0 { | ||
1483 | - return ErrInvalidLengthSnapshots | ||
1484 | - } | ||
1485 | - if (iNdEx + skippy) < 0 { | ||
1486 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1487 | return ErrInvalidLengthSnapshots | ||
1488 | } | ||
1489 | if (iNdEx + skippy) > l { | ||
1490 | @@ -3610,10 +3601,7 @@ func (m *ViewSnapshotResponse) Unmarshal(dAtA []byte) error { | ||
1491 | if err != nil { | ||
1492 | return err | ||
1493 | } | ||
1494 | - if skippy < 0 { | ||
1495 | - return ErrInvalidLengthSnapshots | ||
1496 | - } | ||
1497 | - if (iNdEx + skippy) < 0 { | ||
1498 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1499 | return ErrInvalidLengthSnapshots | ||
1500 | } | ||
1501 | if (iNdEx + skippy) > l { | ||
1502 | @@ -3728,10 +3716,7 @@ func (m *MountsRequest) Unmarshal(dAtA []byte) error { | ||
1503 | if err != nil { | ||
1504 | return err | ||
1505 | } | ||
1506 | - if skippy < 0 { | ||
1507 | - return ErrInvalidLengthSnapshots | ||
1508 | - } | ||
1509 | - if (iNdEx + skippy) < 0 { | ||
1510 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1511 | return ErrInvalidLengthSnapshots | ||
1512 | } | ||
1513 | if (iNdEx + skippy) > l { | ||
1514 | @@ -3816,10 +3801,7 @@ func (m *MountsResponse) Unmarshal(dAtA []byte) error { | ||
1515 | if err != nil { | ||
1516 | return err | ||
1517 | } | ||
1518 | - if skippy < 0 { | ||
1519 | - return ErrInvalidLengthSnapshots | ||
1520 | - } | ||
1521 | - if (iNdEx + skippy) < 0 { | ||
1522 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1523 | return ErrInvalidLengthSnapshots | ||
1524 | } | ||
1525 | if (iNdEx + skippy) > l { | ||
1526 | @@ -3934,10 +3916,7 @@ func (m *RemoveSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1527 | if err != nil { | ||
1528 | return err | ||
1529 | } | ||
1530 | - if skippy < 0 { | ||
1531 | - return ErrInvalidLengthSnapshots | ||
1532 | - } | ||
1533 | - if (iNdEx + skippy) < 0 { | ||
1534 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1535 | return ErrInvalidLengthSnapshots | ||
1536 | } | ||
1537 | if (iNdEx + skippy) > l { | ||
1538 | @@ -4194,7 +4173,7 @@ func (m *CommitSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1539 | if err != nil { | ||
1540 | return err | ||
1541 | } | ||
1542 | - if skippy < 0 { | ||
1543 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1544 | return ErrInvalidLengthSnapshots | ||
1545 | } | ||
1546 | if (iNdEx + skippy) > postIndex { | ||
1547 | @@ -4211,10 +4190,7 @@ func (m *CommitSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1548 | if err != nil { | ||
1549 | return err | ||
1550 | } | ||
1551 | - if skippy < 0 { | ||
1552 | - return ErrInvalidLengthSnapshots | ||
1553 | - } | ||
1554 | - if (iNdEx + skippy) < 0 { | ||
1555 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1556 | return ErrInvalidLengthSnapshots | ||
1557 | } | ||
1558 | if (iNdEx + skippy) > l { | ||
1559 | @@ -4329,10 +4305,7 @@ func (m *StatSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1560 | if err != nil { | ||
1561 | return err | ||
1562 | } | ||
1563 | - if skippy < 0 { | ||
1564 | - return ErrInvalidLengthSnapshots | ||
1565 | - } | ||
1566 | - if (iNdEx + skippy) < 0 { | ||
1567 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1568 | return ErrInvalidLengthSnapshots | ||
1569 | } | ||
1570 | if (iNdEx + skippy) > l { | ||
1571 | @@ -4642,7 +4615,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | ||
1572 | if err != nil { | ||
1573 | return err | ||
1574 | } | ||
1575 | - if skippy < 0 { | ||
1576 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1577 | return ErrInvalidLengthSnapshots | ||
1578 | } | ||
1579 | if (iNdEx + skippy) > postIndex { | ||
1580 | @@ -4659,10 +4632,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | ||
1581 | if err != nil { | ||
1582 | return err | ||
1583 | } | ||
1584 | - if skippy < 0 { | ||
1585 | - return ErrInvalidLengthSnapshots | ||
1586 | - } | ||
1587 | - if (iNdEx + skippy) < 0 { | ||
1588 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1589 | return ErrInvalidLengthSnapshots | ||
1590 | } | ||
1591 | if (iNdEx + skippy) > l { | ||
1592 | @@ -4746,10 +4716,7 @@ func (m *StatSnapshotResponse) Unmarshal(dAtA []byte) error { | ||
1593 | if err != nil { | ||
1594 | return err | ||
1595 | } | ||
1596 | - if skippy < 0 { | ||
1597 | - return ErrInvalidLengthSnapshots | ||
1598 | - } | ||
1599 | - if (iNdEx + skippy) < 0 { | ||
1600 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1601 | return ErrInvalidLengthSnapshots | ||
1602 | } | ||
1603 | if (iNdEx + skippy) > l { | ||
1604 | @@ -4901,10 +4868,7 @@ func (m *UpdateSnapshotRequest) Unmarshal(dAtA []byte) error { | ||
1605 | if err != nil { | ||
1606 | return err | ||
1607 | } | ||
1608 | - if skippy < 0 { | ||
1609 | - return ErrInvalidLengthSnapshots | ||
1610 | - } | ||
1611 | - if (iNdEx + skippy) < 0 { | ||
1612 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1613 | return ErrInvalidLengthSnapshots | ||
1614 | } | ||
1615 | if (iNdEx + skippy) > l { | ||
1616 | @@ -4988,10 +4952,7 @@ func (m *UpdateSnapshotResponse) Unmarshal(dAtA []byte) error { | ||
1617 | if err != nil { | ||
1618 | return err | ||
1619 | } | ||
1620 | - if skippy < 0 { | ||
1621 | - return ErrInvalidLengthSnapshots | ||
1622 | - } | ||
1623 | - if (iNdEx + skippy) < 0 { | ||
1624 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1625 | return ErrInvalidLengthSnapshots | ||
1626 | } | ||
1627 | if (iNdEx + skippy) > l { | ||
1628 | @@ -5106,10 +5067,7 @@ func (m *ListSnapshotsRequest) Unmarshal(dAtA []byte) error { | ||
1629 | if err != nil { | ||
1630 | return err | ||
1631 | } | ||
1632 | - if skippy < 0 { | ||
1633 | - return ErrInvalidLengthSnapshots | ||
1634 | - } | ||
1635 | - if (iNdEx + skippy) < 0 { | ||
1636 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1637 | return ErrInvalidLengthSnapshots | ||
1638 | } | ||
1639 | if (iNdEx + skippy) > l { | ||
1640 | @@ -5194,10 +5152,7 @@ func (m *ListSnapshotsResponse) Unmarshal(dAtA []byte) error { | ||
1641 | if err != nil { | ||
1642 | return err | ||
1643 | } | ||
1644 | - if skippy < 0 { | ||
1645 | - return ErrInvalidLengthSnapshots | ||
1646 | - } | ||
1647 | - if (iNdEx + skippy) < 0 { | ||
1648 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1649 | return ErrInvalidLengthSnapshots | ||
1650 | } | ||
1651 | if (iNdEx + skippy) > l { | ||
1652 | @@ -5312,10 +5267,7 @@ func (m *UsageRequest) Unmarshal(dAtA []byte) error { | ||
1653 | if err != nil { | ||
1654 | return err | ||
1655 | } | ||
1656 | - if skippy < 0 { | ||
1657 | - return ErrInvalidLengthSnapshots | ||
1658 | - } | ||
1659 | - if (iNdEx + skippy) < 0 { | ||
1660 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1661 | return ErrInvalidLengthSnapshots | ||
1662 | } | ||
1663 | if (iNdEx + skippy) > l { | ||
1664 | @@ -5404,10 +5356,7 @@ func (m *UsageResponse) Unmarshal(dAtA []byte) error { | ||
1665 | if err != nil { | ||
1666 | return err | ||
1667 | } | ||
1668 | - if skippy < 0 { | ||
1669 | - return ErrInvalidLengthSnapshots | ||
1670 | - } | ||
1671 | - if (iNdEx + skippy) < 0 { | ||
1672 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1673 | return ErrInvalidLengthSnapshots | ||
1674 | } | ||
1675 | if (iNdEx + skippy) > l { | ||
1676 | @@ -5490,10 +5439,7 @@ func (m *CleanupRequest) Unmarshal(dAtA []byte) error { | ||
1677 | if err != nil { | ||
1678 | return err | ||
1679 | } | ||
1680 | - if skippy < 0 { | ||
1681 | - return ErrInvalidLengthSnapshots | ||
1682 | - } | ||
1683 | - if (iNdEx + skippy) < 0 { | ||
1684 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1685 | return ErrInvalidLengthSnapshots | ||
1686 | } | ||
1687 | if (iNdEx + skippy) > l { | ||
1688 | diff --git a/src/import/api/services/tasks/v1/tasks.pb.go b/src/import/api/services/tasks/v1/tasks.pb.go | ||
1689 | index 5ac5af11b..4904e6508 100644 | ||
1690 | --- a/src/import/api/services/tasks/v1/tasks.pb.go | ||
1691 | +++ b/src/import/api/services/tasks/v1/tasks.pb.go | ||
1692 | @@ -9,6 +9,7 @@ import ( | ||
1693 | types "github.com/containerd/containerd/api/types" | ||
1694 | task "github.com/containerd/containerd/src/import/api/types/task" | ||
1695 | proto "github.com/gogo/protobuf/proto" | ||
1696 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" | ||
1697 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" | ||
1698 | types1 "github.com/gogo/protobuf/types" | ||
1699 | github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" | ||
1700 | @@ -934,11 +935,12 @@ func (m *CheckpointTaskResponse) XXX_DiscardUnknown() { | ||
1701 | var xxx_messageInfo_CheckpointTaskResponse proto.InternalMessageInfo | ||
1702 | |||
1703 | type UpdateTaskRequest struct { | ||
1704 | - ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` | ||
1705 | - Resources *types1.Any `protobuf:"bytes,2,opt,name=resources,proto3" json:"resources,omitempty"` | ||
1706 | - XXX_NoUnkeyedLiteral struct{} `json:"-"` | ||
1707 | - XXX_unrecognized []byte `json:"-"` | ||
1708 | - XXX_sizecache int32 `json:"-"` | ||
1709 | + ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` | ||
1710 | + Resources *types1.Any `protobuf:"bytes,2,opt,name=resources,proto3" json:"resources,omitempty"` | ||
1711 | + Annotations map[string]string `protobuf:"bytes,3,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` | ||
1712 | + XXX_NoUnkeyedLiteral struct{} `json:"-"` | ||
1713 | + XXX_unrecognized []byte `json:"-"` | ||
1714 | + XXX_sizecache int32 `json:"-"` | ||
1715 | } | ||
1716 | |||
1717 | func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } | ||
1718 | @@ -1155,6 +1157,7 @@ func init() { | ||
1719 | proto.RegisterType((*CheckpointTaskRequest)(nil), "containerd.services.tasks.v1.CheckpointTaskRequest") | ||
1720 | proto.RegisterType((*CheckpointTaskResponse)(nil), "containerd.services.tasks.v1.CheckpointTaskResponse") | ||
1721 | proto.RegisterType((*UpdateTaskRequest)(nil), "containerd.services.tasks.v1.UpdateTaskRequest") | ||
1722 | + proto.RegisterMapType((map[string]string)(nil), "containerd.services.tasks.v1.UpdateTaskRequest.AnnotationsEntry") | ||
1723 | proto.RegisterType((*MetricsRequest)(nil), "containerd.services.tasks.v1.MetricsRequest") | ||
1724 | proto.RegisterType((*MetricsResponse)(nil), "containerd.services.tasks.v1.MetricsResponse") | ||
1725 | proto.RegisterType((*WaitRequest)(nil), "containerd.services.tasks.v1.WaitRequest") | ||
1726 | @@ -1166,90 +1169,93 @@ func init() { | ||
1727 | } | ||
1728 | |||
1729 | var fileDescriptor_310e7127b8a26f14 = []byte{ | ||
1730 | - // 1318 bytes of a gzipped FileDescriptorProto | ||
1731 | - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4b, 0x6f, 0x1b, 0x45, | ||
1732 | - 0x1c, 0xef, 0xfa, 0xed, 0xbf, 0x93, 0x36, 0x59, 0xd2, 0x60, 0x96, 0x2a, 0x0e, 0xcb, 0xc5, 0x04, | ||
1733 | - 0xba, 0x4b, 0x5d, 0x54, 0x21, 0x5a, 0x21, 0x35, 0x0f, 0x22, 0x0b, 0xaa, 0xa6, 0xdb, 0x02, 0x55, | ||
1734 | - 0x25, 0x14, 0xb6, 0xbb, 0x13, 0x67, 0x14, 0x7b, 0x67, 0xbb, 0x33, 0x4e, 0x1b, 0x38, 0xc0, 0x47, | ||
1735 | - 0xe8, 0x95, 0x0b, 0x9f, 0x27, 0x47, 0x8e, 0x08, 0x55, 0x81, 0xfa, 0x5b, 0x70, 0x43, 0xf3, 0xd8, | ||
1736 | - 0xcd, 0xc6, 0x8e, 0xbd, 0x4e, 0xd3, 0x70, 0x69, 0x67, 0x66, 0xff, 0xaf, 0xf9, 0xcd, 0xff, 0xf1, | ||
1737 | - 0x73, 0x60, 0xb5, 0x83, 0xd9, 0x6e, 0xff, 0xa9, 0xe5, 0x91, 0x9e, 0xed, 0x91, 0x80, 0xb9, 0x38, | ||
1738 | - 0x40, 0x91, 0x9f, 0x5e, 0xba, 0x21, 0xb6, 0x29, 0x8a, 0xf6, 0xb1, 0x87, 0xa8, 0xcd, 0x5c, 0xba, | ||
1739 | - 0x47, 0xed, 0xfd, 0x1b, 0x72, 0x61, 0x85, 0x11, 0x61, 0x44, 0xbf, 0x76, 0x2c, 0x6d, 0xc5, 0x92, | ||
1740 | - 0x96, 0x14, 0xd8, 0xbf, 0x61, 0xbc, 0xdf, 0x21, 0xa4, 0xd3, 0x45, 0xb6, 0x90, 0x7d, 0xda, 0xdf, | ||
1741 | - 0xb1, 0x51, 0x2f, 0x64, 0x07, 0x52, 0xd5, 0x78, 0x6f, 0xf8, 0xa3, 0x1b, 0xc4, 0x9f, 0x16, 0x3a, | ||
1742 | - 0xa4, 0x43, 0xc4, 0xd2, 0xe6, 0x2b, 0x75, 0x7a, 0x6b, 0xaa, 0x78, 0xd9, 0x41, 0x88, 0xa8, 0xdd, | ||
1743 | - 0x23, 0xfd, 0x80, 0x29, 0xbd, 0xcf, 0xcf, 0xa2, 0x87, 0x58, 0x84, 0x3d, 0x75, 0x3b, 0xe3, 0xf6, | ||
1744 | - 0x19, 0x34, 0x7d, 0x44, 0xbd, 0x08, 0x87, 0x8c, 0x44, 0x4a, 0xf9, 0x8b, 0x33, 0x28, 0x73, 0xc4, | ||
1745 | - 0xc4, 0x3f, 0x4a, 0xb7, 0x31, 0x8c, 0x0d, 0xc3, 0x3d, 0x44, 0x99, 0xdb, 0x0b, 0xa5, 0x80, 0x79, | ||
1746 | - 0x98, 0x83, 0xf9, 0xb5, 0x08, 0xb9, 0x0c, 0x3d, 0x72, 0xe9, 0x9e, 0x83, 0x9e, 0xf5, 0x11, 0x65, | ||
1747 | - 0x7a, 0x0b, 0x66, 0x12, 0xf3, 0xdb, 0xd8, 0xaf, 0x6b, 0xcb, 0x5a, 0xb3, 0xba, 0x7a, 0x65, 0x70, | ||
1748 | - 0xd4, 0xa8, 0xad, 0xc5, 0xe7, 0xed, 0x75, 0xa7, 0x96, 0x08, 0xb5, 0x7d, 0xdd, 0x86, 0x52, 0x44, | ||
1749 | - 0x08, 0xdb, 0xa1, 0xf5, 0xfc, 0x72, 0xbe, 0x59, 0x6b, 0xbd, 0x6b, 0xa5, 0x9e, 0x54, 0x44, 0x67, | ||
1750 | - 0xdd, 0xe3, 0x60, 0x3a, 0x4a, 0x4c, 0x5f, 0x80, 0x22, 0x65, 0x3e, 0x0e, 0xea, 0x05, 0x6e, 0xdd, | ||
1751 | - 0x91, 0x1b, 0x7d, 0x11, 0x4a, 0x94, 0xf9, 0xa4, 0xcf, 0xea, 0x45, 0x71, 0xac, 0x76, 0xea, 0x1c, | ||
1752 | - 0x45, 0x51, 0xbd, 0x94, 0x9c, 0xa3, 0x28, 0xd2, 0x0d, 0xa8, 0x30, 0x14, 0xf5, 0x70, 0xe0, 0x76, | ||
1753 | - 0xeb, 0xe5, 0x65, 0xad, 0x59, 0x71, 0x92, 0xbd, 0x7e, 0x07, 0xc0, 0xdb, 0x45, 0xde, 0x5e, 0x48, | ||
1754 | - 0x70, 0xc0, 0xea, 0x95, 0x65, 0xad, 0x59, 0x6b, 0x5d, 0x1b, 0x0d, 0x6b, 0x3d, 0x41, 0xdc, 0x49, | ||
1755 | - 0xc9, 0xeb, 0x16, 0x94, 0x49, 0xc8, 0x30, 0x09, 0x68, 0xbd, 0x2a, 0x54, 0x17, 0x2c, 0x89, 0xa6, | ||
1756 | - 0x15, 0xa3, 0x69, 0xdd, 0x0d, 0x0e, 0x9c, 0x58, 0xc8, 0x7c, 0x02, 0x7a, 0x1a, 0x49, 0x1a, 0x92, | ||
1757 | - 0x80, 0xa2, 0x37, 0x82, 0x72, 0x0e, 0xf2, 0x21, 0xf6, 0xeb, 0xb9, 0x65, 0xad, 0x39, 0xeb, 0xf0, | ||
1758 | - 0xa5, 0xd9, 0x81, 0x99, 0x87, 0xcc, 0x8d, 0xd8, 0x79, 0x1e, 0xe8, 0x43, 0x28, 0xa3, 0x17, 0xc8, | ||
1759 | - 0xdb, 0x56, 0x96, 0xab, 0xab, 0x30, 0x38, 0x6a, 0x94, 0x36, 0x5e, 0x20, 0xaf, 0xbd, 0xee, 0x94, | ||
1760 | - 0xf8, 0xa7, 0xb6, 0x6f, 0x7e, 0x00, 0xb3, 0xca, 0x91, 0x8a, 0x5f, 0xc5, 0xa2, 0x1d, 0xc7, 0xb2, | ||
1761 | - 0x09, 0xf3, 0xeb, 0xa8, 0x8b, 0xce, 0x9d, 0x31, 0xe6, 0xef, 0x1a, 0x5c, 0x96, 0x96, 0x12, 0x6f, | ||
1762 | - 0x8b, 0x90, 0x4b, 0x94, 0x4b, 0x83, 0xa3, 0x46, 0xae, 0xbd, 0xee, 0xe4, 0xf0, 0x29, 0x88, 0xe8, | ||
1763 | - 0x0d, 0xa8, 0xa1, 0x17, 0x98, 0x6d, 0x53, 0xe6, 0xb2, 0x3e, 0xcf, 0x39, 0xfe, 0x05, 0xf8, 0xd1, | ||
1764 | - 0x43, 0x71, 0xa2, 0xdf, 0x85, 0x2a, 0xdf, 0x21, 0x7f, 0xdb, 0x65, 0x22, 0xc5, 0x6a, 0x2d, 0x63, | ||
1765 | - 0xe4, 0x01, 0x1f, 0xc5, 0xe5, 0xb0, 0x5a, 0x39, 0x3c, 0x6a, 0x5c, 0x7a, 0xf9, 0x77, 0x43, 0x73, | ||
1766 | - 0x2a, 0x52, 0xed, 0x2e, 0x33, 0x09, 0x2c, 0xc8, 0xf8, 0xb6, 0x22, 0xe2, 0x21, 0x4a, 0x2f, 0x1c, | ||
1767 | - 0x7d, 0x04, 0xb0, 0x89, 0x2e, 0xfe, 0x91, 0x37, 0xa0, 0x26, 0xdc, 0x28, 0xd0, 0x6f, 0x41, 0x39, | ||
1768 | - 0x94, 0x17, 0x14, 0x2e, 0x86, 0x6a, 0x64, 0xff, 0x86, 0x2a, 0x93, 0x18, 0x84, 0x58, 0xd8, 0x5c, | ||
1769 | - 0x81, 0xb9, 0x6f, 0x30, 0x65, 0x3c, 0x0d, 0x12, 0x68, 0x16, 0xa1, 0xb4, 0x83, 0xbb, 0x0c, 0x45, | ||
1770 | - 0x32, 0x5a, 0x47, 0xed, 0x78, 0xd2, 0xa4, 0x64, 0x93, 0xda, 0x28, 0x8a, 0x16, 0x5f, 0xd7, 0x44, | ||
1771 | - 0xc7, 0x98, 0xec, 0x56, 0x8a, 0x9a, 0x2f, 0x35, 0xa8, 0x7d, 0x8d, 0xbb, 0xdd, 0x8b, 0x06, 0x49, | ||
1772 | - 0x34, 0x1c, 0xdc, 0xe1, 0x6d, 0x45, 0xe6, 0x96, 0xda, 0xf1, 0x54, 0x74, 0xbb, 0x5d, 0x91, 0x51, | ||
1773 | - 0x15, 0x87, 0x2f, 0xcd, 0x7f, 0x35, 0xd0, 0xb9, 0xf2, 0x5b, 0xc8, 0x92, 0xa4, 0x27, 0xe6, 0x4e, | ||
1774 | - 0xef, 0x89, 0xf9, 0x31, 0x3d, 0xb1, 0x30, 0xb6, 0x27, 0x16, 0x87, 0x7a, 0x62, 0x13, 0x0a, 0x34, | ||
1775 | - 0x44, 0x9e, 0xe8, 0xa2, 0xe3, 0x5a, 0x9a, 0x90, 0x48, 0xa3, 0x54, 0x1e, 0x9b, 0x4a, 0x57, 0xe1, | ||
1776 | - 0x9d, 0x13, 0x57, 0x97, 0x2f, 0x6b, 0xfe, 0xa6, 0xc1, 0x9c, 0x83, 0x28, 0xfe, 0x09, 0x6d, 0xb1, | ||
1777 | - 0x83, 0x0b, 0x7f, 0xaa, 0x05, 0x28, 0x3e, 0xc7, 0x3e, 0xdb, 0x55, 0x2f, 0x25, 0x37, 0x1c, 0x9d, | ||
1778 | - 0x5d, 0x84, 0x3b, 0xbb, 0xb2, 0xfa, 0x67, 0x1d, 0xb5, 0x33, 0x7f, 0x81, 0xcb, 0x6b, 0x5d, 0x42, | ||
1779 | - 0x51, 0xfb, 0xfe, 0xff, 0x11, 0x98, 0x7c, 0xce, 0xbc, 0x78, 0x05, 0xb9, 0x31, 0xbf, 0x82, 0xb9, | ||
1780 | - 0x2d, 0xb7, 0x4f, 0xcf, 0xdd, 0x3f, 0x37, 0x61, 0xde, 0x41, 0xb4, 0xdf, 0x3b, 0xb7, 0xa1, 0x0d, | ||
1781 | - 0xb8, 0xc2, 0x8b, 0x73, 0x0b, 0xfb, 0xe7, 0x49, 0x5e, 0xd3, 0x91, 0xfd, 0x40, 0x9a, 0x51, 0x25, | ||
1782 | - 0xfe, 0x25, 0x54, 0x55, 0xbb, 0x40, 0x71, 0x99, 0x2f, 0x4f, 0x2a, 0xf3, 0x76, 0xb0, 0x43, 0x9c, | ||
1783 | - 0x63, 0x15, 0xf3, 0x95, 0x06, 0x57, 0xd7, 0x92, 0x99, 0x7c, 0x5e, 0x8e, 0xb2, 0x0d, 0xf3, 0xa1, | ||
1784 | - 0x1b, 0xa1, 0x80, 0x6d, 0xa7, 0x78, 0x81, 0x7c, 0xbe, 0x16, 0xef, 0xff, 0x7f, 0x1d, 0x35, 0x56, | ||
1785 | - 0x52, 0x6c, 0x8b, 0x84, 0x28, 0x48, 0xd4, 0xa9, 0xdd, 0x21, 0xd7, 0x7d, 0xdc, 0x41, 0x94, 0x59, | ||
1786 | - 0xeb, 0xe2, 0x3f, 0x67, 0x4e, 0x1a, 0x5b, 0x3b, 0x95, 0x33, 0xe4, 0xa7, 0xe1, 0x0c, 0x8f, 0x61, | ||
1787 | - 0x71, 0xf8, 0x76, 0x09, 0x70, 0xb5, 0x63, 0x26, 0x78, 0x6a, 0x87, 0x1c, 0x21, 0x2f, 0x69, 0x05, | ||
1788 | - 0xf3, 0x67, 0x98, 0xff, 0x36, 0xf4, 0xdf, 0x02, 0xaf, 0x6b, 0x41, 0x35, 0x42, 0x94, 0xf4, 0x23, | ||
1789 | - 0x0f, 0x51, 0x81, 0xd5, 0xb8, 0x4b, 0x1d, 0x8b, 0x99, 0x2b, 0x70, 0xf9, 0x9e, 0x24, 0xc0, 0xb1, | ||
1790 | - 0xe7, 0x3a, 0x94, 0xe5, 0x24, 0x90, 0x57, 0xa9, 0x3a, 0xf1, 0x96, 0x27, 0x5f, 0x22, 0x9b, 0xcc, | ||
1791 | - 0x85, 0xb2, 0xe2, 0xcf, 0xea, 0xde, 0xf5, 0x53, 0xb8, 0xa4, 0x10, 0x70, 0x62, 0x41, 0x73, 0x07, | ||
1792 | - 0x6a, 0xdf, 0xbb, 0xf8, 0xe2, 0x67, 0x67, 0x04, 0x33, 0xd2, 0x8f, 0x8a, 0x75, 0x88, 0x87, 0x68, | ||
1793 | - 0x93, 0x79, 0x48, 0xee, 0x4d, 0x78, 0x48, 0xeb, 0xd5, 0x0c, 0x14, 0xc5, 0xe4, 0xd4, 0xf7, 0xa0, | ||
1794 | - 0x24, 0x39, 0xa6, 0x6e, 0x5b, 0x93, 0x7e, 0x31, 0x59, 0x23, 0x9c, 0xde, 0xf8, 0x74, 0x7a, 0x05, | ||
1795 | - 0x75, 0xb5, 0x1f, 0xa1, 0x28, 0xb8, 0xa0, 0xbe, 0x32, 0x59, 0x35, 0xcd, 0x4c, 0x8d, 0x8f, 0xa7, | ||
1796 | - 0x92, 0x55, 0x1e, 0x3a, 0x50, 0x92, 0x04, 0x2b, 0xeb, 0x3a, 0x23, 0x84, 0xd3, 0xf8, 0x64, 0x1a, | ||
1797 | - 0x85, 0xc4, 0xd1, 0x33, 0x98, 0x3d, 0xc1, 0xe4, 0xf4, 0xd6, 0x34, 0xea, 0x27, 0x07, 0xfa, 0x19, | ||
1798 | - 0x5d, 0x3e, 0x81, 0xfc, 0x26, 0x62, 0x7a, 0x73, 0xb2, 0xd2, 0x31, 0xdd, 0x33, 0x3e, 0x9a, 0x42, | ||
1799 | - 0x32, 0xc1, 0xad, 0xc0, 0x3b, 0xad, 0x6e, 0x4d, 0x56, 0x19, 0x66, 0x67, 0x86, 0x3d, 0xb5, 0xbc, | ||
1800 | - 0x72, 0xd4, 0x86, 0x02, 0x27, 0x5b, 0x7a, 0x46, 0x6c, 0x29, 0x42, 0x66, 0x2c, 0x8e, 0x24, 0xf7, | ||
1801 | - 0x06, 0xff, 0xb1, 0xae, 0x6f, 0x41, 0x81, 0x97, 0x92, 0x9e, 0x91, 0x87, 0xa3, 0x44, 0x6a, 0xac, | ||
1802 | - 0xc5, 0x87, 0x50, 0x4d, 0x38, 0x46, 0x16, 0x14, 0xc3, 0x64, 0x64, 0xac, 0xd1, 0xfb, 0x50, 0x56, | ||
1803 | - 0xec, 0x40, 0xcf, 0x78, 0xef, 0x93, 0x24, 0x62, 0x82, 0xc1, 0xa2, 0x98, 0xf6, 0x59, 0x11, 0x0e, | ||
1804 | - 0x53, 0x82, 0xb1, 0x06, 0x1f, 0x40, 0x49, 0x8e, 0xfd, 0xac, 0xa2, 0x19, 0x21, 0x07, 0x63, 0x4d, | ||
1805 | - 0x62, 0xa8, 0xc4, 0x93, 0x5b, 0xbf, 0x9e, 0x9d, 0x23, 0x29, 0xa2, 0x60, 0x58, 0xd3, 0x8a, 0xab, | ||
1806 | - 0x8c, 0x7a, 0x0e, 0x90, 0x9a, 0x97, 0x37, 0x33, 0x20, 0x3e, 0x6d, 0xf2, 0x1b, 0x9f, 0x9d, 0x4d, | ||
1807 | - 0x49, 0x39, 0x7e, 0x00, 0x25, 0x39, 0x10, 0xb3, 0x60, 0x1b, 0x19, 0x9b, 0x63, 0x61, 0xdb, 0x81, | ||
1808 | - 0xb2, 0x1a, 0x5d, 0x59, 0xb9, 0x72, 0x72, 0x1a, 0x1a, 0xd7, 0xa7, 0x94, 0x56, 0xa1, 0xff, 0x00, | ||
1809 | - 0x05, 0x3e, 0x73, 0xb2, 0xaa, 0x30, 0x35, 0xff, 0x8c, 0x95, 0x69, 0x44, 0xa5, 0xf9, 0xd5, 0xef, | ||
1810 | - 0x0e, 0x5f, 0x2f, 0x5d, 0xfa, 0xf3, 0xf5, 0xd2, 0xa5, 0x5f, 0x07, 0x4b, 0xda, 0xe1, 0x60, 0x49, | ||
1811 | - 0xfb, 0x63, 0xb0, 0xa4, 0xfd, 0x33, 0x58, 0xd2, 0x9e, 0xdc, 0x79, 0xb3, 0xbf, 0xec, 0xdd, 0x16, | ||
1812 | - 0x8b, 0xc7, 0xb9, 0xa7, 0x25, 0x01, 0xd8, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x85, 0xa2, | ||
1813 | - 0x4f, 0xd1, 0x22, 0x14, 0x00, 0x00, | ||
1814 | + // 1376 bytes of a gzipped FileDescriptorProto | ||
1815 | + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0x45, | ||
1816 | + 0x14, 0xee, 0xfa, 0xee, 0xe3, 0xa4, 0x4d, 0x96, 0x34, 0x98, 0xa5, 0x8a, 0xc3, 0xf2, 0x62, 0x02, | ||
1817 | + 0x5d, 0x53, 0x17, 0x55, 0x55, 0x5b, 0x55, 0xe4, 0x46, 0x64, 0x41, 0xd5, 0x74, 0x5b, 0xa0, 0xaa, | ||
1818 | + 0x84, 0xc2, 0xc6, 0x3b, 0x71, 0x46, 0xb1, 0x77, 0xb6, 0x3b, 0xe3, 0xb4, 0xe6, 0x05, 0x7e, 0x42, | ||
1819 | + 0x5f, 0x79, 0x81, 0xbf, 0x93, 0x47, 0x1e, 0x11, 0xaa, 0x02, 0xf5, 0xbf, 0xe0, 0x0d, 0xcd, 0x65, | ||
1820 | + 0xd7, 0x1b, 0x3b, 0xf6, 0x3a, 0x4d, 0xc3, 0x4b, 0x32, 0x33, 0x7b, 0xce, 0x99, 0x33, 0xdf, 0xb9, | ||
1821 | + 0x7d, 0x09, 0xac, 0xb5, 0x30, 0xdb, 0xef, 0xee, 0x5a, 0x4d, 0xd2, 0xa9, 0x35, 0x89, 0xc7, 0x1c, | ||
1822 | + 0xec, 0xa1, 0xc0, 0x8d, 0x2f, 0x1d, 0x1f, 0xd7, 0x28, 0x0a, 0x0e, 0x71, 0x13, 0xd1, 0x1a, 0x73, | ||
1823 | + 0xe8, 0x01, 0xad, 0x1d, 0xde, 0x90, 0x0b, 0xcb, 0x0f, 0x08, 0x23, 0xfa, 0xb5, 0x81, 0xb4, 0x15, | ||
1824 | + 0x4a, 0x5a, 0x52, 0xe0, 0xf0, 0x86, 0xf1, 0x61, 0x8b, 0x90, 0x56, 0x1b, 0xd5, 0x84, 0xec, 0x6e, | ||
1825 | + 0x77, 0xaf, 0x86, 0x3a, 0x3e, 0xeb, 0x49, 0x55, 0xe3, 0x83, 0xe1, 0x8f, 0x8e, 0x17, 0x7e, 0x5a, | ||
1826 | + 0x68, 0x91, 0x16, 0x11, 0xcb, 0x1a, 0x5f, 0xa9, 0xd3, 0x5b, 0x53, 0xf9, 0xcb, 0x7a, 0x3e, 0xa2, | ||
1827 | + 0xb5, 0x0e, 0xe9, 0x7a, 0x4c, 0xe9, 0xdd, 0x3e, 0x8b, 0x1e, 0x62, 0x01, 0x6e, 0xaa, 0xd7, 0x19, | ||
1828 | + 0x77, 0xcf, 0xa0, 0xe9, 0x22, 0xda, 0x0c, 0xb0, 0xcf, 0x48, 0xa0, 0x94, 0xef, 0x9c, 0x41, 0x99, | ||
1829 | + 0x23, 0x26, 0x7e, 0x28, 0xdd, 0xca, 0x30, 0x36, 0x0c, 0x77, 0x10, 0x65, 0x4e, 0xc7, 0x97, 0x02, | ||
1830 | + 0xe6, 0x51, 0x0a, 0xe6, 0xd7, 0x03, 0xe4, 0x30, 0xf4, 0xc4, 0xa1, 0x07, 0x36, 0x7a, 0xde, 0x45, | ||
1831 | + 0x94, 0xe9, 0x75, 0x98, 0x89, 0xcc, 0xef, 0x60, 0xb7, 0xac, 0x2d, 0x6b, 0xd5, 0xe2, 0xda, 0x95, | ||
1832 | + 0xfe, 0x71, 0xa5, 0xb4, 0x1e, 0x9e, 0x37, 0x36, 0xec, 0x52, 0x24, 0xd4, 0x70, 0xf5, 0x1a, 0xe4, | ||
1833 | + 0x02, 0x42, 0xd8, 0x1e, 0x2d, 0xa7, 0x97, 0xd3, 0xd5, 0x52, 0xfd, 0x7d, 0x2b, 0x16, 0x52, 0xe1, | ||
1834 | + 0x9d, 0xf5, 0x80, 0x83, 0x69, 0x2b, 0x31, 0x7d, 0x01, 0xb2, 0x94, 0xb9, 0xd8, 0x2b, 0x67, 0xb8, | ||
1835 | + 0x75, 0x5b, 0x6e, 0xf4, 0x45, 0xc8, 0x51, 0xe6, 0x92, 0x2e, 0x2b, 0x67, 0xc5, 0xb1, 0xda, 0xa9, | ||
1836 | + 0x73, 0x14, 0x04, 0xe5, 0x5c, 0x74, 0x8e, 0x82, 0x40, 0x37, 0xa0, 0xc0, 0x50, 0xd0, 0xc1, 0x9e, | ||
1837 | + 0xd3, 0x2e, 0xe7, 0x97, 0xb5, 0x6a, 0xc1, 0x8e, 0xf6, 0xfa, 0x3d, 0x80, 0xe6, 0x3e, 0x6a, 0x1e, | ||
1838 | + 0xf8, 0x04, 0x7b, 0xac, 0x5c, 0x58, 0xd6, 0xaa, 0xa5, 0xfa, 0xb5, 0x51, 0xb7, 0x36, 0x22, 0xc4, | ||
1839 | + 0xed, 0x98, 0xbc, 0x6e, 0x41, 0x9e, 0xf8, 0x0c, 0x13, 0x8f, 0x96, 0x8b, 0x42, 0x75, 0xc1, 0x92, | ||
1840 | + 0x68, 0x5a, 0x21, 0x9a, 0xd6, 0xaa, 0xd7, 0xb3, 0x43, 0x21, 0xf3, 0x19, 0xe8, 0x71, 0x24, 0xa9, | ||
1841 | + 0x4f, 0x3c, 0x8a, 0xde, 0x0a, 0xca, 0x39, 0x48, 0xfb, 0xd8, 0x2d, 0xa7, 0x96, 0xb5, 0xea, 0xac, | ||
1842 | + 0xcd, 0x97, 0x66, 0x0b, 0x66, 0x1e, 0x33, 0x27, 0x60, 0xe7, 0x09, 0xd0, 0xc7, 0x90, 0x47, 0x2f, | ||
1843 | + 0x51, 0x73, 0x47, 0x59, 0x2e, 0xae, 0x41, 0xff, 0xb8, 0x92, 0xdb, 0x7c, 0x89, 0x9a, 0x8d, 0x0d, | ||
1844 | + 0x3b, 0xc7, 0x3f, 0x35, 0x5c, 0xf3, 0x23, 0x98, 0x55, 0x17, 0x29, 0xff, 0x95, 0x2f, 0xda, 0xc0, | ||
1845 | + 0x97, 0x2d, 0x98, 0xdf, 0x40, 0x6d, 0x74, 0xee, 0x8c, 0x31, 0x7f, 0xd3, 0xe0, 0xb2, 0xb4, 0x14, | ||
1846 | + 0xdd, 0xb6, 0x08, 0xa9, 0x48, 0x39, 0xd7, 0x3f, 0xae, 0xa4, 0x1a, 0x1b, 0x76, 0x0a, 0x9f, 0x82, | ||
1847 | + 0x88, 0x5e, 0x81, 0x12, 0x7a, 0x89, 0xd9, 0x0e, 0x65, 0x0e, 0xeb, 0xf2, 0x9c, 0xe3, 0x5f, 0x80, | ||
1848 | + 0x1f, 0x3d, 0x16, 0x27, 0xfa, 0x2a, 0x14, 0xf9, 0x0e, 0xb9, 0x3b, 0x0e, 0x13, 0x29, 0x56, 0xaa, | ||
1849 | + 0x1b, 0x23, 0x01, 0x7c, 0x12, 0x96, 0xc3, 0x5a, 0xe1, 0xe8, 0xb8, 0x72, 0xe9, 0xd5, 0xdf, 0x15, | ||
1850 | + 0xcd, 0x2e, 0x48, 0xb5, 0x55, 0x66, 0x12, 0x58, 0x90, 0xfe, 0x6d, 0x07, 0xa4, 0x89, 0x28, 0xbd, | ||
1851 | + 0x70, 0xf4, 0x11, 0xc0, 0x16, 0xba, 0xf8, 0x20, 0x6f, 0x42, 0x49, 0x5c, 0xa3, 0x40, 0xbf, 0x05, | ||
1852 | + 0x79, 0x5f, 0x3e, 0x50, 0x5c, 0x31, 0x54, 0x23, 0x87, 0x37, 0x54, 0x99, 0x84, 0x20, 0x84, 0xc2, | ||
1853 | + 0xe6, 0x0a, 0xcc, 0x7d, 0x83, 0x29, 0xe3, 0x69, 0x10, 0x41, 0xb3, 0x08, 0xb9, 0x3d, 0xdc, 0x66, | ||
1854 | + 0x28, 0x90, 0xde, 0xda, 0x6a, 0xc7, 0x93, 0x26, 0x26, 0x1b, 0xd5, 0x46, 0x56, 0xb4, 0xf8, 0xb2, | ||
1855 | + 0x26, 0x3a, 0xc6, 0xe4, 0x6b, 0xa5, 0xa8, 0xf9, 0x4a, 0x83, 0xd2, 0xd7, 0xb8, 0xdd, 0xbe, 0x68, | ||
1856 | + 0x90, 0x44, 0xc3, 0xc1, 0x2d, 0xde, 0x56, 0x64, 0x6e, 0xa9, 0x1d, 0x4f, 0x45, 0xa7, 0xdd, 0x16, | ||
1857 | + 0x19, 0x55, 0xb0, 0xf9, 0xd2, 0xfc, 0x57, 0x03, 0x9d, 0x2b, 0xbf, 0x83, 0x2c, 0x89, 0x7a, 0x62, | ||
1858 | + 0xea, 0xf4, 0x9e, 0x98, 0x1e, 0xd3, 0x13, 0x33, 0x63, 0x7b, 0x62, 0x76, 0xa8, 0x27, 0x56, 0x21, | ||
1859 | + 0x43, 0x7d, 0xd4, 0x14, 0x5d, 0x74, 0x5c, 0x4b, 0x13, 0x12, 0x71, 0x94, 0xf2, 0x63, 0x53, 0xe9, | ||
1860 | + 0x2a, 0xbc, 0x77, 0xe2, 0xe9, 0x32, 0xb2, 0xe6, 0xaf, 0x1a, 0xcc, 0xd9, 0x88, 0xe2, 0x9f, 0xd0, | ||
1861 | + 0x36, 0xeb, 0x5d, 0x78, 0xa8, 0x16, 0x20, 0xfb, 0x02, 0xbb, 0x6c, 0x5f, 0x45, 0x4a, 0x6e, 0x38, | ||
1862 | + 0x3a, 0xfb, 0x08, 0xb7, 0xf6, 0x65, 0xf5, 0xcf, 0xda, 0x6a, 0x67, 0xfe, 0x0c, 0x97, 0xd7, 0xdb, | ||
1863 | + 0x84, 0xa2, 0xc6, 0xc3, 0xff, 0xc3, 0x31, 0x19, 0xce, 0xb4, 0x88, 0x82, 0xdc, 0x98, 0x5f, 0xc1, | ||
1864 | + 0xdc, 0xb6, 0xd3, 0xa5, 0xe7, 0xee, 0x9f, 0x5b, 0x30, 0x6f, 0x23, 0xda, 0xed, 0x9c, 0xdb, 0xd0, | ||
1865 | + 0x26, 0x5c, 0xe1, 0xc5, 0xb9, 0x8d, 0xdd, 0xf3, 0x24, 0xaf, 0x69, 0xcb, 0x7e, 0x20, 0xcd, 0xa8, | ||
1866 | + 0x12, 0xbf, 0x0f, 0x45, 0xd5, 0x2e, 0x50, 0x58, 0xe6, 0xcb, 0x93, 0xca, 0xbc, 0xe1, 0xed, 0x11, | ||
1867 | + 0x7b, 0xa0, 0x62, 0xbe, 0xd6, 0xe0, 0xea, 0x7a, 0x34, 0x93, 0xcf, 0xcb, 0x51, 0x76, 0x60, 0xde, | ||
1868 | + 0x77, 0x02, 0xe4, 0xb1, 0x9d, 0x18, 0x2f, 0x90, 0xe1, 0xab, 0xf3, 0xfe, 0xff, 0xd7, 0x71, 0x65, | ||
1869 | + 0x25, 0xc6, 0xb6, 0x88, 0x8f, 0xbc, 0x48, 0x9d, 0xd6, 0x5a, 0xe4, 0xba, 0x8b, 0x5b, 0x88, 0x32, | ||
1870 | + 0x6b, 0x43, 0xfc, 0xb2, 0xe7, 0xa4, 0xb1, 0xf5, 0x53, 0x39, 0x43, 0x7a, 0x1a, 0xce, 0xf0, 0x14, | ||
1871 | + 0x16, 0x87, 0x5f, 0x17, 0x01, 0x57, 0x1a, 0x30, 0xc1, 0x53, 0x3b, 0xe4, 0x08, 0x79, 0x89, 0x2b, | ||
1872 | + 0x98, 0xbf, 0xa7, 0x60, 0xfe, 0x5b, 0xdf, 0x7d, 0x07, 0xc4, 0xae, 0x0e, 0xc5, 0x00, 0x51, 0xd2, | ||
1873 | + 0x0d, 0x9a, 0x88, 0x0a, 0xb0, 0xc6, 0xbd, 0x6a, 0x20, 0xa6, 0xef, 0x42, 0xc9, 0xf1, 0x3c, 0xc2, | ||
1874 | + 0x9c, 0x10, 0x0b, 0xee, 0xfd, 0x97, 0xd6, 0x24, 0x92, 0x6f, 0x8d, 0x78, 0x6b, 0xad, 0x0e, 0x4c, | ||
1875 | + 0x6c, 0x7a, 0x2c, 0xe8, 0xd9, 0x71, 0xa3, 0xc6, 0x7d, 0x98, 0x1b, 0x16, 0xe0, 0xcd, 0xf9, 0x00, | ||
1876 | + 0xf5, 0xd4, 0xec, 0xe1, 0x4b, 0x5e, 0x82, 0x87, 0x4e, 0xbb, 0x8b, 0xc2, 0x8e, 0x2a, 0x36, 0x77, | ||
1877 | + 0x52, 0xb7, 0x35, 0x73, 0x05, 0x2e, 0x3f, 0x90, 0x2c, 0x3d, 0x44, 0xa7, 0x0c, 0x79, 0x39, 0xae, | ||
1878 | + 0x24, 0xde, 0x45, 0x3b, 0xdc, 0xf2, 0x0a, 0x89, 0x64, 0xa3, 0xe1, 0x95, 0x57, 0x24, 0x5f, 0x05, | ||
1879 | + 0xa7, 0x7c, 0x0a, 0xe1, 0x15, 0x02, 0x76, 0x28, 0x68, 0xee, 0x41, 0xe9, 0x7b, 0x07, 0x5f, 0xfc, | ||
1880 | + 0x80, 0x0f, 0x60, 0x46, 0xde, 0xa3, 0x7c, 0x1d, 0x22, 0x4b, 0xda, 0x64, 0xb2, 0x94, 0x7a, 0x1b, | ||
1881 | + 0xb2, 0x54, 0x7f, 0x3d, 0x03, 0x59, 0x31, 0xde, 0xf5, 0x03, 0xc8, 0x49, 0x22, 0xac, 0xd7, 0x26, | ||
1882 | + 0x47, 0x7c, 0xe4, 0x0f, 0x0f, 0xe3, 0xf3, 0xe9, 0x15, 0xd4, 0xd3, 0x7e, 0x84, 0xac, 0x20, 0xac, | ||
1883 | + 0xfa, 0xca, 0x64, 0xd5, 0x38, 0x7d, 0x36, 0x3e, 0x9d, 0x4a, 0x56, 0xdd, 0xd0, 0x82, 0x9c, 0x64, | ||
1884 | + 0x81, 0x49, 0xcf, 0x19, 0x61, 0xc5, 0xc6, 0x67, 0xd3, 0x28, 0x44, 0x17, 0x3d, 0x87, 0xd9, 0x13, | ||
1885 | + 0x74, 0x53, 0xaf, 0x4f, 0xa3, 0x7e, 0x92, 0x75, 0x9c, 0xf1, 0xca, 0x67, 0x90, 0xde, 0x42, 0x4c, | ||
1886 | + 0xaf, 0x4e, 0x56, 0x1a, 0x70, 0x52, 0xe3, 0x93, 0x29, 0x24, 0x23, 0xdc, 0x32, 0x7c, 0x1c, 0xe8, | ||
1887 | + 0xd6, 0x64, 0x95, 0x61, 0x0a, 0x69, 0xd4, 0xa6, 0x96, 0x57, 0x17, 0x35, 0x20, 0xc3, 0x19, 0xa1, | ||
1888 | + 0x9e, 0xe0, 0x5b, 0x8c, 0x35, 0x1a, 0x8b, 0x23, 0xc9, 0xbd, 0xd9, 0xf1, 0x59, 0x4f, 0xdf, 0x86, | ||
1889 | + 0x0c, 0x2f, 0x25, 0x3d, 0x21, 0x0f, 0x47, 0xd9, 0xde, 0x58, 0x8b, 0x8f, 0xa1, 0x18, 0x11, 0xa1, | ||
1890 | + 0x24, 0x28, 0x86, 0x19, 0xd3, 0x58, 0xa3, 0x0f, 0x21, 0xaf, 0x28, 0x8c, 0x9e, 0x10, 0xef, 0x93, | ||
1891 | + 0x4c, 0x67, 0x82, 0xc1, 0xac, 0xa0, 0x24, 0x49, 0x1e, 0x0e, 0xf3, 0x96, 0xb1, 0x06, 0x1f, 0x41, | ||
1892 | + 0x4e, 0x72, 0x93, 0xa4, 0xa2, 0x19, 0x61, 0x30, 0x63, 0x4d, 0x62, 0x28, 0x84, 0xf4, 0x42, 0xbf, | ||
1893 | + 0x9e, 0x9c, 0x23, 0x31, 0x36, 0x63, 0x58, 0xd3, 0x8a, 0xab, 0x8c, 0x7a, 0x01, 0x10, 0x1b, 0xea, | ||
1894 | + 0x37, 0x13, 0x20, 0x3e, 0x8d, 0x9e, 0x18, 0x5f, 0x9c, 0x4d, 0x49, 0x5d, 0xfc, 0x08, 0x72, 0x72, | ||
1895 | + 0x0c, 0x26, 0xc1, 0x36, 0x32, 0x2c, 0xc7, 0xc2, 0xb6, 0x07, 0x79, 0x35, 0xba, 0x92, 0x72, 0xe5, | ||
1896 | + 0xe4, 0x34, 0x34, 0xae, 0x4f, 0x29, 0xad, 0x5c, 0xff, 0x01, 0x32, 0x7c, 0xe6, 0x24, 0x55, 0x61, | ||
1897 | + 0x6c, 0xfe, 0x19, 0x2b, 0xd3, 0x88, 0x4a, 0xf3, 0x6b, 0xdf, 0x1d, 0xbd, 0x59, 0xba, 0xf4, 0xe7, | ||
1898 | + 0x9b, 0xa5, 0x4b, 0xbf, 0xf4, 0x97, 0xb4, 0xa3, 0xfe, 0x92, 0xf6, 0x47, 0x7f, 0x49, 0xfb, 0xa7, | ||
1899 | + 0xbf, 0xa4, 0x3d, 0xbb, 0xf7, 0x76, 0xff, 0x7e, 0xbc, 0x2b, 0x16, 0x4f, 0x53, 0xbb, 0x39, 0x01, | ||
1900 | + 0xd8, 0xcd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x55, 0xbf, 0x54, 0xc7, 0x14, 0x00, 0x00, | ||
1901 | } | ||
1902 | |||
1903 | // Reference imports to suppress errors if they are not otherwise used. | ||
1904 | @@ -2943,6 +2949,25 @@ func (m *UpdateTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { | ||
1905 | i -= len(m.XXX_unrecognized) | ||
1906 | copy(dAtA[i:], m.XXX_unrecognized) | ||
1907 | } | ||
1908 | + if len(m.Annotations) > 0 { | ||
1909 | + for k := range m.Annotations { | ||
1910 | + v := m.Annotations[k] | ||
1911 | + baseI := i | ||
1912 | + i -= len(v) | ||
1913 | + copy(dAtA[i:], v) | ||
1914 | + i = encodeVarintTasks(dAtA, i, uint64(len(v))) | ||
1915 | + i-- | ||
1916 | + dAtA[i] = 0x12 | ||
1917 | + i -= len(k) | ||
1918 | + copy(dAtA[i:], k) | ||
1919 | + i = encodeVarintTasks(dAtA, i, uint64(len(k))) | ||
1920 | + i-- | ||
1921 | + dAtA[i] = 0xa | ||
1922 | + i = encodeVarintTasks(dAtA, i, uint64(baseI-i)) | ||
1923 | + i-- | ||
1924 | + dAtA[i] = 0x1a | ||
1925 | + } | ||
1926 | + } | ||
1927 | if m.Resources != nil { | ||
1928 | { | ||
1929 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) | ||
1930 | @@ -3611,6 +3636,14 @@ func (m *UpdateTaskRequest) Size() (n int) { | ||
1931 | l = m.Resources.Size() | ||
1932 | n += 1 + l + sovTasks(uint64(l)) | ||
1933 | } | ||
1934 | + if len(m.Annotations) > 0 { | ||
1935 | + for k, v := range m.Annotations { | ||
1936 | + _ = k | ||
1937 | + _ = v | ||
1938 | + mapEntrySize := 1 + len(k) + sovTasks(uint64(len(k))) + 1 + len(v) + sovTasks(uint64(len(v))) | ||
1939 | + n += mapEntrySize + 1 + sovTasks(uint64(mapEntrySize)) | ||
1940 | + } | ||
1941 | + } | ||
1942 | if m.XXX_unrecognized != nil { | ||
1943 | n += len(m.XXX_unrecognized) | ||
1944 | } | ||
1945 | @@ -3991,9 +4024,20 @@ func (this *UpdateTaskRequest) String() string { | ||
1946 | if this == nil { | ||
1947 | return "nil" | ||
1948 | } | ||
1949 | + keysForAnnotations := make([]string, 0, len(this.Annotations)) | ||
1950 | + for k, _ := range this.Annotations { | ||
1951 | + keysForAnnotations = append(keysForAnnotations, k) | ||
1952 | + } | ||
1953 | + github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations) | ||
1954 | + mapStringForAnnotations := "map[string]string{" | ||
1955 | + for _, k := range keysForAnnotations { | ||
1956 | + mapStringForAnnotations += fmt.Sprintf("%v: %v,", k, this.Annotations[k]) | ||
1957 | + } | ||
1958 | + mapStringForAnnotations += "}" | ||
1959 | s := strings.Join([]string{`&UpdateTaskRequest{`, | ||
1960 | `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, | ||
1961 | `Resources:` + strings.Replace(fmt.Sprintf("%v", this.Resources), "Any", "types1.Any", 1) + `,`, | ||
1962 | + `Annotations:` + mapStringForAnnotations + `,`, | ||
1963 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, | ||
1964 | `}`, | ||
1965 | }, "") | ||
1966 | @@ -4347,10 +4391,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | ||
1967 | if err != nil { | ||
1968 | return err | ||
1969 | } | ||
1970 | - if skippy < 0 { | ||
1971 | - return ErrInvalidLengthTasks | ||
1972 | - } | ||
1973 | - if (iNdEx + skippy) < 0 { | ||
1974 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1975 | return ErrInvalidLengthTasks | ||
1976 | } | ||
1977 | if (iNdEx + skippy) > l { | ||
1978 | @@ -4452,10 +4493,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | ||
1979 | if err != nil { | ||
1980 | return err | ||
1981 | } | ||
1982 | - if skippy < 0 { | ||
1983 | - return ErrInvalidLengthTasks | ||
1984 | - } | ||
1985 | - if (iNdEx + skippy) < 0 { | ||
1986 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1987 | return ErrInvalidLengthTasks | ||
1988 | } | ||
1989 | if (iNdEx + skippy) > l { | ||
1990 | @@ -4570,10 +4608,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | ||
1991 | if err != nil { | ||
1992 | return err | ||
1993 | } | ||
1994 | - if skippy < 0 { | ||
1995 | - return ErrInvalidLengthTasks | ||
1996 | - } | ||
1997 | - if (iNdEx + skippy) < 0 { | ||
1998 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
1999 | return ErrInvalidLengthTasks | ||
2000 | } | ||
2001 | if (iNdEx + skippy) > l { | ||
2002 | @@ -4643,10 +4678,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | ||
2003 | if err != nil { | ||
2004 | return err | ||
2005 | } | ||
2006 | - if skippy < 0 { | ||
2007 | - return ErrInvalidLengthTasks | ||
2008 | - } | ||
2009 | - if (iNdEx + skippy) < 0 { | ||
2010 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2011 | return ErrInvalidLengthTasks | ||
2012 | } | ||
2013 | if (iNdEx + skippy) > l { | ||
2014 | @@ -4729,10 +4761,7 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { | ||
2015 | if err != nil { | ||
2016 | return err | ||
2017 | } | ||
2018 | - if skippy < 0 { | ||
2019 | - return ErrInvalidLengthTasks | ||
2020 | - } | ||
2021 | - if (iNdEx + skippy) < 0 { | ||
2022 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2023 | return ErrInvalidLengthTasks | ||
2024 | } | ||
2025 | if (iNdEx + skippy) > l { | ||
2026 | @@ -4886,10 +4915,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | ||
2027 | if err != nil { | ||
2028 | return err | ||
2029 | } | ||
2030 | - if skippy < 0 { | ||
2031 | - return ErrInvalidLengthTasks | ||
2032 | - } | ||
2033 | - if (iNdEx + skippy) < 0 { | ||
2034 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2035 | return ErrInvalidLengthTasks | ||
2036 | } | ||
2037 | if (iNdEx + skippy) > l { | ||
2038 | @@ -5004,10 +5030,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { | ||
2039 | if err != nil { | ||
2040 | return err | ||
2041 | } | ||
2042 | - if skippy < 0 { | ||
2043 | - return ErrInvalidLengthTasks | ||
2044 | - } | ||
2045 | - if (iNdEx + skippy) < 0 { | ||
2046 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2047 | return ErrInvalidLengthTasks | ||
2048 | } | ||
2049 | if (iNdEx + skippy) > l { | ||
2050 | @@ -5122,10 +5145,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { | ||
2051 | if err != nil { | ||
2052 | return err | ||
2053 | } | ||
2054 | - if skippy < 0 { | ||
2055 | - return ErrInvalidLengthTasks | ||
2056 | - } | ||
2057 | - if (iNdEx + skippy) < 0 { | ||
2058 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2059 | return ErrInvalidLengthTasks | ||
2060 | } | ||
2061 | if (iNdEx + skippy) > l { | ||
2062 | @@ -5212,10 +5232,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { | ||
2063 | if err != nil { | ||
2064 | return err | ||
2065 | } | ||
2066 | - if skippy < 0 { | ||
2067 | - return ErrInvalidLengthTasks | ||
2068 | - } | ||
2069 | - if (iNdEx + skippy) < 0 { | ||
2070 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2071 | return ErrInvalidLengthTasks | ||
2072 | } | ||
2073 | if (iNdEx + skippy) > l { | ||
2074 | @@ -5298,10 +5315,7 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { | ||
2075 | if err != nil { | ||
2076 | return err | ||
2077 | } | ||
2078 | - if skippy < 0 { | ||
2079 | - return ErrInvalidLengthTasks | ||
2080 | - } | ||
2081 | - if (iNdEx + skippy) < 0 { | ||
2082 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2083 | return ErrInvalidLengthTasks | ||
2084 | } | ||
2085 | if (iNdEx + skippy) > l { | ||
2086 | @@ -5386,10 +5400,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { | ||
2087 | if err != nil { | ||
2088 | return err | ||
2089 | } | ||
2090 | - if skippy < 0 { | ||
2091 | - return ErrInvalidLengthTasks | ||
2092 | - } | ||
2093 | - if (iNdEx + skippy) < 0 { | ||
2094 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2095 | return ErrInvalidLengthTasks | ||
2096 | } | ||
2097 | if (iNdEx + skippy) > l { | ||
2098 | @@ -5543,10 +5554,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | ||
2099 | if err != nil { | ||
2100 | return err | ||
2101 | } | ||
2102 | - if skippy < 0 { | ||
2103 | - return ErrInvalidLengthTasks | ||
2104 | - } | ||
2105 | - if (iNdEx + skippy) < 0 { | ||
2106 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2107 | return ErrInvalidLengthTasks | ||
2108 | } | ||
2109 | if (iNdEx + skippy) > l { | ||
2110 | @@ -5813,10 +5821,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | ||
2111 | if err != nil { | ||
2112 | return err | ||
2113 | } | ||
2114 | - if skippy < 0 { | ||
2115 | - return ErrInvalidLengthTasks | ||
2116 | - } | ||
2117 | - if (iNdEx + skippy) < 0 { | ||
2118 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2119 | return ErrInvalidLengthTasks | ||
2120 | } | ||
2121 | if (iNdEx + skippy) > l { | ||
2122 | @@ -5867,10 +5872,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | ||
2123 | if err != nil { | ||
2124 | return err | ||
2125 | } | ||
2126 | - if skippy < 0 { | ||
2127 | - return ErrInvalidLengthTasks | ||
2128 | - } | ||
2129 | - if (iNdEx + skippy) < 0 { | ||
2130 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2131 | return ErrInvalidLengthTasks | ||
2132 | } | ||
2133 | if (iNdEx + skippy) > l { | ||
2134 | @@ -6023,10 +6025,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | ||
2135 | if err != nil { | ||
2136 | return err | ||
2137 | } | ||
2138 | - if skippy < 0 { | ||
2139 | - return ErrInvalidLengthTasks | ||
2140 | - } | ||
2141 | - if (iNdEx + skippy) < 0 { | ||
2142 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2143 | return ErrInvalidLengthTasks | ||
2144 | } | ||
2145 | if (iNdEx + skippy) > l { | ||
2146 | @@ -6161,10 +6160,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | ||
2147 | if err != nil { | ||
2148 | return err | ||
2149 | } | ||
2150 | - if skippy < 0 { | ||
2151 | - return ErrInvalidLengthTasks | ||
2152 | - } | ||
2153 | - if (iNdEx + skippy) < 0 { | ||
2154 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2155 | return ErrInvalidLengthTasks | ||
2156 | } | ||
2157 | if (iNdEx + skippy) > l { | ||
2158 | @@ -6247,10 +6243,7 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { | ||
2159 | if err != nil { | ||
2160 | return err | ||
2161 | } | ||
2162 | - if skippy < 0 { | ||
2163 | - return ErrInvalidLengthTasks | ||
2164 | - } | ||
2165 | - if (iNdEx + skippy) < 0 { | ||
2166 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2167 | return ErrInvalidLengthTasks | ||
2168 | } | ||
2169 | if (iNdEx + skippy) > l { | ||
2170 | @@ -6333,10 +6326,7 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { | ||
2171 | if err != nil { | ||
2172 | return err | ||
2173 | } | ||
2174 | - if skippy < 0 { | ||
2175 | - return ErrInvalidLengthTasks | ||
2176 | - } | ||
2177 | - if (iNdEx + skippy) < 0 { | ||
2178 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2179 | return ErrInvalidLengthTasks | ||
2180 | } | ||
2181 | if (iNdEx + skippy) > l { | ||
2182 | @@ -6419,10 +6409,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA []byte) error { | ||
2183 | if err != nil { | ||
2184 | return err | ||
2185 | } | ||
2186 | - if skippy < 0 { | ||
2187 | - return ErrInvalidLengthTasks | ||
2188 | - } | ||
2189 | - if (iNdEx + skippy) < 0 { | ||
2190 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2191 | return ErrInvalidLengthTasks | ||
2192 | } | ||
2193 | if (iNdEx + skippy) > l { | ||
2194 | @@ -6507,10 +6494,7 @@ func (m *ListPidsResponse) Unmarshal(dAtA []byte) error { | ||
2195 | if err != nil { | ||
2196 | return err | ||
2197 | } | ||
2198 | - if skippy < 0 { | ||
2199 | - return ErrInvalidLengthTasks | ||
2200 | - } | ||
2201 | - if (iNdEx + skippy) < 0 { | ||
2202 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2203 | return ErrInvalidLengthTasks | ||
2204 | } | ||
2205 | if (iNdEx + skippy) > l { | ||
2206 | @@ -6661,10 +6645,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | ||
2207 | if err != nil { | ||
2208 | return err | ||
2209 | } | ||
2210 | - if skippy < 0 { | ||
2211 | - return ErrInvalidLengthTasks | ||
2212 | - } | ||
2213 | - if (iNdEx + skippy) < 0 { | ||
2214 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2215 | return ErrInvalidLengthTasks | ||
2216 | } | ||
2217 | if (iNdEx + skippy) > l { | ||
2218 | @@ -6749,10 +6730,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { | ||
2219 | if err != nil { | ||
2220 | return err | ||
2221 | } | ||
2222 | - if skippy < 0 { | ||
2223 | - return ErrInvalidLengthTasks | ||
2224 | - } | ||
2225 | - if (iNdEx + skippy) < 0 { | ||
2226 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2227 | return ErrInvalidLengthTasks | ||
2228 | } | ||
2229 | if (iNdEx + skippy) > l { | ||
2230 | @@ -6865,16 +6843,140 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | ||
2231 | return err | ||
2232 | } | ||
2233 | iNdEx = postIndex | ||
2234 | + case 3: | ||
2235 | + if wireType != 2 { | ||
2236 | + return fmt.Errorf("proto: wrong wireType = %d for field Annotations", wireType) | ||
2237 | + } | ||
2238 | + var msglen int | ||
2239 | + for shift := uint(0); ; shift += 7 { | ||
2240 | + if shift >= 64 { | ||
2241 | + return ErrIntOverflowTasks | ||
2242 | + } | ||
2243 | + if iNdEx >= l { | ||
2244 | + return io.ErrUnexpectedEOF | ||
2245 | + } | ||
2246 | + b := dAtA[iNdEx] | ||
2247 | + iNdEx++ | ||
2248 | + msglen |= int(b&0x7F) << shift | ||
2249 | + if b < 0x80 { | ||
2250 | + break | ||
2251 | + } | ||
2252 | + } | ||
2253 | + if msglen < 0 { | ||
2254 | + return ErrInvalidLengthTasks | ||
2255 | + } | ||
2256 | + postIndex := iNdEx + msglen | ||
2257 | + if postIndex < 0 { | ||
2258 | + return ErrInvalidLengthTasks | ||
2259 | + } | ||
2260 | + if postIndex > l { | ||
2261 | + return io.ErrUnexpectedEOF | ||
2262 | + } | ||
2263 | + if m.Annotations == nil { | ||
2264 | + m.Annotations = make(map[string]string) | ||
2265 | + } | ||
2266 | + var mapkey string | ||
2267 | + var mapvalue string | ||
2268 | + for iNdEx < postIndex { | ||
2269 | + entryPreIndex := iNdEx | ||
2270 | + var wire uint64 | ||
2271 | + for shift := uint(0); ; shift += 7 { | ||
2272 | + if shift >= 64 { | ||
2273 | + return ErrIntOverflowTasks | ||
2274 | + } | ||
2275 | + if iNdEx >= l { | ||
2276 | + return io.ErrUnexpectedEOF | ||
2277 | + } | ||
2278 | + b := dAtA[iNdEx] | ||
2279 | + iNdEx++ | ||
2280 | + wire |= uint64(b&0x7F) << shift | ||
2281 | + if b < 0x80 { | ||
2282 | + break | ||
2283 | + } | ||
2284 | + } | ||
2285 | + fieldNum := int32(wire >> 3) | ||
2286 | + if fieldNum == 1 { | ||
2287 | + var stringLenmapkey uint64 | ||
2288 | + for shift := uint(0); ; shift += 7 { | ||
2289 | + if shift >= 64 { | ||
2290 | + return ErrIntOverflowTasks | ||
2291 | + } | ||
2292 | + if iNdEx >= l { | ||
2293 | + return io.ErrUnexpectedEOF | ||
2294 | + } | ||
2295 | + b := dAtA[iNdEx] | ||
2296 | + iNdEx++ | ||
2297 | + stringLenmapkey |= uint64(b&0x7F) << shift | ||
2298 | + if b < 0x80 { | ||
2299 | + break | ||
2300 | + } | ||
2301 | + } | ||
2302 | + intStringLenmapkey := int(stringLenmapkey) | ||
2303 | + if intStringLenmapkey < 0 { | ||
2304 | + return ErrInvalidLengthTasks | ||
2305 | + } | ||
2306 | + postStringIndexmapkey := iNdEx + intStringLenmapkey | ||
2307 | + if postStringIndexmapkey < 0 { | ||
2308 | + return ErrInvalidLengthTasks | ||
2309 | + } | ||
2310 | + if postStringIndexmapkey > l { | ||
2311 | + return io.ErrUnexpectedEOF | ||
2312 | + } | ||
2313 | + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) | ||
2314 | + iNdEx = postStringIndexmapkey | ||
2315 | + } else if fieldNum == 2 { | ||
2316 | + var stringLenmapvalue uint64 | ||
2317 | + for shift := uint(0); ; shift += 7 { | ||
2318 | + if shift >= 64 { | ||
2319 | + return ErrIntOverflowTasks | ||
2320 | + } | ||
2321 | + if iNdEx >= l { | ||
2322 | + return io.ErrUnexpectedEOF | ||
2323 | + } | ||
2324 | + b := dAtA[iNdEx] | ||
2325 | + iNdEx++ | ||
2326 | + stringLenmapvalue |= uint64(b&0x7F) << shift | ||
2327 | + if b < 0x80 { | ||
2328 | + break | ||
2329 | + } | ||
2330 | + } | ||
2331 | + intStringLenmapvalue := int(stringLenmapvalue) | ||
2332 | + if intStringLenmapvalue < 0 { | ||
2333 | + return ErrInvalidLengthTasks | ||
2334 | + } | ||
2335 | + postStringIndexmapvalue := iNdEx + intStringLenmapvalue | ||
2336 | + if postStringIndexmapvalue < 0 { | ||
2337 | + return ErrInvalidLengthTasks | ||
2338 | + } | ||
2339 | + if postStringIndexmapvalue > l { | ||
2340 | + return io.ErrUnexpectedEOF | ||
2341 | + } | ||
2342 | + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) | ||
2343 | + iNdEx = postStringIndexmapvalue | ||
2344 | + } else { | ||
2345 | + iNdEx = entryPreIndex | ||
2346 | + skippy, err := skipTasks(dAtA[iNdEx:]) | ||
2347 | + if err != nil { | ||
2348 | + return err | ||
2349 | + } | ||
2350 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2351 | + return ErrInvalidLengthTasks | ||
2352 | + } | ||
2353 | + if (iNdEx + skippy) > postIndex { | ||
2354 | + return io.ErrUnexpectedEOF | ||
2355 | + } | ||
2356 | + iNdEx += skippy | ||
2357 | + } | ||
2358 | + } | ||
2359 | + m.Annotations[mapkey] = mapvalue | ||
2360 | + iNdEx = postIndex | ||
2361 | default: | ||
2362 | iNdEx = preIndex | ||
2363 | skippy, err := skipTasks(dAtA[iNdEx:]) | ||
2364 | if err != nil { | ||
2365 | return err | ||
2366 | } | ||
2367 | - if skippy < 0 { | ||
2368 | - return ErrInvalidLengthTasks | ||
2369 | - } | ||
2370 | - if (iNdEx + skippy) < 0 { | ||
2371 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2372 | return ErrInvalidLengthTasks | ||
2373 | } | ||
2374 | if (iNdEx + skippy) > l { | ||
2375 | @@ -6957,10 +7059,7 @@ func (m *MetricsRequest) Unmarshal(dAtA []byte) error { | ||
2376 | if err != nil { | ||
2377 | return err | ||
2378 | } | ||
2379 | - if skippy < 0 { | ||
2380 | - return ErrInvalidLengthTasks | ||
2381 | - } | ||
2382 | - if (iNdEx + skippy) < 0 { | ||
2383 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2384 | return ErrInvalidLengthTasks | ||
2385 | } | ||
2386 | if (iNdEx + skippy) > l { | ||
2387 | @@ -7045,10 +7144,7 @@ func (m *MetricsResponse) Unmarshal(dAtA []byte) error { | ||
2388 | if err != nil { | ||
2389 | return err | ||
2390 | } | ||
2391 | - if skippy < 0 { | ||
2392 | - return ErrInvalidLengthTasks | ||
2393 | - } | ||
2394 | - if (iNdEx + skippy) < 0 { | ||
2395 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2396 | return ErrInvalidLengthTasks | ||
2397 | } | ||
2398 | if (iNdEx + skippy) > l { | ||
2399 | @@ -7163,10 +7259,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | ||
2400 | if err != nil { | ||
2401 | return err | ||
2402 | } | ||
2403 | - if skippy < 0 { | ||
2404 | - return ErrInvalidLengthTasks | ||
2405 | - } | ||
2406 | - if (iNdEx + skippy) < 0 { | ||
2407 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2408 | return ErrInvalidLengthTasks | ||
2409 | } | ||
2410 | if (iNdEx + skippy) > l { | ||
2411 | @@ -7269,10 +7362,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | ||
2412 | if err != nil { | ||
2413 | return err | ||
2414 | } | ||
2415 | - if skippy < 0 { | ||
2416 | - return ErrInvalidLengthTasks | ||
2417 | - } | ||
2418 | - if (iNdEx + skippy) < 0 { | ||
2419 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2420 | return ErrInvalidLengthTasks | ||
2421 | } | ||
2422 | if (iNdEx + skippy) > l { | ||
2423 | diff --git a/src/import/api/services/ttrpc/events/v1/events.pb.go b/src/import/api/services/ttrpc/events/v1/events.pb.go | ||
2424 | index 0e61351d5..b1f275bf0 100644 | ||
2425 | --- a/src/import/api/services/ttrpc/events/v1/events.pb.go | ||
2426 | +++ b/src/import/api/services/ttrpc/events/v1/events.pb.go | ||
2427 | @@ -474,10 +474,7 @@ func (m *ForwardRequest) Unmarshal(dAtA []byte) error { | ||
2428 | if err != nil { | ||
2429 | return err | ||
2430 | } | ||
2431 | - if skippy < 0 { | ||
2432 | - return ErrInvalidLengthEvents | ||
2433 | - } | ||
2434 | - if (iNdEx + skippy) < 0 { | ||
2435 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2436 | return ErrInvalidLengthEvents | ||
2437 | } | ||
2438 | if (iNdEx + skippy) > l { | ||
2439 | @@ -661,10 +658,7 @@ func (m *Envelope) Unmarshal(dAtA []byte) error { | ||
2440 | if err != nil { | ||
2441 | return err | ||
2442 | } | ||
2443 | - if skippy < 0 { | ||
2444 | - return ErrInvalidLengthEvents | ||
2445 | - } | ||
2446 | - if (iNdEx + skippy) < 0 { | ||
2447 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2448 | return ErrInvalidLengthEvents | ||
2449 | } | ||
2450 | if (iNdEx + skippy) > l { | ||
2451 | diff --git a/src/import/api/services/version/v1/version.pb.go b/src/import/api/services/version/v1/version.pb.go | ||
2452 | index 81b8c3395..b742c6ae6 100644 | ||
2453 | --- a/src/import/api/services/version/v1/version.pb.go | ||
2454 | +++ b/src/import/api/services/version/v1/version.pb.go | ||
2455 | @@ -374,10 +374,7 @@ func (m *VersionResponse) Unmarshal(dAtA []byte) error { | ||
2456 | if err != nil { | ||
2457 | return err | ||
2458 | } | ||
2459 | - if skippy < 0 { | ||
2460 | - return ErrInvalidLengthVersion | ||
2461 | - } | ||
2462 | - if (iNdEx + skippy) < 0 { | ||
2463 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2464 | return ErrInvalidLengthVersion | ||
2465 | } | ||
2466 | if (iNdEx + skippy) > l { | ||
2467 | diff --git a/src/import/api/types/descriptor.pb.go b/src/import/api/types/descriptor.pb.go | ||
2468 | index 437d41f23..fe71dbf43 100644 | ||
2469 | --- a/src/import/api/types/descriptor.pb.go | ||
2470 | +++ b/src/import/api/types/descriptor.pb.go | ||
2471 | @@ -479,7 +479,7 @@ func (m *Descriptor) Unmarshal(dAtA []byte) error { | ||
2472 | if err != nil { | ||
2473 | return err | ||
2474 | } | ||
2475 | - if skippy < 0 { | ||
2476 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2477 | return ErrInvalidLengthDescriptor | ||
2478 | } | ||
2479 | if (iNdEx + skippy) > postIndex { | ||
2480 | @@ -496,10 +496,7 @@ func (m *Descriptor) Unmarshal(dAtA []byte) error { | ||
2481 | if err != nil { | ||
2482 | return err | ||
2483 | } | ||
2484 | - if skippy < 0 { | ||
2485 | - return ErrInvalidLengthDescriptor | ||
2486 | - } | ||
2487 | - if (iNdEx + skippy) < 0 { | ||
2488 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2489 | return ErrInvalidLengthDescriptor | ||
2490 | } | ||
2491 | if (iNdEx + skippy) > l { | ||
2492 | diff --git a/src/import/api/types/metrics.pb.go b/src/import/api/types/metrics.pb.go | ||
2493 | index 89a8d9cd6..75773e442 100644 | ||
2494 | --- a/src/import/api/types/metrics.pb.go | ||
2495 | +++ b/src/import/api/types/metrics.pb.go | ||
2496 | @@ -348,10 +348,7 @@ func (m *Metric) Unmarshal(dAtA []byte) error { | ||
2497 | if err != nil { | ||
2498 | return err | ||
2499 | } | ||
2500 | - if skippy < 0 { | ||
2501 | - return ErrInvalidLengthMetrics | ||
2502 | - } | ||
2503 | - if (iNdEx + skippy) < 0 { | ||
2504 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2505 | return ErrInvalidLengthMetrics | ||
2506 | } | ||
2507 | if (iNdEx + skippy) > l { | ||
2508 | diff --git a/src/import/api/types/mount.pb.go b/src/import/api/types/mount.pb.go | ||
2509 | index 6872e4120..d0a0bee76 100644 | ||
2510 | --- a/src/import/api/types/mount.pb.go | ||
2511 | +++ b/src/import/api/types/mount.pb.go | ||
2512 | @@ -392,10 +392,7 @@ func (m *Mount) Unmarshal(dAtA []byte) error { | ||
2513 | if err != nil { | ||
2514 | return err | ||
2515 | } | ||
2516 | - if skippy < 0 { | ||
2517 | - return ErrInvalidLengthMount | ||
2518 | - } | ||
2519 | - if (iNdEx + skippy) < 0 { | ||
2520 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2521 | return ErrInvalidLengthMount | ||
2522 | } | ||
2523 | if (iNdEx + skippy) > l { | ||
2524 | diff --git a/src/import/api/types/platform.pb.go b/src/import/api/types/platform.pb.go | ||
2525 | index c03d8b077..a0f78c8a7 100644 | ||
2526 | --- a/src/import/api/types/platform.pb.go | ||
2527 | +++ b/src/import/api/types/platform.pb.go | ||
2528 | @@ -333,10 +333,7 @@ func (m *Platform) Unmarshal(dAtA []byte) error { | ||
2529 | if err != nil { | ||
2530 | return err | ||
2531 | } | ||
2532 | - if skippy < 0 { | ||
2533 | - return ErrInvalidLengthPlatform | ||
2534 | - } | ||
2535 | - if (iNdEx + skippy) < 0 { | ||
2536 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2537 | return ErrInvalidLengthPlatform | ||
2538 | } | ||
2539 | if (iNdEx + skippy) > l { | ||
2540 | diff --git a/src/import/api/types/task/task.pb.go b/src/import/api/types/task/task.pb.go | ||
2541 | index ae824ff45..f511bbd05 100644 | ||
2542 | --- a/src/import/api/types/task/task.pb.go | ||
2543 | +++ b/src/import/api/types/task/task.pb.go | ||
2544 | @@ -772,10 +772,7 @@ func (m *Process) Unmarshal(dAtA []byte) error { | ||
2545 | if err != nil { | ||
2546 | return err | ||
2547 | } | ||
2548 | - if skippy < 0 { | ||
2549 | - return ErrInvalidLengthTask | ||
2550 | - } | ||
2551 | - if (iNdEx + skippy) < 0 { | ||
2552 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2553 | return ErrInvalidLengthTask | ||
2554 | } | ||
2555 | if (iNdEx + skippy) > l { | ||
2556 | @@ -881,10 +878,7 @@ func (m *ProcessInfo) Unmarshal(dAtA []byte) error { | ||
2557 | if err != nil { | ||
2558 | return err | ||
2559 | } | ||
2560 | - if skippy < 0 { | ||
2561 | - return ErrInvalidLengthTask | ||
2562 | - } | ||
2563 | - if (iNdEx + skippy) < 0 { | ||
2564 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2565 | return ErrInvalidLengthTask | ||
2566 | } | ||
2567 | if (iNdEx + skippy) > l { | ||
2568 | diff --git a/src/import/runtime/linux/runctypes/runc.pb.go b/src/import/runtime/linux/runctypes/runc.pb.go | ||
2569 | index 26306e594..46d31ff59 100644 | ||
2570 | --- a/src/import/runtime/linux/runctypes/runc.pb.go | ||
2571 | +++ b/src/import/runtime/linux/runctypes/runc.pb.go | ||
2572 | @@ -978,10 +978,7 @@ func (m *RuncOptions) Unmarshal(dAtA []byte) error { | ||
2573 | if err != nil { | ||
2574 | return err | ||
2575 | } | ||
2576 | - if skippy < 0 { | ||
2577 | - return ErrInvalidLengthRunc | ||
2578 | - } | ||
2579 | - if (iNdEx + skippy) < 0 { | ||
2580 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2581 | return ErrInvalidLengthRunc | ||
2582 | } | ||
2583 | if (iNdEx + skippy) > l { | ||
2584 | @@ -1350,10 +1347,7 @@ func (m *CreateOptions) Unmarshal(dAtA []byte) error { | ||
2585 | if err != nil { | ||
2586 | return err | ||
2587 | } | ||
2588 | - if skippy < 0 { | ||
2589 | - return ErrInvalidLengthRunc | ||
2590 | - } | ||
2591 | - if (iNdEx + skippy) < 0 { | ||
2592 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2593 | return ErrInvalidLengthRunc | ||
2594 | } | ||
2595 | if (iNdEx + skippy) > l { | ||
2596 | @@ -1632,10 +1626,7 @@ func (m *CheckpointOptions) Unmarshal(dAtA []byte) error { | ||
2597 | if err != nil { | ||
2598 | return err | ||
2599 | } | ||
2600 | - if skippy < 0 { | ||
2601 | - return ErrInvalidLengthRunc | ||
2602 | - } | ||
2603 | - if (iNdEx + skippy) < 0 { | ||
2604 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2605 | return ErrInvalidLengthRunc | ||
2606 | } | ||
2607 | if (iNdEx + skippy) > l { | ||
2608 | @@ -1718,10 +1709,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { | ||
2609 | if err != nil { | ||
2610 | return err | ||
2611 | } | ||
2612 | - if skippy < 0 { | ||
2613 | - return ErrInvalidLengthRunc | ||
2614 | - } | ||
2615 | - if (iNdEx + skippy) < 0 { | ||
2616 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2617 | return ErrInvalidLengthRunc | ||
2618 | } | ||
2619 | if (iNdEx + skippy) > l { | ||
2620 | diff --git a/src/import/runtime/v1/shim/v1/shim.pb.go b/src/import/runtime/v1/shim/v1/shim.pb.go | ||
2621 | index 27f334966..dbc82599d 100644 | ||
2622 | --- a/src/import/runtime/v1/shim/v1/shim.pb.go | ||
2623 | +++ b/src/import/runtime/v1/shim/v1/shim.pb.go | ||
2624 | @@ -3262,10 +3262,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | ||
2625 | if err != nil { | ||
2626 | return err | ||
2627 | } | ||
2628 | - if skippy < 0 { | ||
2629 | - return ErrInvalidLengthShim | ||
2630 | - } | ||
2631 | - if (iNdEx + skippy) < 0 { | ||
2632 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2633 | return ErrInvalidLengthShim | ||
2634 | } | ||
2635 | if (iNdEx + skippy) > l { | ||
2636 | @@ -3335,10 +3332,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | ||
2637 | if err != nil { | ||
2638 | return err | ||
2639 | } | ||
2640 | - if skippy < 0 { | ||
2641 | - return ErrInvalidLengthShim | ||
2642 | - } | ||
2643 | - if (iNdEx + skippy) < 0 { | ||
2644 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2645 | return ErrInvalidLengthShim | ||
2646 | } | ||
2647 | if (iNdEx + skippy) > l { | ||
2648 | @@ -3460,10 +3454,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | ||
2649 | if err != nil { | ||
2650 | return err | ||
2651 | } | ||
2652 | - if skippy < 0 { | ||
2653 | - return ErrInvalidLengthShim | ||
2654 | - } | ||
2655 | - if (iNdEx + skippy) < 0 { | ||
2656 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2657 | return ErrInvalidLengthShim | ||
2658 | } | ||
2659 | if (iNdEx + skippy) > l { | ||
2660 | @@ -3546,10 +3537,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { | ||
2661 | if err != nil { | ||
2662 | return err | ||
2663 | } | ||
2664 | - if skippy < 0 { | ||
2665 | - return ErrInvalidLengthShim | ||
2666 | - } | ||
2667 | - if (iNdEx + skippy) < 0 { | ||
2668 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2669 | return ErrInvalidLengthShim | ||
2670 | } | ||
2671 | if (iNdEx + skippy) > l { | ||
2672 | @@ -3784,10 +3772,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | ||
2673 | if err != nil { | ||
2674 | return err | ||
2675 | } | ||
2676 | - if skippy < 0 { | ||
2677 | - return ErrInvalidLengthShim | ||
2678 | - } | ||
2679 | - if (iNdEx + skippy) < 0 { | ||
2680 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2681 | return ErrInvalidLengthShim | ||
2682 | } | ||
2683 | if (iNdEx + skippy) > l { | ||
2684 | @@ -3838,10 +3823,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | ||
2685 | if err != nil { | ||
2686 | return err | ||
2687 | } | ||
2688 | - if skippy < 0 { | ||
2689 | - return ErrInvalidLengthShim | ||
2690 | - } | ||
2691 | - if (iNdEx + skippy) < 0 { | ||
2692 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2693 | return ErrInvalidLengthShim | ||
2694 | } | ||
2695 | if (iNdEx + skippy) > l { | ||
2696 | @@ -3962,10 +3944,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | ||
2697 | if err != nil { | ||
2698 | return err | ||
2699 | } | ||
2700 | - if skippy < 0 { | ||
2701 | - return ErrInvalidLengthShim | ||
2702 | - } | ||
2703 | - if (iNdEx + skippy) < 0 { | ||
2704 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2705 | return ErrInvalidLengthShim | ||
2706 | } | ||
2707 | if (iNdEx + skippy) > l { | ||
2708 | @@ -4048,10 +4027,7 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { | ||
2709 | if err != nil { | ||
2710 | return err | ||
2711 | } | ||
2712 | - if skippy < 0 { | ||
2713 | - return ErrInvalidLengthShim | ||
2714 | - } | ||
2715 | - if (iNdEx + skippy) < 0 { | ||
2716 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2717 | return ErrInvalidLengthShim | ||
2718 | } | ||
2719 | if (iNdEx + skippy) > l { | ||
2720 | @@ -4372,10 +4348,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { | ||
2721 | if err != nil { | ||
2722 | return err | ||
2723 | } | ||
2724 | - if skippy < 0 { | ||
2725 | - return ErrInvalidLengthShim | ||
2726 | - } | ||
2727 | - if (iNdEx + skippy) < 0 { | ||
2728 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2729 | return ErrInvalidLengthShim | ||
2730 | } | ||
2731 | if (iNdEx + skippy) > l { | ||
2732 | @@ -4497,10 +4470,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | ||
2733 | if err != nil { | ||
2734 | return err | ||
2735 | } | ||
2736 | - if skippy < 0 { | ||
2737 | - return ErrInvalidLengthShim | ||
2738 | - } | ||
2739 | - if (iNdEx + skippy) < 0 { | ||
2740 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2741 | return ErrInvalidLengthShim | ||
2742 | } | ||
2743 | if (iNdEx + skippy) > l { | ||
2744 | @@ -4603,10 +4573,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | ||
2745 | if err != nil { | ||
2746 | return err | ||
2747 | } | ||
2748 | - if skippy < 0 { | ||
2749 | - return ErrInvalidLengthShim | ||
2750 | - } | ||
2751 | - if (iNdEx + skippy) < 0 { | ||
2752 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2753 | return ErrInvalidLengthShim | ||
2754 | } | ||
2755 | if (iNdEx + skippy) > l { | ||
2756 | @@ -4689,10 +4656,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA []byte) error { | ||
2757 | if err != nil { | ||
2758 | return err | ||
2759 | } | ||
2760 | - if skippy < 0 { | ||
2761 | - return ErrInvalidLengthShim | ||
2762 | - } | ||
2763 | - if (iNdEx + skippy) < 0 { | ||
2764 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2765 | return ErrInvalidLengthShim | ||
2766 | } | ||
2767 | if (iNdEx + skippy) > l { | ||
2768 | @@ -4777,10 +4741,7 @@ func (m *ListPidsResponse) Unmarshal(dAtA []byte) error { | ||
2769 | if err != nil { | ||
2770 | return err | ||
2771 | } | ||
2772 | - if skippy < 0 { | ||
2773 | - return ErrInvalidLengthShim | ||
2774 | - } | ||
2775 | - if (iNdEx + skippy) < 0 { | ||
2776 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2777 | return ErrInvalidLengthShim | ||
2778 | } | ||
2779 | if (iNdEx + skippy) > l { | ||
2780 | @@ -4899,10 +4860,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | ||
2781 | if err != nil { | ||
2782 | return err | ||
2783 | } | ||
2784 | - if skippy < 0 { | ||
2785 | - return ErrInvalidLengthShim | ||
2786 | - } | ||
2787 | - if (iNdEx + skippy) < 0 { | ||
2788 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2789 | return ErrInvalidLengthShim | ||
2790 | } | ||
2791 | if (iNdEx + skippy) > l { | ||
2792 | @@ -4972,10 +4930,7 @@ func (m *ShimInfoResponse) Unmarshal(dAtA []byte) error { | ||
2793 | if err != nil { | ||
2794 | return err | ||
2795 | } | ||
2796 | - if skippy < 0 { | ||
2797 | - return ErrInvalidLengthShim | ||
2798 | - } | ||
2799 | - if (iNdEx + skippy) < 0 { | ||
2800 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2801 | return ErrInvalidLengthShim | ||
2802 | } | ||
2803 | if (iNdEx + skippy) > l { | ||
2804 | @@ -5062,10 +5017,7 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | ||
2805 | if err != nil { | ||
2806 | return err | ||
2807 | } | ||
2808 | - if skippy < 0 { | ||
2809 | - return ErrInvalidLengthShim | ||
2810 | - } | ||
2811 | - if (iNdEx + skippy) < 0 { | ||
2812 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2813 | return ErrInvalidLengthShim | ||
2814 | } | ||
2815 | if (iNdEx + skippy) > l { | ||
2816 | @@ -5148,10 +5100,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | ||
2817 | if err != nil { | ||
2818 | return err | ||
2819 | } | ||
2820 | - if skippy < 0 { | ||
2821 | - return ErrInvalidLengthShim | ||
2822 | - } | ||
2823 | - if (iNdEx + skippy) < 0 { | ||
2824 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2825 | return ErrInvalidLengthShim | ||
2826 | } | ||
2827 | if (iNdEx + skippy) > l { | ||
2828 | @@ -5253,10 +5202,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | ||
2829 | if err != nil { | ||
2830 | return err | ||
2831 | } | ||
2832 | - if skippy < 0 { | ||
2833 | - return ErrInvalidLengthShim | ||
2834 | - } | ||
2835 | - if (iNdEx + skippy) < 0 { | ||
2836 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2837 | return ErrInvalidLengthShim | ||
2838 | } | ||
2839 | if (iNdEx + skippy) > l { | ||
2840 | @@ -5339,10 +5285,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | ||
2841 | if err != nil { | ||
2842 | return err | ||
2843 | } | ||
2844 | - if skippy < 0 { | ||
2845 | - return ErrInvalidLengthShim | ||
2846 | - } | ||
2847 | - if (iNdEx + skippy) < 0 { | ||
2848 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2849 | return ErrInvalidLengthShim | ||
2850 | } | ||
2851 | if (iNdEx + skippy) > l { | ||
2852 | @@ -5445,10 +5388,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | ||
2853 | if err != nil { | ||
2854 | return err | ||
2855 | } | ||
2856 | - if skippy < 0 { | ||
2857 | - return ErrInvalidLengthShim | ||
2858 | - } | ||
2859 | - if (iNdEx + skippy) < 0 { | ||
2860 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2861 | return ErrInvalidLengthShim | ||
2862 | } | ||
2863 | if (iNdEx + skippy) > l { | ||
2864 | diff --git a/src/import/runtime/v2/runc/options/oci.pb.go b/src/import/runtime/v2/runc/options/oci.pb.go | ||
2865 | index f298452b6..c9c44742a 100644 | ||
2866 | --- a/src/import/runtime/v2/runc/options/oci.pb.go | ||
2867 | +++ b/src/import/runtime/v2/runc/options/oci.pb.go | ||
2868 | @@ -994,10 +994,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { | ||
2869 | if err != nil { | ||
2870 | return err | ||
2871 | } | ||
2872 | - if skippy < 0 { | ||
2873 | - return ErrInvalidLengthOci | ||
2874 | - } | ||
2875 | - if (iNdEx + skippy) < 0 { | ||
2876 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2877 | return ErrInvalidLengthOci | ||
2878 | } | ||
2879 | if (iNdEx + skippy) > l { | ||
2880 | @@ -1276,10 +1273,7 @@ func (m *CheckpointOptions) Unmarshal(dAtA []byte) error { | ||
2881 | if err != nil { | ||
2882 | return err | ||
2883 | } | ||
2884 | - if skippy < 0 { | ||
2885 | - return ErrInvalidLengthOci | ||
2886 | - } | ||
2887 | - if (iNdEx + skippy) < 0 { | ||
2888 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2889 | return ErrInvalidLengthOci | ||
2890 | } | ||
2891 | if (iNdEx + skippy) > l { | ||
2892 | @@ -1362,10 +1356,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { | ||
2893 | if err != nil { | ||
2894 | return err | ||
2895 | } | ||
2896 | - if skippy < 0 { | ||
2897 | - return ErrInvalidLengthOci | ||
2898 | - } | ||
2899 | - if (iNdEx + skippy) < 0 { | ||
2900 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
2901 | return ErrInvalidLengthOci | ||
2902 | } | ||
2903 | if (iNdEx + skippy) > l { | ||
2904 | diff --git a/src/import/runtime/v2/task/shim.pb.go b/src/import/runtime/v2/task/shim.pb.go | ||
2905 | index 3cf11d8e3..6366f9c57 100644 | ||
2906 | --- a/src/import/runtime/v2/task/shim.pb.go | ||
2907 | +++ b/src/import/runtime/v2/task/shim.pb.go | ||
2908 | @@ -10,6 +10,7 @@ import ( | ||
2909 | task "github.com/containerd/containerd/src/import/api/types/task" | ||
2910 | github_com_containerd_ttrpc "github.com/containerd/ttrpc" | ||
2911 | proto "github.com/gogo/protobuf/proto" | ||
2912 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" | ||
2913 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" | ||
2914 | types1 "github.com/gogo/protobuf/types" | ||
2915 | io "io" | ||
2916 | @@ -617,11 +618,12 @@ func (m *CheckpointTaskRequest) XXX_DiscardUnknown() { | ||
2917 | var xxx_messageInfo_CheckpointTaskRequest proto.InternalMessageInfo | ||
2918 | |||
2919 | type UpdateTaskRequest struct { | ||
2920 | - ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` | ||
2921 | - Resources *types1.Any `protobuf:"bytes,2,opt,name=resources,proto3" json:"resources,omitempty"` | ||
2922 | - XXX_NoUnkeyedLiteral struct{} `json:"-"` | ||
2923 | - XXX_unrecognized []byte `json:"-"` | ||
2924 | - XXX_sizecache int32 `json:"-"` | ||
2925 | + ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` | ||
2926 | + Resources *types1.Any `protobuf:"bytes,2,opt,name=resources,proto3" json:"resources,omitempty"` | ||
2927 | + Annotations map[string]string `protobuf:"bytes,3,rep,name=annotations,proto3" json:"annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` | ||
2928 | + XXX_NoUnkeyedLiteral struct{} `json:"-"` | ||
2929 | + XXX_unrecognized []byte `json:"-"` | ||
2930 | + XXX_sizecache int32 `json:"-"` | ||
2931 | } | ||
2932 | |||
2933 | func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } | ||
2934 | @@ -1107,6 +1109,7 @@ func init() { | ||
2935 | proto.RegisterType((*PidsResponse)(nil), "containerd.task.v2.PidsResponse") | ||
2936 | proto.RegisterType((*CheckpointTaskRequest)(nil), "containerd.task.v2.CheckpointTaskRequest") | ||
2937 | proto.RegisterType((*UpdateTaskRequest)(nil), "containerd.task.v2.UpdateTaskRequest") | ||
2938 | + proto.RegisterMapType((map[string]string)(nil), "containerd.task.v2.UpdateTaskRequest.AnnotationsEntry") | ||
2939 | proto.RegisterType((*StartRequest)(nil), "containerd.task.v2.StartRequest") | ||
2940 | proto.RegisterType((*StartResponse)(nil), "containerd.task.v2.StartResponse") | ||
2941 | proto.RegisterType((*WaitRequest)(nil), "containerd.task.v2.WaitRequest") | ||
2942 | @@ -1125,85 +1128,89 @@ func init() { | ||
2943 | } | ||
2944 | |||
2945 | var fileDescriptor_9202ee34bc3ad8ca = []byte{ | ||
2946 | - // 1246 bytes of a gzipped FileDescriptorProto | ||
2947 | - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x5d, 0x6f, 0x1b, 0x45, | ||
2948 | - 0x17, 0xee, 0xfa, 0x63, 0x6d, 0x1f, 0xd7, 0x69, 0x3a, 0x6f, 0x9a, 0x77, 0xeb, 0x4a, 0xb6, 0xbb, | ||
2949 | - 0xa5, 0xc1, 0x80, 0x64, 0x0b, 0x57, 0x70, 0x41, 0x24, 0x50, 0xbe, 0xa8, 0x4c, 0x0b, 0x89, 0xb6, | ||
2950 | - 0x45, 0x45, 0xdc, 0x58, 0x1b, 0xef, 0xc4, 0x5e, 0xc5, 0xde, 0x59, 0x76, 0x66, 0xf3, 0x81, 0x84, | ||
2951 | - 0xc4, 0x15, 0x17, 0x5c, 0xf1, 0xb3, 0x72, 0x89, 0xc4, 0x0d, 0x37, 0x04, 0xea, 0x7f, 0xc0, 0x3f, | ||
2952 | - 0x40, 0xf3, 0xe1, 0x78, 0xed, 0xec, 0xda, 0x49, 0xe5, 0x9b, 0x68, 0xce, 0xce, 0x33, 0x67, 0xe6, | ||
2953 | - 0x9c, 0x79, 0xce, 0x73, 0x26, 0x86, 0xcd, 0x9e, 0xcb, 0xfa, 0xe1, 0x61, 0xa3, 0x4b, 0x86, 0xcd, | ||
2954 | - 0x2e, 0xf1, 0x98, 0xed, 0x7a, 0x38, 0x70, 0xa2, 0xc3, 0x20, 0xf4, 0x98, 0x3b, 0xc4, 0xcd, 0x93, | ||
2955 | - 0x56, 0x93, 0xd9, 0xf4, 0xb8, 0x49, 0xfb, 0xee, 0xb0, 0xe1, 0x07, 0x84, 0x11, 0x84, 0x26, 0xb0, | ||
2956 | - 0x06, 0x9f, 0x6b, 0x9c, 0xb4, 0xca, 0x0f, 0x7b, 0x84, 0xf4, 0x06, 0xb8, 0x29, 0x10, 0x87, 0xe1, | ||
2957 | - 0x51, 0xd3, 0xf6, 0xce, 0x25, 0xbc, 0xfc, 0x68, 0x76, 0x0a, 0x0f, 0x7d, 0x36, 0x9e, 0x5c, 0xeb, | ||
2958 | - 0x91, 0x1e, 0x11, 0xc3, 0x26, 0x1f, 0xa9, 0xaf, 0xd5, 0xd9, 0x25, 0xfc, 0x28, 0x94, 0xd9, 0x43, | ||
2959 | - 0x5f, 0x01, 0x3e, 0x5d, 0x78, 0x7e, 0xdb, 0x77, 0x9b, 0xec, 0xdc, 0xc7, 0xb4, 0x39, 0x24, 0xa1, | ||
2960 | - 0xc7, 0xd4, 0xba, 0xcf, 0x6e, 0xb1, 0x4e, 0x84, 0x2d, 0xe2, 0x13, 0x6b, 0xcd, 0x3f, 0x52, 0x70, | ||
2961 | - 0x7f, 0x27, 0xc0, 0x36, 0xc3, 0xaf, 0x6d, 0x7a, 0x6c, 0xe1, 0x1f, 0x42, 0x4c, 0x19, 0x5a, 0x87, | ||
2962 | - 0x94, 0xeb, 0x18, 0x5a, 0x4d, 0xab, 0x17, 0xb6, 0xf5, 0xd1, 0x65, 0x35, 0xd5, 0xde, 0xb5, 0x52, | ||
2963 | - 0xae, 0x83, 0xd6, 0x41, 0x3f, 0x0c, 0x3d, 0x67, 0x80, 0x8d, 0x14, 0x9f, 0xb3, 0x94, 0x85, 0x9a, | ||
2964 | - 0xa0, 0x07, 0x84, 0xb0, 0x23, 0x6a, 0xa4, 0x6b, 0xe9, 0x7a, 0xb1, 0xf5, 0xff, 0x46, 0x34, 0x9b, | ||
2965 | - 0x7c, 0xe3, 0xc6, 0xd7, 0xfc, 0xc0, 0x96, 0x82, 0xa1, 0x32, 0xe4, 0x19, 0x0e, 0x86, 0xae, 0x67, | ||
2966 | - 0x0f, 0x8c, 0x4c, 0x4d, 0xab, 0xe7, 0xad, 0x2b, 0x1b, 0xad, 0x41, 0x96, 0x32, 0xc7, 0xf5, 0x8c, | ||
2967 | - 0xac, 0xd8, 0x43, 0x1a, 0x7c, 0x6b, 0xca, 0x1c, 0x12, 0x32, 0x43, 0x97, 0x5b, 0x4b, 0x4b, 0x7d, | ||
2968 | - 0xc7, 0x41, 0x60, 0xe4, 0xae, 0xbe, 0xe3, 0x20, 0x40, 0x15, 0x80, 0x6e, 0x1f, 0x77, 0x8f, 0x7d, | ||
2969 | - 0xe2, 0x7a, 0xcc, 0xc8, 0x8b, 0xb9, 0xc8, 0x17, 0xf4, 0x11, 0xdc, 0xf7, 0xed, 0x00, 0x7b, 0xac, | ||
2970 | - 0x13, 0x81, 0x15, 0x04, 0x6c, 0x55, 0x4e, 0xec, 0x4c, 0xc0, 0x0d, 0xc8, 0x11, 0x9f, 0xb9, 0xc4, | ||
2971 | - 0xa3, 0x06, 0xd4, 0xb4, 0x7a, 0xb1, 0xb5, 0xd6, 0x90, 0x97, 0xd9, 0x18, 0x5f, 0x66, 0x63, 0xcb, | ||
2972 | - 0x3b, 0xb7, 0xc6, 0x20, 0x73, 0x03, 0x50, 0x34, 0xa9, 0xd4, 0x27, 0x1e, 0xc5, 0x68, 0x15, 0xd2, | ||
2973 | - 0xbe, 0x4a, 0x6b, 0xc9, 0xe2, 0x43, 0xf3, 0x25, 0x94, 0x76, 0xf1, 0x00, 0x33, 0xbc, 0x28, 0xf1, | ||
2974 | - 0x4f, 0x20, 0x87, 0xcf, 0x70, 0xb7, 0xe3, 0x3a, 0x32, 0xf3, 0xdb, 0x30, 0xba, 0xac, 0xea, 0x7b, | ||
2975 | - 0x67, 0xb8, 0xdb, 0xde, 0xb5, 0x74, 0x3e, 0xd5, 0x76, 0xcc, 0x5f, 0x34, 0x58, 0x19, 0xbb, 0x4b, | ||
2976 | - 0xda, 0x12, 0x55, 0xa1, 0x88, 0xcf, 0x5c, 0xd6, 0xa1, 0xcc, 0x66, 0x21, 0x15, 0xde, 0x4a, 0x16, | ||
2977 | - 0xf0, 0x4f, 0xaf, 0xc4, 0x17, 0xb4, 0x05, 0x05, 0x6e, 0x61, 0xa7, 0x63, 0x33, 0x23, 0x2d, 0xa2, | ||
2978 | - 0x2d, 0x5f, 0x8b, 0xf6, 0xf5, 0x98, 0xba, 0xdb, 0xf9, 0x8b, 0xcb, 0xea, 0x9d, 0xdf, 0xfe, 0xae, | ||
2979 | - 0x6a, 0x56, 0x5e, 0x2e, 0xdb, 0x62, 0xe6, 0x5f, 0x1a, 0x20, 0x7e, 0xb6, 0x83, 0x80, 0x74, 0x31, | ||
2980 | - 0xa5, 0xcb, 0x08, 0x6e, 0x8a, 0x31, 0xe9, 0x24, 0xc6, 0x64, 0xe2, 0x19, 0x93, 0x4d, 0x60, 0x8c, | ||
2981 | - 0x3e, 0xc5, 0x98, 0x3a, 0x64, 0xa8, 0x8f, 0xbb, 0x82, 0x47, 0x49, 0x37, 0x2c, 0x10, 0xe6, 0x03, | ||
2982 | - 0xf8, 0xdf, 0x54, 0x78, 0x32, 0xd9, 0xe6, 0x4f, 0xb0, 0x6a, 0x61, 0xea, 0xfe, 0x88, 0x0f, 0xd8, | ||
2983 | - 0xf9, 0x52, 0x62, 0x5e, 0x83, 0xec, 0xa9, 0xeb, 0xb0, 0xbe, 0x08, 0xb8, 0x64, 0x49, 0x83, 0x9f, | ||
2984 | - 0xbf, 0x8f, 0xdd, 0x5e, 0x9f, 0x89, 0x70, 0x4b, 0x96, 0xb2, 0xcc, 0x17, 0x70, 0x97, 0x5f, 0xe1, | ||
2985 | - 0x72, 0xb8, 0xf4, 0x6f, 0x0a, 0x4a, 0xca, 0x9b, 0xa2, 0xd2, 0x6d, 0x35, 0x41, 0x51, 0x2f, 0x3d, | ||
2986 | - 0xa1, 0xde, 0x33, 0x9e, 0x78, 0xc1, 0x3a, 0x7e, 0xf0, 0x95, 0xd6, 0xa3, 0xa8, 0x4a, 0x9c, 0x7c, | ||
2987 | - 0xac, 0x84, 0x42, 0xd2, 0xd0, 0x52, 0xd0, 0x25, 0xa9, 0x41, 0x94, 0x3d, 0xf9, 0x19, 0xf6, 0xcc, | ||
2988 | - 0x54, 0x44, 0x61, 0x7e, 0x45, 0xc0, 0xbb, 0x54, 0x44, 0x34, 0xe7, 0xc5, 0xc4, 0x9c, 0x33, 0x28, | ||
2989 | - 0xbe, 0x70, 0x07, 0x83, 0xa5, 0x50, 0x87, 0x27, 0xc2, 0xed, 0x8d, 0x8b, 0xa5, 0x64, 0x29, 0x8b, | ||
2990 | - 0xdf, 0x8a, 0x3d, 0x18, 0x6b, 0x2e, 0x1f, 0x9a, 0x5d, 0x58, 0xd9, 0x19, 0x10, 0x8a, 0xdb, 0xfb, | ||
2991 | - 0xcb, 0xe2, 0xac, 0xbc, 0x2f, 0x59, 0xa4, 0xd2, 0x30, 0x9f, 0x42, 0xf1, 0xc0, 0x75, 0x16, 0x29, | ||
2992 | - 0x81, 0xf9, 0x0d, 0xdc, 0x95, 0x30, 0xc5, 0xb9, 0xcf, 0xa1, 0xe0, 0xcb, 0x22, 0xc3, 0xd4, 0xd0, | ||
2993 | - 0x44, 0x6b, 0xa9, 0xc5, 0x92, 0x46, 0x95, 0x62, 0xdb, 0x3b, 0x22, 0xd6, 0x64, 0x89, 0x49, 0xe1, | ||
2994 | - 0xc1, 0x44, 0xc5, 0x6f, 0xd2, 0xe0, 0x10, 0x64, 0x7c, 0x9b, 0xf5, 0x15, 0x95, 0xc5, 0x38, 0x2a, | ||
2995 | - 0xfe, 0xe9, 0x9b, 0x88, 0x7f, 0x07, 0xee, 0x7f, 0xeb, 0x3b, 0x37, 0xec, 0xa8, 0x2d, 0x28, 0x04, | ||
2996 | - 0x98, 0x92, 0x30, 0xe8, 0x62, 0x29, 0xc6, 0x49, 0xee, 0x27, 0x30, 0x55, 0xe8, 0x01, 0x5b, 0x4a, | ||
2997 | - 0xa1, 0x3f, 0x16, 0x75, 0xce, 0x9d, 0x25, 0x76, 0xa9, 0xaf, 0xa0, 0xf8, 0xc6, 0x76, 0x97, 0xb3, | ||
2998 | - 0x5d, 0x00, 0x77, 0xa5, 0x2f, 0xb5, 0xdb, 0x4c, 0xf1, 0x69, 0xf3, 0x8b, 0x2f, 0xf5, 0x4e, 0xed, | ||
2999 | - 0x68, 0x43, 0x0a, 0xe3, 0x42, 0xf6, 0x6d, 0x4a, 0xc9, 0x9b, 0xd0, 0xef, 0x43, 0xce, 0x65, 0x9b, | ||
3000 | - 0xc9, 0x63, 0x25, 0x5d, 0x8c, 0x84, 0x98, 0x75, 0x58, 0xd9, 0x21, 0x9e, 0x87, 0xbb, 0x8b, 0xf2, | ||
3001 | - 0x64, 0xda, 0x70, 0xef, 0x0a, 0xa9, 0x36, 0x7a, 0x08, 0x79, 0xfe, 0x14, 0xed, 0x4c, 0x12, 0x9f, | ||
3002 | - 0xe3, 0xf6, 0x81, 0xeb, 0xf0, 0x29, 0xfe, 0x5c, 0x13, 0x53, 0xb2, 0x59, 0xe7, 0xb8, 0xcd, 0xa7, | ||
3003 | - 0x0c, 0xc8, 0x9d, 0xe0, 0x80, 0xba, 0x44, 0x16, 0x5b, 0xc1, 0x1a, 0x9b, 0xe6, 0x26, 0xdc, 0x7b, | ||
3004 | - 0xd5, 0x0f, 0x99, 0x43, 0x4e, 0xbd, 0x45, 0xb7, 0xb6, 0x0a, 0x69, 0x8f, 0x9c, 0x0a, 0xd7, 0x79, | ||
3005 | - 0x8b, 0x0f, 0x79, 0xba, 0x0e, 0xec, 0x90, 0x2e, 0xea, 0x23, 0xe6, 0xfb, 0x50, 0xb2, 0x30, 0x0d, | ||
3006 | - 0x87, 0x8b, 0x80, 0xad, 0x5f, 0x01, 0x32, 0xbc, 0x16, 0xd0, 0x4b, 0xc8, 0x8a, 0x9e, 0x82, 0xa6, | ||
3007 | - 0x8a, 0x58, 0xbd, 0xb6, 0x1b, 0xd1, 0xe6, 0x55, 0x7e, 0x3c, 0x07, 0xa1, 0x92, 0xf6, 0x06, 0x74, | ||
3008 | - 0xf9, 0xc8, 0x42, 0x4f, 0xe3, 0xc0, 0xd7, 0x5e, 0xb5, 0xe5, 0x8d, 0x45, 0x30, 0xe5, 0x58, 0x1e, | ||
3009 | - 0x33, 0x60, 0x89, 0xc7, 0xbc, 0x2a, 0xbd, 0xc4, 0x63, 0x46, 0xea, 0x69, 0x1f, 0x74, 0xf9, 0x28, | ||
3010 | - 0x43, 0xb1, 0xe0, 0xa9, 0xf7, 0x5f, 0xd9, 0x9c, 0x07, 0x51, 0x0e, 0xdb, 0x90, 0xe1, 0x22, 0x89, | ||
3011 | - 0xaa, 0x71, 0xd8, 0x88, 0xca, 0x96, 0x6b, 0xc9, 0x00, 0xe5, 0x6a, 0x0b, 0xb2, 0xe2, 0xaa, 0xe3, | ||
3012 | - 0x23, 0x8d, 0xb2, 0xa0, 0xbc, 0x7e, 0x8d, 0xfc, 0x7b, 0xfc, 0x3f, 0x1e, 0xb4, 0x03, 0xba, 0x64, | ||
3013 | - 0x41, 0x7c, 0x78, 0x53, 0x0c, 0x49, 0x74, 0xb2, 0x0f, 0x10, 0x79, 0x6d, 0x7f, 0x10, 0x7b, 0x4f, | ||
3014 | - 0x71, 0x3a, 0x9e, 0xe8, 0xf0, 0x0b, 0xc8, 0xf0, 0x56, 0x1a, 0x9f, 0xa3, 0x48, 0x93, 0x4d, 0x74, | ||
3015 | - 0xf0, 0x25, 0x64, 0xb8, 0x72, 0xa1, 0x58, 0xce, 0x5c, 0x7f, 0xdb, 0x26, 0xfa, 0x69, 0x43, 0xe1, | ||
3016 | - 0xea, 0x4d, 0x88, 0xde, 0x4b, 0xc8, 0xd0, 0xd4, 0x93, 0x31, 0xd1, 0xd5, 0x1e, 0xe4, 0x54, 0xa3, | ||
3017 | - 0x46, 0xb1, 0x34, 0x99, 0xee, 0xe2, 0x89, 0x6e, 0x9e, 0x83, 0x2e, 0xdb, 0x53, 0x7c, 0xd9, 0x5c, | ||
3018 | - 0x6b, 0x5d, 0x73, 0x42, 0xcb, 0x70, 0x29, 0x8f, 0xcf, 0x71, 0xa4, 0x61, 0xc4, 0xf3, 0x70, 0xaa, | ||
3019 | - 0x0b, 0x28, 0x61, 0xa0, 0xc9, 0xc2, 0x40, 0x17, 0x0a, 0xc3, 0x84, 0xd5, 0x16, 0xe4, 0x94, 0xc0, | ||
3020 | - 0x26, 0x24, 0x6a, 0x4a, 0xa7, 0xcb, 0x4f, 0xe6, 0x62, 0x94, 0xcf, 0xe7, 0x90, 0x1f, 0x2b, 0x2a, | ||
3021 | - 0x8a, 0x5d, 0x30, 0xa3, 0xb7, 0x49, 0x59, 0xdb, 0xde, 0xbf, 0x78, 0x5b, 0xb9, 0xf3, 0xe7, 0xdb, | ||
3022 | - 0xca, 0x9d, 0x9f, 0x47, 0x15, 0xed, 0x62, 0x54, 0xd1, 0x7e, 0x1f, 0x55, 0xb4, 0x7f, 0x46, 0x15, | ||
3023 | - 0xed, 0xfb, 0x4f, 0x6e, 0xfb, 0xf3, 0xc5, 0x26, 0xff, 0xf3, 0x5d, 0xea, 0x50, 0x17, 0x5b, 0x3c, | ||
3024 | - 0xfb, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x19, 0x17, 0x87, 0x57, 0x00, 0x11, 0x00, 0x00, | ||
3025 | + // 1306 bytes of a gzipped FileDescriptorProto | ||
3026 | + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0x4d, 0x6f, 0xdb, 0x46, | ||
3027 | + 0x13, 0x0e, 0xf5, 0x41, 0x49, 0xa3, 0xc8, 0x71, 0xf6, 0x75, 0xf2, 0x32, 0x0a, 0x20, 0x29, 0x4c, | ||
3028 | + 0x93, 0xaa, 0x2d, 0x40, 0xa1, 0x0a, 0x1a, 0x14, 0x31, 0x90, 0xc2, 0x76, 0xdc, 0x40, 0x4d, 0x5a, | ||
3029 | + 0x1b, 0x4c, 0x8a, 0x04, 0xbd, 0x18, 0xb4, 0xb8, 0x91, 0x08, 0x4b, 0x5c, 0x96, 0xbb, 0x74, 0xa2, | ||
3030 | + 0x02, 0x05, 0x7a, 0xea, 0xa1, 0xa7, 0xfe, 0xac, 0x1c, 0x0b, 0xf4, 0xd2, 0x4b, 0xd3, 0x46, 0xff, | ||
3031 | + 0xa0, 0xc7, 0xde, 0x8a, 0xfd, 0x90, 0x45, 0x49, 0xa4, 0x14, 0x07, 0xba, 0x18, 0x3b, 0xdc, 0x67, | ||
3032 | + 0x67, 0x67, 0x67, 0x9f, 0x79, 0x66, 0x65, 0xd8, 0xee, 0x79, 0xac, 0x1f, 0x1d, 0x5b, 0x5d, 0x32, | ||
3033 | + 0x6c, 0x75, 0x89, 0xcf, 0x1c, 0xcf, 0xc7, 0xa1, 0x1b, 0x1f, 0x86, 0x91, 0xcf, 0xbc, 0x21, 0x6e, | ||
3034 | + 0x9d, 0xb6, 0x5b, 0xcc, 0xa1, 0x27, 0x2d, 0xda, 0xf7, 0x86, 0x56, 0x10, 0x12, 0x46, 0x10, 0x9a, | ||
3035 | + 0xc2, 0x2c, 0x3e, 0x67, 0x9d, 0xb6, 0xab, 0xd7, 0x7a, 0x84, 0xf4, 0x06, 0xb8, 0x25, 0x10, 0xc7, | ||
3036 | + 0xd1, 0x8b, 0x96, 0xe3, 0x8f, 0x24, 0xbc, 0x7a, 0x7d, 0x7e, 0x0a, 0x0f, 0x03, 0x36, 0x99, 0xdc, | ||
3037 | + 0xea, 0x91, 0x1e, 0x11, 0xc3, 0x16, 0x1f, 0xa9, 0xaf, 0xf5, 0xf9, 0x25, 0x3c, 0x14, 0xca, 0x9c, | ||
3038 | + 0x61, 0xa0, 0x00, 0x77, 0x57, 0xc6, 0xef, 0x04, 0x5e, 0x8b, 0x8d, 0x02, 0x4c, 0x5b, 0x43, 0x12, | ||
3039 | + 0xf9, 0x4c, 0xad, 0xbb, 0x77, 0x8e, 0x75, 0xe2, 0xd8, 0xe2, 0x7c, 0x62, 0xad, 0xf9, 0x7b, 0x06, | ||
3040 | + 0x2e, 0xef, 0x85, 0xd8, 0x61, 0xf8, 0xa9, 0x43, 0x4f, 0x6c, 0xfc, 0x7d, 0x84, 0x29, 0x43, 0x57, | ||
3041 | + 0x21, 0xe3, 0xb9, 0x86, 0xd6, 0xd0, 0x9a, 0xa5, 0x5d, 0x7d, 0xfc, 0xa6, 0x9e, 0xe9, 0x3c, 0xb0, | ||
3042 | + 0x33, 0x9e, 0x8b, 0xae, 0x82, 0x7e, 0x1c, 0xf9, 0xee, 0x00, 0x1b, 0x19, 0x3e, 0x67, 0x2b, 0x0b, | ||
3043 | + 0xb5, 0x40, 0x0f, 0x09, 0x61, 0x2f, 0xa8, 0x91, 0x6d, 0x64, 0x9b, 0xe5, 0xf6, 0xff, 0xad, 0x78, | ||
3044 | + 0x36, 0xf9, 0xc6, 0xd6, 0xd7, 0x3c, 0x60, 0x5b, 0xc1, 0x50, 0x15, 0x8a, 0x0c, 0x87, 0x43, 0xcf, | ||
3045 | + 0x77, 0x06, 0x46, 0xae, 0xa1, 0x35, 0x8b, 0xf6, 0x99, 0x8d, 0xb6, 0x20, 0x4f, 0x99, 0xeb, 0xf9, | ||
3046 | + 0x46, 0x5e, 0xec, 0x21, 0x0d, 0xbe, 0x35, 0x65, 0x2e, 0x89, 0x98, 0xa1, 0xcb, 0xad, 0xa5, 0xa5, | ||
3047 | + 0xbe, 0xe3, 0x30, 0x34, 0x0a, 0x67, 0xdf, 0x71, 0x18, 0xa2, 0x1a, 0x40, 0xb7, 0x8f, 0xbb, 0x27, | ||
3048 | + 0x01, 0xf1, 0x7c, 0x66, 0x14, 0xc5, 0x5c, 0xec, 0x0b, 0xfa, 0x04, 0x2e, 0x07, 0x4e, 0x88, 0x7d, | ||
3049 | + 0x76, 0x14, 0x83, 0x95, 0x04, 0x6c, 0x53, 0x4e, 0xec, 0x4d, 0xc1, 0x16, 0x14, 0x48, 0xc0, 0x3c, | ||
3050 | + 0xe2, 0x53, 0x03, 0x1a, 0x5a, 0xb3, 0xdc, 0xde, 0xb2, 0xe4, 0x65, 0x5a, 0x93, 0xcb, 0xb4, 0x76, | ||
3051 | + 0xfc, 0x91, 0x3d, 0x01, 0x99, 0xb7, 0x01, 0xc5, 0x93, 0x4a, 0x03, 0xe2, 0x53, 0x8c, 0x36, 0x21, | ||
3052 | + 0x1b, 0xa8, 0xb4, 0x56, 0x6c, 0x3e, 0x34, 0x1f, 0x43, 0xe5, 0x01, 0x1e, 0x60, 0x86, 0x57, 0x25, | ||
3053 | + 0xfe, 0x26, 0x14, 0xf0, 0x2b, 0xdc, 0x3d, 0xf2, 0x5c, 0x99, 0xf9, 0x5d, 0x18, 0xbf, 0xa9, 0xeb, | ||
3054 | + 0xfb, 0xaf, 0x70, 0xb7, 0xf3, 0xc0, 0xd6, 0xf9, 0x54, 0xc7, 0x35, 0x7f, 0xd6, 0x60, 0x63, 0xe2, | ||
3055 | + 0x2e, 0x6d, 0x4b, 0x54, 0x87, 0x32, 0x7e, 0xe5, 0xb1, 0x23, 0xca, 0x1c, 0x16, 0x51, 0xe1, 0xad, | ||
3056 | + 0x62, 0x03, 0xff, 0xf4, 0x44, 0x7c, 0x41, 0x3b, 0x50, 0xe2, 0x16, 0x76, 0x8f, 0x1c, 0x66, 0x64, | ||
3057 | + 0xc5, 0x69, 0xab, 0x0b, 0xa7, 0x7d, 0x3a, 0xa1, 0xee, 0x6e, 0xf1, 0xf5, 0x9b, 0xfa, 0x85, 0x5f, | ||
3058 | + 0xff, 0xaa, 0x6b, 0x76, 0x51, 0x2e, 0xdb, 0x61, 0xe6, 0x9f, 0x1a, 0x20, 0x1e, 0xdb, 0x61, 0x48, | ||
3059 | + 0xba, 0x98, 0xd2, 0x75, 0x1c, 0x6e, 0x86, 0x31, 0xd9, 0x34, 0xc6, 0xe4, 0x92, 0x19, 0x93, 0x4f, | ||
3060 | + 0x61, 0x8c, 0x3e, 0xc3, 0x98, 0x26, 0xe4, 0x68, 0x80, 0xbb, 0x82, 0x47, 0x69, 0x37, 0x2c, 0x10, | ||
3061 | + 0xe6, 0x15, 0xf8, 0xdf, 0xcc, 0xf1, 0x64, 0xb2, 0xcd, 0x1f, 0x61, 0xd3, 0xc6, 0xd4, 0xfb, 0x01, | ||
3062 | + 0x1f, 0xb2, 0xd1, 0x5a, 0xce, 0xbc, 0x05, 0xf9, 0x97, 0x9e, 0xcb, 0xfa, 0xe2, 0xc0, 0x15, 0x5b, | ||
3063 | + 0x1a, 0x3c, 0xfe, 0x3e, 0xf6, 0x7a, 0x7d, 0x26, 0x8e, 0x5b, 0xb1, 0x95, 0x65, 0x3e, 0x82, 0x8b, | ||
3064 | + 0xfc, 0x0a, 0xd7, 0xc3, 0xa5, 0x7f, 0x32, 0x50, 0x51, 0xde, 0x14, 0x95, 0xce, 0xab, 0x09, 0x8a, | ||
3065 | + 0x7a, 0xd9, 0x29, 0xf5, 0xee, 0xf0, 0xc4, 0x0b, 0xd6, 0xf1, 0xc0, 0x37, 0xda, 0xd7, 0xe3, 0x2a, | ||
3066 | + 0x71, 0xfa, 0xa9, 0x12, 0x0a, 0x49, 0x43, 0x5b, 0x41, 0xd7, 0xa4, 0x06, 0x71, 0xf6, 0x14, 0xe7, | ||
3067 | + 0xd8, 0x33, 0x57, 0x11, 0xa5, 0xe5, 0x15, 0x01, 0xef, 0x53, 0x11, 0xf1, 0x9c, 0x97, 0x53, 0x73, | ||
3068 | + 0xce, 0xa0, 0xfc, 0xc8, 0x1b, 0x0c, 0xd6, 0x42, 0x1d, 0x9e, 0x08, 0xaf, 0x37, 0x29, 0x96, 0x8a, | ||
3069 | + 0xad, 0x2c, 0x7e, 0x2b, 0xce, 0x60, 0xa2, 0xb9, 0x7c, 0x68, 0x76, 0x61, 0x63, 0x6f, 0x40, 0x28, | ||
3070 | + 0xee, 0x1c, 0xac, 0x8b, 0xb3, 0xf2, 0xbe, 0x64, 0x91, 0x4a, 0xc3, 0xbc, 0x05, 0xe5, 0x43, 0xcf, | ||
3071 | + 0x5d, 0xa5, 0x04, 0xe6, 0x37, 0x70, 0x51, 0xc2, 0x14, 0xe7, 0xee, 0x43, 0x29, 0x90, 0x45, 0x86, | ||
3072 | + 0xa9, 0xa1, 0x89, 0xd6, 0xd2, 0x48, 0x24, 0x8d, 0x2a, 0xc5, 0x8e, 0xff, 0x82, 0xd8, 0xd3, 0x25, | ||
3073 | + 0x26, 0x85, 0x2b, 0x53, 0x15, 0x7f, 0x97, 0x06, 0x87, 0x20, 0x17, 0x38, 0xac, 0xaf, 0xa8, 0x2c, | ||
3074 | + 0xc6, 0x71, 0xf1, 0xcf, 0xbe, 0x8b, 0xf8, 0xff, 0xab, 0xc1, 0xe5, 0x6f, 0x03, 0xf7, 0x1d, 0x5b, | ||
3075 | + 0x6a, 0x1b, 0x4a, 0x21, 0xa6, 0x24, 0x0a, 0xbb, 0x58, 0xaa, 0x71, 0x9a, 0xff, 0x29, 0x0c, 0x3d, | ||
3076 | + 0x87, 0xb2, 0xe3, 0xfb, 0x84, 0x39, 0x93, 0xa8, 0x78, 0x62, 0xee, 0x5a, 0x8b, 0x2f, 0x18, 0x6b, | ||
3077 | + 0x21, 0x0e, 0x6b, 0x67, 0xba, 0x70, 0xdf, 0x67, 0xe1, 0xc8, 0x8e, 0xbb, 0xaa, 0xde, 0x87, 0xcd, | ||
3078 | + 0x79, 0x00, 0xa7, 0xcc, 0x09, 0x1e, 0xc9, 0xd0, 0x6d, 0x3e, 0xe4, 0x77, 0x7c, 0xea, 0x0c, 0xa2, | ||
3079 | + 0x49, 0xc5, 0x4b, 0xe3, 0x5e, 0xe6, 0x73, 0x4d, 0x69, 0x50, 0xc8, 0xd6, 0xa2, 0x41, 0x37, 0x84, | ||
3080 | + 0x04, 0x71, 0x67, 0xa9, 0x0d, 0xf4, 0x2b, 0x28, 0x3f, 0x73, 0xbc, 0xf5, 0x6c, 0x17, 0xc2, 0x45, | ||
3081 | + 0xe9, 0x4b, 0xed, 0x36, 0xa7, 0x0b, 0xda, 0x72, 0x5d, 0xc8, 0xbc, 0x57, 0xa7, 0xbc, 0x2d, 0x35, | ||
3082 | + 0x7b, 0x65, 0x61, 0x6c, 0x4b, 0x35, 0x9e, 0x56, 0xc6, 0xc7, 0xbc, 0xcc, 0x1c, 0x26, 0xc3, 0x4a, | ||
3083 | + 0xa3, 0x8c, 0x84, 0x98, 0x4d, 0xd8, 0xd8, 0x23, 0xbe, 0x8f, 0xbb, 0xab, 0xf2, 0x64, 0x3a, 0x70, | ||
3084 | + 0xe9, 0x0c, 0xa9, 0x36, 0xba, 0x06, 0x45, 0xfe, 0x4a, 0x3e, 0x9a, 0x26, 0xbe, 0xc0, 0xed, 0x43, | ||
3085 | + 0xcf, 0xe5, 0x53, 0x9c, 0x67, 0x62, 0x4a, 0xbe, 0x23, 0x0a, 0xdc, 0xe6, 0x53, 0x06, 0x14, 0x4e, | ||
3086 | + 0x71, 0x48, 0x3d, 0x22, 0x75, 0xa0, 0x64, 0x4f, 0x4c, 0x73, 0x1b, 0x2e, 0x3d, 0xe9, 0x47, 0xcc, | ||
3087 | + 0x25, 0x2f, 0xfd, 0x55, 0xb7, 0xb6, 0x09, 0x59, 0x9f, 0xbc, 0x14, 0xae, 0x8b, 0x36, 0x1f, 0xf2, | ||
3088 | + 0x74, 0x1d, 0x3a, 0x11, 0x5d, 0xd5, 0xe2, 0xcc, 0x0f, 0xa1, 0x62, 0x63, 0x1a, 0x0d, 0x57, 0x01, | ||
3089 | + 0xdb, 0xbf, 0x00, 0xe4, 0x78, 0x75, 0xa0, 0xc7, 0x90, 0x17, 0xed, 0x0e, 0x35, 0x92, 0xca, 0x28, | ||
3090 | + 0xde, 0x57, 0xab, 0x37, 0x96, 0x20, 0x54, 0xd2, 0x9e, 0x81, 0x2e, 0xdf, 0x7f, 0xe8, 0x56, 0x12, | ||
3091 | + 0x78, 0xe1, 0xc1, 0x5d, 0xbd, 0xbd, 0x0a, 0xa6, 0x1c, 0xcb, 0x30, 0x43, 0x96, 0x1a, 0xe6, 0x59, | ||
3092 | + 0xe9, 0xa5, 0x86, 0x19, 0xab, 0xa7, 0x03, 0xd0, 0xe5, 0x7b, 0x11, 0x25, 0x82, 0x67, 0x9e, 0xa6, | ||
3093 | + 0x55, 0x73, 0x19, 0x44, 0x39, 0xec, 0x40, 0x8e, 0xeb, 0x37, 0xaa, 0x27, 0x61, 0x63, 0x0d, 0xa0, | ||
3094 | + 0xda, 0x48, 0x07, 0x28, 0x57, 0x3b, 0x90, 0x17, 0x57, 0x9d, 0x7c, 0xd2, 0x38, 0x0b, 0xaa, 0x57, | ||
3095 | + 0x17, 0xc8, 0xbf, 0xcf, 0x7f, 0x8c, 0xa1, 0x3d, 0xd0, 0x25, 0x0b, 0x92, 0x8f, 0x37, 0xc3, 0x90, | ||
3096 | + 0x54, 0x27, 0x07, 0x00, 0xb1, 0x1f, 0x02, 0x1f, 0x25, 0xde, 0x53, 0x52, 0x8b, 0x49, 0x75, 0xf8, | ||
3097 | + 0x05, 0xe4, 0x78, 0x97, 0x4f, 0xce, 0x51, 0xac, 0xff, 0xa7, 0x3a, 0xf8, 0x12, 0x72, 0x5c, 0xb9, | ||
3098 | + 0x50, 0x22, 0x67, 0x16, 0x9f, 0xdd, 0xa9, 0x7e, 0x3a, 0x50, 0x3a, 0x7b, 0xae, 0xa2, 0x0f, 0x52, | ||
3099 | + 0x32, 0x34, 0xf3, 0x9a, 0x4d, 0x75, 0xb5, 0x0f, 0x05, 0xf5, 0x86, 0x40, 0x89, 0x34, 0x99, 0x7d, | ||
3100 | + 0x60, 0xa4, 0xba, 0x79, 0x08, 0xba, 0x6c, 0x58, 0xc9, 0x65, 0xb3, 0xd0, 0xcc, 0x96, 0x1c, 0x2d, | ||
3101 | + 0xc7, 0xa5, 0x3c, 0x39, 0xc7, 0xb1, 0x86, 0x91, 0xcc, 0xc3, 0x99, 0x2e, 0xa0, 0x84, 0x81, 0xa6, | ||
3102 | + 0x0b, 0x03, 0x5d, 0x29, 0x0c, 0x53, 0x56, 0xdb, 0x50, 0x50, 0x02, 0x9b, 0x92, 0xa8, 0x19, 0x9d, | ||
3103 | + 0xae, 0xde, 0x5c, 0x8a, 0x51, 0x3e, 0x1f, 0x42, 0x71, 0xa2, 0xa8, 0x28, 0x71, 0xc1, 0x9c, 0xde, | ||
3104 | + 0xa6, 0x65, 0x6d, 0xf7, 0xe0, 0xf5, 0xdb, 0xda, 0x85, 0x3f, 0xde, 0xd6, 0x2e, 0xfc, 0x34, 0xae, | ||
3105 | + 0x69, 0xaf, 0xc7, 0x35, 0xed, 0xb7, 0x71, 0x4d, 0xfb, 0x7b, 0x5c, 0xd3, 0xbe, 0xfb, 0xec, 0xbc, | ||
3106 | + 0xff, 0x59, 0xd9, 0xe6, 0x7f, 0x9e, 0x67, 0x8e, 0x75, 0xb1, 0xc5, 0x9d, 0xff, 0x02, 0x00, 0x00, | ||
3107 | + 0xff, 0xff, 0xd3, 0xbf, 0xc3, 0xa9, 0x9b, 0x11, 0x00, 0x00, | ||
3108 | } | ||
3109 | |||
3110 | func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) { | ||
3111 | @@ -2000,6 +2007,25 @@ func (m *UpdateTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { | ||
3112 | i -= len(m.XXX_unrecognized) | ||
3113 | copy(dAtA[i:], m.XXX_unrecognized) | ||
3114 | } | ||
3115 | + if len(m.Annotations) > 0 { | ||
3116 | + for k := range m.Annotations { | ||
3117 | + v := m.Annotations[k] | ||
3118 | + baseI := i | ||
3119 | + i -= len(v) | ||
3120 | + copy(dAtA[i:], v) | ||
3121 | + i = encodeVarintShim(dAtA, i, uint64(len(v))) | ||
3122 | + i-- | ||
3123 | + dAtA[i] = 0x12 | ||
3124 | + i -= len(k) | ||
3125 | + copy(dAtA[i:], k) | ||
3126 | + i = encodeVarintShim(dAtA, i, uint64(len(k))) | ||
3127 | + i-- | ||
3128 | + dAtA[i] = 0xa | ||
3129 | + i = encodeVarintShim(dAtA, i, uint64(baseI-i)) | ||
3130 | + i-- | ||
3131 | + dAtA[i] = 0x1a | ||
3132 | + } | ||
3133 | + } | ||
3134 | if m.Resources != nil { | ||
3135 | { | ||
3136 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) | ||
3137 | @@ -2826,6 +2852,14 @@ func (m *UpdateTaskRequest) Size() (n int) { | ||
3138 | l = m.Resources.Size() | ||
3139 | n += 1 + l + sovShim(uint64(l)) | ||
3140 | } | ||
3141 | + if len(m.Annotations) > 0 { | ||
3142 | + for k, v := range m.Annotations { | ||
3143 | + _ = k | ||
3144 | + _ = v | ||
3145 | + mapEntrySize := 1 + len(k) + sovShim(uint64(len(k))) + 1 + len(v) + sovShim(uint64(len(v))) | ||
3146 | + n += mapEntrySize + 1 + sovShim(uint64(mapEntrySize)) | ||
3147 | + } | ||
3148 | + } | ||
3149 | if m.XXX_unrecognized != nil { | ||
3150 | n += len(m.XXX_unrecognized) | ||
3151 | } | ||
3152 | @@ -3237,9 +3271,20 @@ func (this *UpdateTaskRequest) String() string { | ||
3153 | if this == nil { | ||
3154 | return "nil" | ||
3155 | } | ||
3156 | + keysForAnnotations := make([]string, 0, len(this.Annotations)) | ||
3157 | + for k, _ := range this.Annotations { | ||
3158 | + keysForAnnotations = append(keysForAnnotations, k) | ||
3159 | + } | ||
3160 | + github_com_gogo_protobuf_sortkeys.Strings(keysForAnnotations) | ||
3161 | + mapStringForAnnotations := "map[string]string{" | ||
3162 | + for _, k := range keysForAnnotations { | ||
3163 | + mapStringForAnnotations += fmt.Sprintf("%v: %v,", k, this.Annotations[k]) | ||
3164 | + } | ||
3165 | + mapStringForAnnotations += "}" | ||
3166 | s := strings.Join([]string{`&UpdateTaskRequest{`, | ||
3167 | `ID:` + fmt.Sprintf("%v", this.ID) + `,`, | ||
3168 | `Resources:` + strings.Replace(fmt.Sprintf("%v", this.Resources), "Any", "types1.Any", 1) + `,`, | ||
3169 | + `Annotations:` + mapStringForAnnotations + `,`, | ||
3170 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, | ||
3171 | `}`, | ||
3172 | }, "") | ||
3173 | @@ -4019,10 +4064,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | ||
3174 | if err != nil { | ||
3175 | return err | ||
3176 | } | ||
3177 | - if skippy < 0 { | ||
3178 | - return ErrInvalidLengthShim | ||
3179 | - } | ||
3180 | - if (iNdEx + skippy) < 0 { | ||
3181 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3182 | return ErrInvalidLengthShim | ||
3183 | } | ||
3184 | if (iNdEx + skippy) > l { | ||
3185 | @@ -4092,10 +4134,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | ||
3186 | if err != nil { | ||
3187 | return err | ||
3188 | } | ||
3189 | - if skippy < 0 { | ||
3190 | - return ErrInvalidLengthShim | ||
3191 | - } | ||
3192 | - if (iNdEx + skippy) < 0 { | ||
3193 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3194 | return ErrInvalidLengthShim | ||
3195 | } | ||
3196 | if (iNdEx + skippy) > l { | ||
3197 | @@ -4210,10 +4249,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { | ||
3198 | if err != nil { | ||
3199 | return err | ||
3200 | } | ||
3201 | - if skippy < 0 { | ||
3202 | - return ErrInvalidLengthShim | ||
3203 | - } | ||
3204 | - if (iNdEx + skippy) < 0 { | ||
3205 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3206 | return ErrInvalidLengthShim | ||
3207 | } | ||
3208 | if (iNdEx + skippy) > l { | ||
3209 | @@ -4335,10 +4371,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | ||
3210 | if err != nil { | ||
3211 | return err | ||
3212 | } | ||
3213 | - if skippy < 0 { | ||
3214 | - return ErrInvalidLengthShim | ||
3215 | - } | ||
3216 | - if (iNdEx + skippy) < 0 { | ||
3217 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3218 | return ErrInvalidLengthShim | ||
3219 | } | ||
3220 | if (iNdEx + skippy) > l { | ||
3221 | @@ -4605,10 +4638,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | ||
3222 | if err != nil { | ||
3223 | return err | ||
3224 | } | ||
3225 | - if skippy < 0 { | ||
3226 | - return ErrInvalidLengthShim | ||
3227 | - } | ||
3228 | - if (iNdEx + skippy) < 0 { | ||
3229 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3230 | return ErrInvalidLengthShim | ||
3231 | } | ||
3232 | if (iNdEx + skippy) > l { | ||
3233 | @@ -4659,10 +4689,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | ||
3234 | if err != nil { | ||
3235 | return err | ||
3236 | } | ||
3237 | - if skippy < 0 { | ||
3238 | - return ErrInvalidLengthShim | ||
3239 | - } | ||
3240 | - if (iNdEx + skippy) < 0 { | ||
3241 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3242 | return ErrInvalidLengthShim | ||
3243 | } | ||
3244 | if (iNdEx + skippy) > l { | ||
3245 | @@ -4815,10 +4842,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | ||
3246 | if err != nil { | ||
3247 | return err | ||
3248 | } | ||
3249 | - if skippy < 0 { | ||
3250 | - return ErrInvalidLengthShim | ||
3251 | - } | ||
3252 | - if (iNdEx + skippy) < 0 { | ||
3253 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3254 | return ErrInvalidLengthShim | ||
3255 | } | ||
3256 | if (iNdEx + skippy) > l { | ||
3257 | @@ -4933,10 +4957,7 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { | ||
3258 | if err != nil { | ||
3259 | return err | ||
3260 | } | ||
3261 | - if skippy < 0 { | ||
3262 | - return ErrInvalidLengthShim | ||
3263 | - } | ||
3264 | - if (iNdEx + skippy) < 0 { | ||
3265 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3266 | return ErrInvalidLengthShim | ||
3267 | } | ||
3268 | if (iNdEx + skippy) > l { | ||
3269 | @@ -5289,10 +5310,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { | ||
3270 | if err != nil { | ||
3271 | return err | ||
3272 | } | ||
3273 | - if skippy < 0 { | ||
3274 | - return ErrInvalidLengthShim | ||
3275 | - } | ||
3276 | - if (iNdEx + skippy) < 0 { | ||
3277 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3278 | return ErrInvalidLengthShim | ||
3279 | } | ||
3280 | if (iNdEx + skippy) > l { | ||
3281 | @@ -5446,10 +5464,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | ||
3282 | if err != nil { | ||
3283 | return err | ||
3284 | } | ||
3285 | - if skippy < 0 { | ||
3286 | - return ErrInvalidLengthShim | ||
3287 | - } | ||
3288 | - if (iNdEx + skippy) < 0 { | ||
3289 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3290 | return ErrInvalidLengthShim | ||
3291 | } | ||
3292 | if (iNdEx + skippy) > l { | ||
3293 | @@ -5584,10 +5599,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | ||
3294 | if err != nil { | ||
3295 | return err | ||
3296 | } | ||
3297 | - if skippy < 0 { | ||
3298 | - return ErrInvalidLengthShim | ||
3299 | - } | ||
3300 | - if (iNdEx + skippy) < 0 { | ||
3301 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3302 | return ErrInvalidLengthShim | ||
3303 | } | ||
3304 | if (iNdEx + skippy) > l { | ||
3305 | @@ -5670,10 +5682,7 @@ func (m *PidsRequest) Unmarshal(dAtA []byte) error { | ||
3306 | if err != nil { | ||
3307 | return err | ||
3308 | } | ||
3309 | - if skippy < 0 { | ||
3310 | - return ErrInvalidLengthShim | ||
3311 | - } | ||
3312 | - if (iNdEx + skippy) < 0 { | ||
3313 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3314 | return ErrInvalidLengthShim | ||
3315 | } | ||
3316 | if (iNdEx + skippy) > l { | ||
3317 | @@ -5758,10 +5767,7 @@ func (m *PidsResponse) Unmarshal(dAtA []byte) error { | ||
3318 | if err != nil { | ||
3319 | return err | ||
3320 | } | ||
3321 | - if skippy < 0 { | ||
3322 | - return ErrInvalidLengthShim | ||
3323 | - } | ||
3324 | - if (iNdEx + skippy) < 0 { | ||
3325 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3326 | return ErrInvalidLengthShim | ||
3327 | } | ||
3328 | if (iNdEx + skippy) > l { | ||
3329 | @@ -5912,10 +5918,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | ||
3330 | if err != nil { | ||
3331 | return err | ||
3332 | } | ||
3333 | - if skippy < 0 { | ||
3334 | - return ErrInvalidLengthShim | ||
3335 | - } | ||
3336 | - if (iNdEx + skippy) < 0 { | ||
3337 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3338 | return ErrInvalidLengthShim | ||
3339 | } | ||
3340 | if (iNdEx + skippy) > l { | ||
3341 | @@ -6028,16 +6031,140 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | ||
3342 | return err | ||
3343 | } | ||
3344 | iNdEx = postIndex | ||
3345 | + case 3: | ||
3346 | + if wireType != 2 { | ||
3347 | + return fmt.Errorf("proto: wrong wireType = %d for field Annotations", wireType) | ||
3348 | + } | ||
3349 | + var msglen int | ||
3350 | + for shift := uint(0); ; shift += 7 { | ||
3351 | + if shift >= 64 { | ||
3352 | + return ErrIntOverflowShim | ||
3353 | + } | ||
3354 | + if iNdEx >= l { | ||
3355 | + return io.ErrUnexpectedEOF | ||
3356 | + } | ||
3357 | + b := dAtA[iNdEx] | ||
3358 | + iNdEx++ | ||
3359 | + msglen |= int(b&0x7F) << shift | ||
3360 | + if b < 0x80 { | ||
3361 | + break | ||
3362 | + } | ||
3363 | + } | ||
3364 | + if msglen < 0 { | ||
3365 | + return ErrInvalidLengthShim | ||
3366 | + } | ||
3367 | + postIndex := iNdEx + msglen | ||
3368 | + if postIndex < 0 { | ||
3369 | + return ErrInvalidLengthShim | ||
3370 | + } | ||
3371 | + if postIndex > l { | ||
3372 | + return io.ErrUnexpectedEOF | ||
3373 | + } | ||
3374 | + if m.Annotations == nil { | ||
3375 | + m.Annotations = make(map[string]string) | ||
3376 | + } | ||
3377 | + var mapkey string | ||
3378 | + var mapvalue string | ||
3379 | + for iNdEx < postIndex { | ||
3380 | + entryPreIndex := iNdEx | ||
3381 | + var wire uint64 | ||
3382 | + for shift := uint(0); ; shift += 7 { | ||
3383 | + if shift >= 64 { | ||
3384 | + return ErrIntOverflowShim | ||
3385 | + } | ||
3386 | + if iNdEx >= l { | ||
3387 | + return io.ErrUnexpectedEOF | ||
3388 | + } | ||
3389 | + b := dAtA[iNdEx] | ||
3390 | + iNdEx++ | ||
3391 | + wire |= uint64(b&0x7F) << shift | ||
3392 | + if b < 0x80 { | ||
3393 | + break | ||
3394 | + } | ||
3395 | + } | ||
3396 | + fieldNum := int32(wire >> 3) | ||
3397 | + if fieldNum == 1 { | ||
3398 | + var stringLenmapkey uint64 | ||
3399 | + for shift := uint(0); ; shift += 7 { | ||
3400 | + if shift >= 64 { | ||
3401 | + return ErrIntOverflowShim | ||
3402 | + } | ||
3403 | + if iNdEx >= l { | ||
3404 | + return io.ErrUnexpectedEOF | ||
3405 | + } | ||
3406 | + b := dAtA[iNdEx] | ||
3407 | + iNdEx++ | ||
3408 | + stringLenmapkey |= uint64(b&0x7F) << shift | ||
3409 | + if b < 0x80 { | ||
3410 | + break | ||
3411 | + } | ||
3412 | + } | ||
3413 | + intStringLenmapkey := int(stringLenmapkey) | ||
3414 | + if intStringLenmapkey < 0 { | ||
3415 | + return ErrInvalidLengthShim | ||
3416 | + } | ||
3417 | + postStringIndexmapkey := iNdEx + intStringLenmapkey | ||
3418 | + if postStringIndexmapkey < 0 { | ||
3419 | + return ErrInvalidLengthShim | ||
3420 | + } | ||
3421 | + if postStringIndexmapkey > l { | ||
3422 | + return io.ErrUnexpectedEOF | ||
3423 | + } | ||
3424 | + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) | ||
3425 | + iNdEx = postStringIndexmapkey | ||
3426 | + } else if fieldNum == 2 { | ||
3427 | + var stringLenmapvalue uint64 | ||
3428 | + for shift := uint(0); ; shift += 7 { | ||
3429 | + if shift >= 64 { | ||
3430 | + return ErrIntOverflowShim | ||
3431 | + } | ||
3432 | + if iNdEx >= l { | ||
3433 | + return io.ErrUnexpectedEOF | ||
3434 | + } | ||
3435 | + b := dAtA[iNdEx] | ||
3436 | + iNdEx++ | ||
3437 | + stringLenmapvalue |= uint64(b&0x7F) << shift | ||
3438 | + if b < 0x80 { | ||
3439 | + break | ||
3440 | + } | ||
3441 | + } | ||
3442 | + intStringLenmapvalue := int(stringLenmapvalue) | ||
3443 | + if intStringLenmapvalue < 0 { | ||
3444 | + return ErrInvalidLengthShim | ||
3445 | + } | ||
3446 | + postStringIndexmapvalue := iNdEx + intStringLenmapvalue | ||
3447 | + if postStringIndexmapvalue < 0 { | ||
3448 | + return ErrInvalidLengthShim | ||
3449 | + } | ||
3450 | + if postStringIndexmapvalue > l { | ||
3451 | + return io.ErrUnexpectedEOF | ||
3452 | + } | ||
3453 | + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) | ||
3454 | + iNdEx = postStringIndexmapvalue | ||
3455 | + } else { | ||
3456 | + iNdEx = entryPreIndex | ||
3457 | + skippy, err := skipShim(dAtA[iNdEx:]) | ||
3458 | + if err != nil { | ||
3459 | + return err | ||
3460 | + } | ||
3461 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3462 | + return ErrInvalidLengthShim | ||
3463 | + } | ||
3464 | + if (iNdEx + skippy) > postIndex { | ||
3465 | + return io.ErrUnexpectedEOF | ||
3466 | + } | ||
3467 | + iNdEx += skippy | ||
3468 | + } | ||
3469 | + } | ||
3470 | + m.Annotations[mapkey] = mapvalue | ||
3471 | + iNdEx = postIndex | ||
3472 | default: | ||
3473 | iNdEx = preIndex | ||
3474 | skippy, err := skipShim(dAtA[iNdEx:]) | ||
3475 | if err != nil { | ||
3476 | return err | ||
3477 | } | ||
3478 | - if skippy < 0 { | ||
3479 | - return ErrInvalidLengthShim | ||
3480 | - } | ||
3481 | - if (iNdEx + skippy) < 0 { | ||
3482 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3483 | return ErrInvalidLengthShim | ||
3484 | } | ||
3485 | if (iNdEx + skippy) > l { | ||
3486 | @@ -6152,10 +6279,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | ||
3487 | if err != nil { | ||
3488 | return err | ||
3489 | } | ||
3490 | - if skippy < 0 { | ||
3491 | - return ErrInvalidLengthShim | ||
3492 | - } | ||
3493 | - if (iNdEx + skippy) < 0 { | ||
3494 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3495 | return ErrInvalidLengthShim | ||
3496 | } | ||
3497 | if (iNdEx + skippy) > l { | ||
3498 | @@ -6225,10 +6349,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | ||
3499 | if err != nil { | ||
3500 | return err | ||
3501 | } | ||
3502 | - if skippy < 0 { | ||
3503 | - return ErrInvalidLengthShim | ||
3504 | - } | ||
3505 | - if (iNdEx + skippy) < 0 { | ||
3506 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3507 | return ErrInvalidLengthShim | ||
3508 | } | ||
3509 | if (iNdEx + skippy) > l { | ||
3510 | @@ -6343,10 +6464,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | ||
3511 | if err != nil { | ||
3512 | return err | ||
3513 | } | ||
3514 | - if skippy < 0 { | ||
3515 | - return ErrInvalidLengthShim | ||
3516 | - } | ||
3517 | - if (iNdEx + skippy) < 0 { | ||
3518 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3519 | return ErrInvalidLengthShim | ||
3520 | } | ||
3521 | if (iNdEx + skippy) > l { | ||
3522 | @@ -6449,10 +6567,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | ||
3523 | if err != nil { | ||
3524 | return err | ||
3525 | } | ||
3526 | - if skippy < 0 { | ||
3527 | - return ErrInvalidLengthShim | ||
3528 | - } | ||
3529 | - if (iNdEx + skippy) < 0 { | ||
3530 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3531 | return ErrInvalidLengthShim | ||
3532 | } | ||
3533 | if (iNdEx + skippy) > l { | ||
3534 | @@ -6535,10 +6650,7 @@ func (m *StatsRequest) Unmarshal(dAtA []byte) error { | ||
3535 | if err != nil { | ||
3536 | return err | ||
3537 | } | ||
3538 | - if skippy < 0 { | ||
3539 | - return ErrInvalidLengthShim | ||
3540 | - } | ||
3541 | - if (iNdEx + skippy) < 0 { | ||
3542 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3543 | return ErrInvalidLengthShim | ||
3544 | } | ||
3545 | if (iNdEx + skippy) > l { | ||
3546 | @@ -6625,10 +6737,7 @@ func (m *StatsResponse) Unmarshal(dAtA []byte) error { | ||
3547 | if err != nil { | ||
3548 | return err | ||
3549 | } | ||
3550 | - if skippy < 0 { | ||
3551 | - return ErrInvalidLengthShim | ||
3552 | - } | ||
3553 | - if (iNdEx + skippy) < 0 { | ||
3554 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3555 | return ErrInvalidLengthShim | ||
3556 | } | ||
3557 | if (iNdEx + skippy) > l { | ||
3558 | @@ -6711,10 +6820,7 @@ func (m *ConnectRequest) Unmarshal(dAtA []byte) error { | ||
3559 | if err != nil { | ||
3560 | return err | ||
3561 | } | ||
3562 | - if skippy < 0 { | ||
3563 | - return ErrInvalidLengthShim | ||
3564 | - } | ||
3565 | - if (iNdEx + skippy) < 0 { | ||
3566 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3567 | return ErrInvalidLengthShim | ||
3568 | } | ||
3569 | if (iNdEx + skippy) > l { | ||
3570 | @@ -6835,10 +6941,7 @@ func (m *ConnectResponse) Unmarshal(dAtA []byte) error { | ||
3571 | if err != nil { | ||
3572 | return err | ||
3573 | } | ||
3574 | - if skippy < 0 { | ||
3575 | - return ErrInvalidLengthShim | ||
3576 | - } | ||
3577 | - if (iNdEx + skippy) < 0 { | ||
3578 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3579 | return ErrInvalidLengthShim | ||
3580 | } | ||
3581 | if (iNdEx + skippy) > l { | ||
3582 | @@ -6941,10 +7044,7 @@ func (m *ShutdownRequest) Unmarshal(dAtA []byte) error { | ||
3583 | if err != nil { | ||
3584 | return err | ||
3585 | } | ||
3586 | - if skippy < 0 { | ||
3587 | - return ErrInvalidLengthShim | ||
3588 | - } | ||
3589 | - if (iNdEx + skippy) < 0 { | ||
3590 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3591 | return ErrInvalidLengthShim | ||
3592 | } | ||
3593 | if (iNdEx + skippy) > l { | ||
3594 | @@ -7027,10 +7127,7 @@ func (m *PauseRequest) Unmarshal(dAtA []byte) error { | ||
3595 | if err != nil { | ||
3596 | return err | ||
3597 | } | ||
3598 | - if skippy < 0 { | ||
3599 | - return ErrInvalidLengthShim | ||
3600 | - } | ||
3601 | - if (iNdEx + skippy) < 0 { | ||
3602 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3603 | return ErrInvalidLengthShim | ||
3604 | } | ||
3605 | if (iNdEx + skippy) > l { | ||
3606 | @@ -7113,10 +7210,7 @@ func (m *ResumeRequest) Unmarshal(dAtA []byte) error { | ||
3607 | if err != nil { | ||
3608 | return err | ||
3609 | } | ||
3610 | - if skippy < 0 { | ||
3611 | - return ErrInvalidLengthShim | ||
3612 | - } | ||
3613 | - if (iNdEx + skippy) < 0 { | ||
3614 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3615 | return ErrInvalidLengthShim | ||
3616 | } | ||
3617 | if (iNdEx + skippy) > l { | ||
3618 | diff --git a/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go b/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go | ||
3619 | index 9a2374b56..fae67de4f 100644 | ||
3620 | --- a/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go | ||
3621 | +++ b/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go | ||
3622 | @@ -844,7 +844,7 @@ func (p *unmarshal) field(file *generator.FileDescriptor, msg *generator.Descrip | ||
3623 | p.P(`return err`) | ||
3624 | p.Out() | ||
3625 | p.P(`}`) | ||
3626 | - p.P(`if skippy < 0 {`) | ||
3627 | + p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`) | ||
3628 | p.In() | ||
3629 | p.P(`return ErrInvalidLength`, p.localName) | ||
3630 | p.Out() | ||
3631 | @@ -1484,12 +1484,7 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) { | ||
3632 | p.P(`return err`) | ||
3633 | p.Out() | ||
3634 | p.P(`}`) | ||
3635 | - p.P(`if skippy < 0 {`) | ||
3636 | - p.In() | ||
3637 | - p.P(`return ErrInvalidLength`, p.localName) | ||
3638 | - p.Out() | ||
3639 | - p.P(`}`) | ||
3640 | - p.P(`if (iNdEx + skippy) < 0 {`) | ||
3641 | + p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`) | ||
3642 | p.In() | ||
3643 | p.P(`return ErrInvalidLength`, p.localName) | ||
3644 | p.Out() | ||
3645 | @@ -1512,12 +1507,7 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) { | ||
3646 | p.P(`return err`) | ||
3647 | p.Out() | ||
3648 | p.P(`}`) | ||
3649 | - p.P(`if skippy < 0 {`) | ||
3650 | - p.In() | ||
3651 | - p.P(`return ErrInvalidLength`, p.localName) | ||
3652 | - p.Out() | ||
3653 | - p.P(`}`) | ||
3654 | - p.P(`if (iNdEx + skippy) < 0 {`) | ||
3655 | + p.P(`if (skippy < 0) || (iNdEx + skippy) < 0 {`) | ||
3656 | p.In() | ||
3657 | p.P(`return ErrInvalidLength`, p.localName) | ||
3658 | p.Out() | ||
3659 | diff --git a/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go b/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go | ||
3660 | index 1ce0be2fa..f85c0cc81 100644 | ||
3661 | --- a/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go | ||
3662 | +++ b/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go | ||
3663 | @@ -318,7 +318,7 @@ func unescape(s string) (ch string, tail string, err error) { | ||
3664 | if i > utf8.MaxRune { | ||
3665 | return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss) | ||
3666 | } | ||
3667 | - return string(i), s, nil | ||
3668 | + return string(rune(i)), s, nil | ||
3669 | } | ||
3670 | return "", "", fmt.Errorf(`unknown escape \%c`, r) | ||
3671 | } | ||
3672 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go | ||
3673 | index 98e269d54..e3d4d9490 100644 | ||
3674 | --- a/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go | ||
3675 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go | ||
3676 | @@ -592,10 +592,7 @@ func (m *Any) Unmarshal(dAtA []byte) error { | ||
3677 | if err != nil { | ||
3678 | return err | ||
3679 | } | ||
3680 | - if skippy < 0 { | ||
3681 | - return ErrInvalidLengthAny | ||
3682 | - } | ||
3683 | - if (iNdEx + skippy) < 0 { | ||
3684 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3685 | return ErrInvalidLengthAny | ||
3686 | } | ||
3687 | if (iNdEx + skippy) > l { | ||
3688 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go | ||
3689 | index 58bf4b53b..83e886920 100644 | ||
3690 | --- a/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go | ||
3691 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go | ||
3692 | @@ -1677,10 +1677,7 @@ func (m *Api) Unmarshal(dAtA []byte) error { | ||
3693 | if err != nil { | ||
3694 | return err | ||
3695 | } | ||
3696 | - if skippy < 0 { | ||
3697 | - return ErrInvalidLengthApi | ||
3698 | - } | ||
3699 | - if (iNdEx + skippy) < 0 { | ||
3700 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3701 | return ErrInvalidLengthApi | ||
3702 | } | ||
3703 | if (iNdEx + skippy) > l { | ||
3704 | @@ -1920,10 +1917,7 @@ func (m *Method) Unmarshal(dAtA []byte) error { | ||
3705 | if err != nil { | ||
3706 | return err | ||
3707 | } | ||
3708 | - if skippy < 0 { | ||
3709 | - return ErrInvalidLengthApi | ||
3710 | - } | ||
3711 | - if (iNdEx + skippy) < 0 { | ||
3712 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3713 | return ErrInvalidLengthApi | ||
3714 | } | ||
3715 | if (iNdEx + skippy) > l { | ||
3716 | @@ -2038,10 +2032,7 @@ func (m *Mixin) Unmarshal(dAtA []byte) error { | ||
3717 | if err != nil { | ||
3718 | return err | ||
3719 | } | ||
3720 | - if skippy < 0 { | ||
3721 | - return ErrInvalidLengthApi | ||
3722 | - } | ||
3723 | - if (iNdEx + skippy) < 0 { | ||
3724 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3725 | return ErrInvalidLengthApi | ||
3726 | } | ||
3727 | if (iNdEx + skippy) > l { | ||
3728 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go | ||
3729 | index 3959f0669..4deafcb1c 100644 | ||
3730 | --- a/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go | ||
3731 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go | ||
3732 | @@ -415,10 +415,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error { | ||
3733 | if err != nil { | ||
3734 | return err | ||
3735 | } | ||
3736 | - if skippy < 0 { | ||
3737 | - return ErrInvalidLengthDuration | ||
3738 | - } | ||
3739 | - if (iNdEx + skippy) < 0 { | ||
3740 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3741 | return ErrInvalidLengthDuration | ||
3742 | } | ||
3743 | if (iNdEx + skippy) > l { | ||
3744 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go | ||
3745 | index 17e3aa558..9e94748b3 100644 | ||
3746 | --- a/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go | ||
3747 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go | ||
3748 | @@ -360,10 +360,7 @@ func (m *Empty) Unmarshal(dAtA []byte) error { | ||
3749 | if err != nil { | ||
3750 | return err | ||
3751 | } | ||
3752 | - if skippy < 0 { | ||
3753 | - return ErrInvalidLengthEmpty | ||
3754 | - } | ||
3755 | - if (iNdEx + skippy) < 0 { | ||
3756 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3757 | return ErrInvalidLengthEmpty | ||
3758 | } | ||
3759 | if (iNdEx + skippy) > l { | ||
3760 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go | ||
3761 | index 7226b57f7..6ae346d92 100644 | ||
3762 | --- a/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go | ||
3763 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go | ||
3764 | @@ -636,10 +636,7 @@ func (m *FieldMask) Unmarshal(dAtA []byte) error { | ||
3765 | if err != nil { | ||
3766 | return err | ||
3767 | } | ||
3768 | - if skippy < 0 { | ||
3769 | - return ErrInvalidLengthFieldMask | ||
3770 | - } | ||
3771 | - if (iNdEx + skippy) < 0 { | ||
3772 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3773 | return ErrInvalidLengthFieldMask | ||
3774 | } | ||
3775 | if (iNdEx + skippy) > l { | ||
3776 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go | ||
3777 | index 61045ce10..8e6ce71b2 100644 | ||
3778 | --- a/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go | ||
3779 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go | ||
3780 | @@ -422,10 +422,7 @@ func (m *SourceContext) Unmarshal(dAtA []byte) error { | ||
3781 | if err != nil { | ||
3782 | return err | ||
3783 | } | ||
3784 | - if skippy < 0 { | ||
3785 | - return ErrInvalidLengthSourceContext | ||
3786 | - } | ||
3787 | - if (iNdEx + skippy) < 0 { | ||
3788 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3789 | return ErrInvalidLengthSourceContext | ||
3790 | } | ||
3791 | if (iNdEx + skippy) > l { | ||
3792 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go | ||
3793 | index cea553eef..c0457312e 100644 | ||
3794 | --- a/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go | ||
3795 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go | ||
3796 | @@ -1862,7 +1862,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error { | ||
3797 | if err != nil { | ||
3798 | return err | ||
3799 | } | ||
3800 | - if skippy < 0 { | ||
3801 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3802 | return ErrInvalidLengthStruct | ||
3803 | } | ||
3804 | if (iNdEx + skippy) > postIndex { | ||
3805 | @@ -1879,10 +1879,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error { | ||
3806 | if err != nil { | ||
3807 | return err | ||
3808 | } | ||
3809 | - if skippy < 0 { | ||
3810 | - return ErrInvalidLengthStruct | ||
3811 | - } | ||
3812 | - if (iNdEx + skippy) < 0 { | ||
3813 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3814 | return ErrInvalidLengthStruct | ||
3815 | } | ||
3816 | if (iNdEx + skippy) > l { | ||
3817 | @@ -2087,10 +2084,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { | ||
3818 | if err != nil { | ||
3819 | return err | ||
3820 | } | ||
3821 | - if skippy < 0 { | ||
3822 | - return ErrInvalidLengthStruct | ||
3823 | - } | ||
3824 | - if (iNdEx + skippy) < 0 { | ||
3825 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3826 | return ErrInvalidLengthStruct | ||
3827 | } | ||
3828 | if (iNdEx + skippy) > l { | ||
3829 | @@ -2175,10 +2169,7 @@ func (m *ListValue) Unmarshal(dAtA []byte) error { | ||
3830 | if err != nil { | ||
3831 | return err | ||
3832 | } | ||
3833 | - if skippy < 0 { | ||
3834 | - return ErrInvalidLengthStruct | ||
3835 | - } | ||
3836 | - if (iNdEx + skippy) < 0 { | ||
3837 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3838 | return ErrInvalidLengthStruct | ||
3839 | } | ||
3840 | if (iNdEx + skippy) > l { | ||
3841 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go | ||
3842 | index b81875267..45db7b3bb 100644 | ||
3843 | --- a/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go | ||
3844 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go | ||
3845 | @@ -437,10 +437,7 @@ func (m *Timestamp) Unmarshal(dAtA []byte) error { | ||
3846 | if err != nil { | ||
3847 | return err | ||
3848 | } | ||
3849 | - if skippy < 0 { | ||
3850 | - return ErrInvalidLengthTimestamp | ||
3851 | - } | ||
3852 | - if (iNdEx + skippy) < 0 { | ||
3853 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3854 | return ErrInvalidLengthTimestamp | ||
3855 | } | ||
3856 | if (iNdEx + skippy) > l { | ||
3857 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go | ||
3858 | index 13b7ec02f..791427bb2 100644 | ||
3859 | --- a/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go | ||
3860 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go | ||
3861 | @@ -2483,10 +2483,7 @@ func (m *Type) Unmarshal(dAtA []byte) error { | ||
3862 | if err != nil { | ||
3863 | return err | ||
3864 | } | ||
3865 | - if skippy < 0 { | ||
3866 | - return ErrInvalidLengthType | ||
3867 | - } | ||
3868 | - if (iNdEx + skippy) < 0 { | ||
3869 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3870 | return ErrInvalidLengthType | ||
3871 | } | ||
3872 | if (iNdEx + skippy) > l { | ||
3873 | @@ -2795,10 +2792,7 @@ func (m *Field) Unmarshal(dAtA []byte) error { | ||
3874 | if err != nil { | ||
3875 | return err | ||
3876 | } | ||
3877 | - if skippy < 0 { | ||
3878 | - return ErrInvalidLengthType | ||
3879 | - } | ||
3880 | - if (iNdEx + skippy) < 0 { | ||
3881 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3882 | return ErrInvalidLengthType | ||
3883 | } | ||
3884 | if (iNdEx + skippy) > l { | ||
3885 | @@ -3004,10 +2998,7 @@ func (m *Enum) Unmarshal(dAtA []byte) error { | ||
3886 | if err != nil { | ||
3887 | return err | ||
3888 | } | ||
3889 | - if skippy < 0 { | ||
3890 | - return ErrInvalidLengthType | ||
3891 | - } | ||
3892 | - if (iNdEx + skippy) < 0 { | ||
3893 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3894 | return ErrInvalidLengthType | ||
3895 | } | ||
3896 | if (iNdEx + skippy) > l { | ||
3897 | @@ -3143,10 +3134,7 @@ func (m *EnumValue) Unmarshal(dAtA []byte) error { | ||
3898 | if err != nil { | ||
3899 | return err | ||
3900 | } | ||
3901 | - if skippy < 0 { | ||
3902 | - return ErrInvalidLengthType | ||
3903 | - } | ||
3904 | - if (iNdEx + skippy) < 0 { | ||
3905 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3906 | return ErrInvalidLengthType | ||
3907 | } | ||
3908 | if (iNdEx + skippy) > l { | ||
3909 | @@ -3265,10 +3253,7 @@ func (m *Option) Unmarshal(dAtA []byte) error { | ||
3910 | if err != nil { | ||
3911 | return err | ||
3912 | } | ||
3913 | - if skippy < 0 { | ||
3914 | - return ErrInvalidLengthType | ||
3915 | - } | ||
3916 | - if (iNdEx + skippy) < 0 { | ||
3917 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3918 | return ErrInvalidLengthType | ||
3919 | } | ||
3920 | if (iNdEx + skippy) > l { | ||
3921 | diff --git a/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go b/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go | ||
3922 | index 8f1edb57d..8d415420a 100644 | ||
3923 | --- a/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go | ||
3924 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go | ||
3925 | @@ -2020,10 +2020,7 @@ func (m *DoubleValue) Unmarshal(dAtA []byte) error { | ||
3926 | if err != nil { | ||
3927 | return err | ||
3928 | } | ||
3929 | - if skippy < 0 { | ||
3930 | - return ErrInvalidLengthWrappers | ||
3931 | - } | ||
3932 | - if (iNdEx + skippy) < 0 { | ||
3933 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3934 | return ErrInvalidLengthWrappers | ||
3935 | } | ||
3936 | if (iNdEx + skippy) > l { | ||
3937 | @@ -2085,10 +2082,7 @@ func (m *FloatValue) Unmarshal(dAtA []byte) error { | ||
3938 | if err != nil { | ||
3939 | return err | ||
3940 | } | ||
3941 | - if skippy < 0 { | ||
3942 | - return ErrInvalidLengthWrappers | ||
3943 | - } | ||
3944 | - if (iNdEx + skippy) < 0 { | ||
3945 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3946 | return ErrInvalidLengthWrappers | ||
3947 | } | ||
3948 | if (iNdEx + skippy) > l { | ||
3949 | @@ -2158,10 +2152,7 @@ func (m *Int64Value) Unmarshal(dAtA []byte) error { | ||
3950 | if err != nil { | ||
3951 | return err | ||
3952 | } | ||
3953 | - if skippy < 0 { | ||
3954 | - return ErrInvalidLengthWrappers | ||
3955 | - } | ||
3956 | - if (iNdEx + skippy) < 0 { | ||
3957 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3958 | return ErrInvalidLengthWrappers | ||
3959 | } | ||
3960 | if (iNdEx + skippy) > l { | ||
3961 | @@ -2231,10 +2222,7 @@ func (m *UInt64Value) Unmarshal(dAtA []byte) error { | ||
3962 | if err != nil { | ||
3963 | return err | ||
3964 | } | ||
3965 | - if skippy < 0 { | ||
3966 | - return ErrInvalidLengthWrappers | ||
3967 | - } | ||
3968 | - if (iNdEx + skippy) < 0 { | ||
3969 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3970 | return ErrInvalidLengthWrappers | ||
3971 | } | ||
3972 | if (iNdEx + skippy) > l { | ||
3973 | @@ -2304,10 +2292,7 @@ func (m *Int32Value) Unmarshal(dAtA []byte) error { | ||
3974 | if err != nil { | ||
3975 | return err | ||
3976 | } | ||
3977 | - if skippy < 0 { | ||
3978 | - return ErrInvalidLengthWrappers | ||
3979 | - } | ||
3980 | - if (iNdEx + skippy) < 0 { | ||
3981 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3982 | return ErrInvalidLengthWrappers | ||
3983 | } | ||
3984 | if (iNdEx + skippy) > l { | ||
3985 | @@ -2377,10 +2362,7 @@ func (m *UInt32Value) Unmarshal(dAtA []byte) error { | ||
3986 | if err != nil { | ||
3987 | return err | ||
3988 | } | ||
3989 | - if skippy < 0 { | ||
3990 | - return ErrInvalidLengthWrappers | ||
3991 | - } | ||
3992 | - if (iNdEx + skippy) < 0 { | ||
3993 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
3994 | return ErrInvalidLengthWrappers | ||
3995 | } | ||
3996 | if (iNdEx + skippy) > l { | ||
3997 | @@ -2451,10 +2433,7 @@ func (m *BoolValue) Unmarshal(dAtA []byte) error { | ||
3998 | if err != nil { | ||
3999 | return err | ||
4000 | } | ||
4001 | - if skippy < 0 { | ||
4002 | - return ErrInvalidLengthWrappers | ||
4003 | - } | ||
4004 | - if (iNdEx + skippy) < 0 { | ||
4005 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
4006 | return ErrInvalidLengthWrappers | ||
4007 | } | ||
4008 | if (iNdEx + skippy) > l { | ||
4009 | @@ -2537,10 +2516,7 @@ func (m *StringValue) Unmarshal(dAtA []byte) error { | ||
4010 | if err != nil { | ||
4011 | return err | ||
4012 | } | ||
4013 | - if skippy < 0 { | ||
4014 | - return ErrInvalidLengthWrappers | ||
4015 | - } | ||
4016 | - if (iNdEx + skippy) < 0 { | ||
4017 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
4018 | return ErrInvalidLengthWrappers | ||
4019 | } | ||
4020 | if (iNdEx + skippy) > l { | ||
4021 | @@ -2625,10 +2601,7 @@ func (m *BytesValue) Unmarshal(dAtA []byte) error { | ||
4022 | if err != nil { | ||
4023 | return err | ||
4024 | } | ||
4025 | - if skippy < 0 { | ||
4026 | - return ErrInvalidLengthWrappers | ||
4027 | - } | ||
4028 | - if (iNdEx + skippy) < 0 { | ||
4029 | + if (skippy < 0) || (iNdEx+skippy) < 0 { | ||
4030 | return ErrInvalidLengthWrappers | ||
4031 | } | ||
4032 | if (iNdEx + skippy) > l { | ||
4033 | -- | ||
4034 | 2.30.2 | ||
4035 | |||