diff options
author | Trevor Gamblin <trevor.gamblin@windriver.com> | 2021-04-26 11:24:19 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-27 22:42:22 -0400 |
commit | 3cbc7143ec3786f2a2fcdfc9333729d2a89b3a8c (patch) | |
tree | 692a79bb53b0018d0abc910c82d9a2b0ce113695 | |
parent | c492f6b3d0458fa9ea0de2b07f1b3fb9162a02a0 (diff) | |
download | meta-virtualization-3cbc7143ec3786f2a2fcdfc9333729d2a89b3a8c.tar.gz |
containerd: fix fuzz for CVE-2021-3121 patch
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/containerd/files/CVE-2021-3121.patch | 849 |
1 files changed, 423 insertions, 426 deletions
diff --git a/recipes-containers/containerd/files/CVE-2021-3121.patch b/recipes-containers/containerd/files/CVE-2021-3121.patch index 1a2c0f4f..ead1746f 100644 --- a/recipes-containers/containerd/files/CVE-2021-3121.patch +++ b/recipes-containers/containerd/files/CVE-2021-3121.patch | |||
@@ -53,11 +53,11 @@ Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> | |||
53 | src/import/.../gogo/protobuf/types/wrappers.pb.go | 45 +- | 53 | src/import/.../gogo/protobuf/types/wrappers.pb.go | 45 +- |
54 | 39 files changed, 773 insertions(+), 1133 deletions(-) | 54 | 39 files changed, 773 insertions(+), 1133 deletions(-) |
55 | 55 | ||
56 | diff --git a/src/import/api/events/container.pb.go b/src/import/api/events/container.pb.go | 56 | Index: git/src/import/api/events/container.pb.go |
57 | index 0c1e0a939..fe002e073 100644 | 57 | =================================================================== |
58 | --- a/src/import/api/events/container.pb.go | 58 | --- git.orig/src/import/api/events/container.pb.go |
59 | +++ b/src/import/api/events/container.pb.go | 59 | +++ git/src/import/api/events/container.pb.go |
60 | @@ -835,10 +835,7 @@ func (m *ContainerCreate) Unmarshal(dAtA []byte) error { | 60 | @@ -835,10 +835,7 @@ func (m *ContainerCreate) Unmarshal(dAtA |
61 | if err != nil { | 61 | if err != nil { |
62 | return err | 62 | return err |
63 | } | 63 | } |
@@ -69,7 +69,7 @@ index 0c1e0a939..fe002e073 100644 | |||
69 | return ErrInvalidLengthContainer | 69 | return ErrInvalidLengthContainer |
70 | } | 70 | } |
71 | if (iNdEx + skippy) > l { | 71 | if (iNdEx + skippy) > l { |
72 | @@ -957,10 +954,7 @@ func (m *ContainerCreate_Runtime) Unmarshal(dAtA []byte) error { | 72 | @@ -957,10 +954,7 @@ func (m *ContainerCreate_Runtime) Unmars |
73 | if err != nil { | 73 | if err != nil { |
74 | return err | 74 | return err |
75 | } | 75 | } |
@@ -81,7 +81,7 @@ index 0c1e0a939..fe002e073 100644 | |||
81 | return ErrInvalidLengthContainer | 81 | return ErrInvalidLengthContainer |
82 | } | 82 | } |
83 | if (iNdEx + skippy) > l { | 83 | if (iNdEx + skippy) > l { |
84 | @@ -1185,7 +1179,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { | 84 | @@ -1185,7 +1179,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA |
85 | if err != nil { | 85 | if err != nil { |
86 | return err | 86 | return err |
87 | } | 87 | } |
@@ -90,7 +90,7 @@ index 0c1e0a939..fe002e073 100644 | |||
90 | return ErrInvalidLengthContainer | 90 | return ErrInvalidLengthContainer |
91 | } | 91 | } |
92 | if (iNdEx + skippy) > postIndex { | 92 | if (iNdEx + skippy) > postIndex { |
93 | @@ -1234,10 +1228,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA []byte) error { | 93 | @@ -1234,10 +1228,7 @@ func (m *ContainerUpdate) Unmarshal(dAtA |
94 | if err != nil { | 94 | if err != nil { |
95 | return err | 95 | return err |
96 | } | 96 | } |
@@ -102,7 +102,7 @@ index 0c1e0a939..fe002e073 100644 | |||
102 | return ErrInvalidLengthContainer | 102 | return ErrInvalidLengthContainer |
103 | } | 103 | } |
104 | if (iNdEx + skippy) > l { | 104 | if (iNdEx + skippy) > l { |
105 | @@ -1320,10 +1311,7 @@ func (m *ContainerDelete) Unmarshal(dAtA []byte) error { | 105 | @@ -1320,10 +1311,7 @@ func (m *ContainerDelete) Unmarshal(dAtA |
106 | if err != nil { | 106 | if err != nil { |
107 | return err | 107 | return err |
108 | } | 108 | } |
@@ -114,11 +114,11 @@ index 0c1e0a939..fe002e073 100644 | |||
114 | return ErrInvalidLengthContainer | 114 | return ErrInvalidLengthContainer |
115 | } | 115 | } |
116 | if (iNdEx + skippy) > l { | 116 | if (iNdEx + skippy) > l { |
117 | diff --git a/src/import/api/events/content.pb.go b/src/import/api/events/content.pb.go | 117 | Index: git/src/import/api/events/content.pb.go |
118 | index 959ea72d8..0a7ec9325 100644 | 118 | =================================================================== |
119 | --- a/src/import/api/events/content.pb.go | 119 | --- git.orig/src/import/api/events/content.pb.go |
120 | +++ b/src/import/api/events/content.pb.go | 120 | +++ git/src/import/api/events/content.pb.go |
121 | @@ -257,10 +257,7 @@ func (m *ContentDelete) Unmarshal(dAtA []byte) error { | 121 | @@ -257,10 +257,7 @@ func (m *ContentDelete) Unmarshal(dAtA [ |
122 | if err != nil { | 122 | if err != nil { |
123 | return err | 123 | return err |
124 | } | 124 | } |
@@ -130,11 +130,11 @@ index 959ea72d8..0a7ec9325 100644 | |||
130 | return ErrInvalidLengthContent | 130 | return ErrInvalidLengthContent |
131 | } | 131 | } |
132 | if (iNdEx + skippy) > l { | 132 | if (iNdEx + skippy) > l { |
133 | diff --git a/src/import/api/events/image.pb.go b/src/import/api/events/image.pb.go | 133 | Index: git/src/import/api/events/image.pb.go |
134 | index 13f60b017..747026945 100644 | 134 | =================================================================== |
135 | --- a/src/import/api/events/image.pb.go | 135 | --- git.orig/src/import/api/events/image.pb.go |
136 | +++ b/src/import/api/events/image.pb.go | 136 | +++ git/src/import/api/events/image.pb.go |
137 | @@ -697,7 +697,7 @@ func (m *ImageCreate) Unmarshal(dAtA []byte) error { | 137 | @@ -697,7 +697,7 @@ func (m *ImageCreate) Unmarshal(dAtA []b |
138 | if err != nil { | 138 | if err != nil { |
139 | return err | 139 | return err |
140 | } | 140 | } |
@@ -143,7 +143,7 @@ index 13f60b017..747026945 100644 | |||
143 | return ErrInvalidLengthImage | 143 | return ErrInvalidLengthImage |
144 | } | 144 | } |
145 | if (iNdEx + skippy) > postIndex { | 145 | if (iNdEx + skippy) > postIndex { |
146 | @@ -714,10 +714,7 @@ func (m *ImageCreate) Unmarshal(dAtA []byte) error { | 146 | @@ -714,10 +714,7 @@ func (m *ImageCreate) Unmarshal(dAtA []b |
147 | if err != nil { | 147 | if err != nil { |
148 | return err | 148 | return err |
149 | } | 149 | } |
@@ -155,7 +155,7 @@ index 13f60b017..747026945 100644 | |||
155 | return ErrInvalidLengthImage | 155 | return ErrInvalidLengthImage |
156 | } | 156 | } |
157 | if (iNdEx + skippy) > l { | 157 | if (iNdEx + skippy) > l { |
158 | @@ -910,7 +907,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []byte) error { | 158 | @@ -910,7 +907,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []b |
159 | if err != nil { | 159 | if err != nil { |
160 | return err | 160 | return err |
161 | } | 161 | } |
@@ -164,7 +164,7 @@ index 13f60b017..747026945 100644 | |||
164 | return ErrInvalidLengthImage | 164 | return ErrInvalidLengthImage |
165 | } | 165 | } |
166 | if (iNdEx + skippy) > postIndex { | 166 | if (iNdEx + skippy) > postIndex { |
167 | @@ -927,10 +924,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []byte) error { | 167 | @@ -927,10 +924,7 @@ func (m *ImageUpdate) Unmarshal(dAtA []b |
168 | if err != nil { | 168 | if err != nil { |
169 | return err | 169 | return err |
170 | } | 170 | } |
@@ -176,7 +176,7 @@ index 13f60b017..747026945 100644 | |||
176 | return ErrInvalidLengthImage | 176 | return ErrInvalidLengthImage |
177 | } | 177 | } |
178 | if (iNdEx + skippy) > l { | 178 | if (iNdEx + skippy) > l { |
179 | @@ -1013,10 +1007,7 @@ func (m *ImageDelete) Unmarshal(dAtA []byte) error { | 179 | @@ -1013,10 +1007,7 @@ func (m *ImageDelete) Unmarshal(dAtA []b |
180 | if err != nil { | 180 | if err != nil { |
181 | return err | 181 | return err |
182 | } | 182 | } |
@@ -188,11 +188,11 @@ index 13f60b017..747026945 100644 | |||
188 | return ErrInvalidLengthImage | 188 | return ErrInvalidLengthImage |
189 | } | 189 | } |
190 | if (iNdEx + skippy) > l { | 190 | if (iNdEx + skippy) > l { |
191 | diff --git a/src/import/api/events/namespace.pb.go b/src/import/api/events/namespace.pb.go | 191 | Index: git/src/import/api/events/namespace.pb.go |
192 | index 37c3b78cf..d406a987e 100644 | 192 | =================================================================== |
193 | --- a/src/import/api/events/namespace.pb.go | 193 | --- git.orig/src/import/api/events/namespace.pb.go |
194 | +++ b/src/import/api/events/namespace.pb.go | 194 | +++ git/src/import/api/events/namespace.pb.go |
195 | @@ -697,7 +697,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA []byte) error { | 195 | @@ -697,7 +697,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA |
196 | if err != nil { | 196 | if err != nil { |
197 | return err | 197 | return err |
198 | } | 198 | } |
@@ -201,7 +201,7 @@ index 37c3b78cf..d406a987e 100644 | |||
201 | return ErrInvalidLengthNamespace | 201 | return ErrInvalidLengthNamespace |
202 | } | 202 | } |
203 | if (iNdEx + skippy) > postIndex { | 203 | if (iNdEx + skippy) > postIndex { |
204 | @@ -714,10 +714,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA []byte) error { | 204 | @@ -714,10 +714,7 @@ func (m *NamespaceCreate) Unmarshal(dAtA |
205 | if err != nil { | 205 | if err != nil { |
206 | return err | 206 | return err |
207 | } | 207 | } |
@@ -213,7 +213,7 @@ index 37c3b78cf..d406a987e 100644 | |||
213 | return ErrInvalidLengthNamespace | 213 | return ErrInvalidLengthNamespace |
214 | } | 214 | } |
215 | if (iNdEx + skippy) > l { | 215 | if (iNdEx + skippy) > l { |
216 | @@ -910,7 +907,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA []byte) error { | 216 | @@ -910,7 +907,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA |
217 | if err != nil { | 217 | if err != nil { |
218 | return err | 218 | return err |
219 | } | 219 | } |
@@ -222,7 +222,7 @@ index 37c3b78cf..d406a987e 100644 | |||
222 | return ErrInvalidLengthNamespace | 222 | return ErrInvalidLengthNamespace |
223 | } | 223 | } |
224 | if (iNdEx + skippy) > postIndex { | 224 | if (iNdEx + skippy) > postIndex { |
225 | @@ -927,10 +924,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA []byte) error { | 225 | @@ -927,10 +924,7 @@ func (m *NamespaceUpdate) Unmarshal(dAtA |
226 | if err != nil { | 226 | if err != nil { |
227 | return err | 227 | return err |
228 | } | 228 | } |
@@ -234,7 +234,7 @@ index 37c3b78cf..d406a987e 100644 | |||
234 | return ErrInvalidLengthNamespace | 234 | return ErrInvalidLengthNamespace |
235 | } | 235 | } |
236 | if (iNdEx + skippy) > l { | 236 | if (iNdEx + skippy) > l { |
237 | @@ -1013,10 +1007,7 @@ func (m *NamespaceDelete) Unmarshal(dAtA []byte) error { | 237 | @@ -1013,10 +1007,7 @@ func (m *NamespaceDelete) Unmarshal(dAtA |
238 | if err != nil { | 238 | if err != nil { |
239 | return err | 239 | return err |
240 | } | 240 | } |
@@ -246,11 +246,11 @@ index 37c3b78cf..d406a987e 100644 | |||
246 | return ErrInvalidLengthNamespace | 246 | return ErrInvalidLengthNamespace |
247 | } | 247 | } |
248 | if (iNdEx + skippy) > l { | 248 | if (iNdEx + skippy) > l { |
249 | diff --git a/src/import/api/events/snapshot.pb.go b/src/import/api/events/snapshot.pb.go | 249 | Index: git/src/import/api/events/snapshot.pb.go |
250 | index 539297004..bec25c3a7 100644 | 250 | =================================================================== |
251 | --- a/src/import/api/events/snapshot.pb.go | 251 | --- git.orig/src/import/api/events/snapshot.pb.go |
252 | +++ b/src/import/api/events/snapshot.pb.go | 252 | +++ git/src/import/api/events/snapshot.pb.go |
253 | @@ -548,10 +548,7 @@ func (m *SnapshotPrepare) Unmarshal(dAtA []byte) error { | 253 | @@ -548,10 +548,7 @@ func (m *SnapshotPrepare) Unmarshal(dAtA |
254 | if err != nil { | 254 | if err != nil { |
255 | return err | 255 | return err |
256 | } | 256 | } |
@@ -262,7 +262,7 @@ index 539297004..bec25c3a7 100644 | |||
262 | return ErrInvalidLengthSnapshot | 262 | return ErrInvalidLengthSnapshot |
263 | } | 263 | } |
264 | if (iNdEx + skippy) > l { | 264 | if (iNdEx + skippy) > l { |
265 | @@ -666,10 +663,7 @@ func (m *SnapshotCommit) Unmarshal(dAtA []byte) error { | 265 | @@ -666,10 +663,7 @@ func (m *SnapshotCommit) Unmarshal(dAtA |
266 | if err != nil { | 266 | if err != nil { |
267 | return err | 267 | return err |
268 | } | 268 | } |
@@ -274,7 +274,7 @@ index 539297004..bec25c3a7 100644 | |||
274 | return ErrInvalidLengthSnapshot | 274 | return ErrInvalidLengthSnapshot |
275 | } | 275 | } |
276 | if (iNdEx + skippy) > l { | 276 | if (iNdEx + skippy) > l { |
277 | @@ -752,10 +746,7 @@ func (m *SnapshotRemove) Unmarshal(dAtA []byte) error { | 277 | @@ -752,10 +746,7 @@ func (m *SnapshotRemove) Unmarshal(dAtA |
278 | if err != nil { | 278 | if err != nil { |
279 | return err | 279 | return err |
280 | } | 280 | } |
@@ -286,11 +286,11 @@ index 539297004..bec25c3a7 100644 | |||
286 | return ErrInvalidLengthSnapshot | 286 | return ErrInvalidLengthSnapshot |
287 | } | 287 | } |
288 | if (iNdEx + skippy) > l { | 288 | if (iNdEx + skippy) > l { |
289 | diff --git a/src/import/api/events/task.pb.go b/src/import/api/events/task.pb.go | 289 | Index: git/src/import/api/events/task.pb.go |
290 | index 0f16695e3..f8f3a3f3d 100644 | 290 | =================================================================== |
291 | --- a/src/import/api/events/task.pb.go | 291 | --- git.orig/src/import/api/events/task.pb.go |
292 | +++ b/src/import/api/events/task.pb.go | 292 | +++ git/src/import/api/events/task.pb.go |
293 | @@ -1905,10 +1905,7 @@ func (m *TaskCreate) Unmarshal(dAtA []byte) error { | 293 | @@ -1905,10 +1905,7 @@ func (m *TaskCreate) Unmarshal(dAtA []by |
294 | if err != nil { | 294 | if err != nil { |
295 | return err | 295 | return err |
296 | } | 296 | } |
@@ -302,7 +302,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
302 | return ErrInvalidLengthTask | 302 | return ErrInvalidLengthTask |
303 | } | 303 | } |
304 | if (iNdEx + skippy) > l { | 304 | if (iNdEx + skippy) > l { |
305 | @@ -2010,10 +2007,7 @@ func (m *TaskStart) Unmarshal(dAtA []byte) error { | 305 | @@ -2010,10 +2007,7 @@ func (m *TaskStart) Unmarshal(dAtA []byt |
306 | if err != nil { | 306 | if err != nil { |
307 | return err | 307 | return err |
308 | } | 308 | } |
@@ -314,7 +314,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
314 | return ErrInvalidLengthTask | 314 | return ErrInvalidLengthTask |
315 | } | 315 | } |
316 | if (iNdEx + skippy) > l { | 316 | if (iNdEx + skippy) > l { |
317 | @@ -2199,10 +2193,7 @@ func (m *TaskDelete) Unmarshal(dAtA []byte) error { | 317 | @@ -2199,10 +2193,7 @@ func (m *TaskDelete) Unmarshal(dAtA []by |
318 | if err != nil { | 318 | if err != nil { |
319 | return err | 319 | return err |
320 | } | 320 | } |
@@ -326,7 +326,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
326 | return ErrInvalidLengthTask | 326 | return ErrInvalidLengthTask |
327 | } | 327 | } |
328 | if (iNdEx + skippy) > l { | 328 | if (iNdEx + skippy) > l { |
329 | @@ -2369,10 +2360,7 @@ func (m *TaskIO) Unmarshal(dAtA []byte) error { | 329 | @@ -2369,10 +2360,7 @@ func (m *TaskIO) Unmarshal(dAtA []byte) |
330 | if err != nil { | 330 | if err != nil { |
331 | return err | 331 | return err |
332 | } | 332 | } |
@@ -338,7 +338,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
338 | return ErrInvalidLengthTask | 338 | return ErrInvalidLengthTask |
339 | } | 339 | } |
340 | if (iNdEx + skippy) > l { | 340 | if (iNdEx + skippy) > l { |
341 | @@ -2558,10 +2546,7 @@ func (m *TaskExit) Unmarshal(dAtA []byte) error { | 341 | @@ -2558,10 +2546,7 @@ func (m *TaskExit) Unmarshal(dAtA []byte |
342 | if err != nil { | 342 | if err != nil { |
343 | return err | 343 | return err |
344 | } | 344 | } |
@@ -350,7 +350,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
350 | return ErrInvalidLengthTask | 350 | return ErrInvalidLengthTask |
351 | } | 351 | } |
352 | if (iNdEx + skippy) > l { | 352 | if (iNdEx + skippy) > l { |
353 | @@ -2644,10 +2629,7 @@ func (m *TaskOOM) Unmarshal(dAtA []byte) error { | 353 | @@ -2644,10 +2629,7 @@ func (m *TaskOOM) Unmarshal(dAtA []byte) |
354 | if err != nil { | 354 | if err != nil { |
355 | return err | 355 | return err |
356 | } | 356 | } |
@@ -362,7 +362,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
362 | return ErrInvalidLengthTask | 362 | return ErrInvalidLengthTask |
363 | } | 363 | } |
364 | if (iNdEx + skippy) > l { | 364 | if (iNdEx + skippy) > l { |
365 | @@ -2762,10 +2744,7 @@ func (m *TaskExecAdded) Unmarshal(dAtA []byte) error { | 365 | @@ -2762,10 +2744,7 @@ func (m *TaskExecAdded) Unmarshal(dAtA [ |
366 | if err != nil { | 366 | if err != nil { |
367 | return err | 367 | return err |
368 | } | 368 | } |
@@ -374,7 +374,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
374 | return ErrInvalidLengthTask | 374 | return ErrInvalidLengthTask |
375 | } | 375 | } |
376 | if (iNdEx + skippy) > l { | 376 | if (iNdEx + skippy) > l { |
377 | @@ -2899,10 +2878,7 @@ func (m *TaskExecStarted) Unmarshal(dAtA []byte) error { | 377 | @@ -2899,10 +2878,7 @@ func (m *TaskExecStarted) Unmarshal(dAtA |
378 | if err != nil { | 378 | if err != nil { |
379 | return err | 379 | return err |
380 | } | 380 | } |
@@ -386,7 +386,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
386 | return ErrInvalidLengthTask | 386 | return ErrInvalidLengthTask |
387 | } | 387 | } |
388 | if (iNdEx + skippy) > l { | 388 | if (iNdEx + skippy) > l { |
389 | @@ -2985,10 +2961,7 @@ func (m *TaskPaused) Unmarshal(dAtA []byte) error { | 389 | @@ -2985,10 +2961,7 @@ func (m *TaskPaused) Unmarshal(dAtA []by |
390 | if err != nil { | 390 | if err != nil { |
391 | return err | 391 | return err |
392 | } | 392 | } |
@@ -398,7 +398,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
398 | return ErrInvalidLengthTask | 398 | return ErrInvalidLengthTask |
399 | } | 399 | } |
400 | if (iNdEx + skippy) > l { | 400 | if (iNdEx + skippy) > l { |
401 | @@ -3071,10 +3044,7 @@ func (m *TaskResumed) Unmarshal(dAtA []byte) error { | 401 | @@ -3071,10 +3044,7 @@ func (m *TaskResumed) Unmarshal(dAtA []b |
402 | if err != nil { | 402 | if err != nil { |
403 | return err | 403 | return err |
404 | } | 404 | } |
@@ -410,7 +410,7 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
410 | return ErrInvalidLengthTask | 410 | return ErrInvalidLengthTask |
411 | } | 411 | } |
412 | if (iNdEx + skippy) > l { | 412 | if (iNdEx + skippy) > l { |
413 | @@ -3189,10 +3159,7 @@ func (m *TaskCheckpointed) Unmarshal(dAtA []byte) error { | 413 | @@ -3189,10 +3159,7 @@ func (m *TaskCheckpointed) Unmarshal(dAt |
414 | if err != nil { | 414 | if err != nil { |
415 | return err | 415 | return err |
416 | } | 416 | } |
@@ -422,11 +422,11 @@ index 0f16695e3..f8f3a3f3d 100644 | |||
422 | return ErrInvalidLengthTask | 422 | return ErrInvalidLengthTask |
423 | } | 423 | } |
424 | if (iNdEx + skippy) > l { | 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 | 425 | Index: git/src/import/api/services/containers/v1/containers.pb.go |
426 | index d951b2683..af56c7de2 100644 | 426 | =================================================================== |
427 | --- a/src/import/api/services/containers/v1/containers.pb.go | 427 | --- git.orig/src/import/api/services/containers/v1/containers.pb.go |
428 | +++ b/src/import/api/services/containers/v1/containers.pb.go | 428 | +++ git/src/import/api/services/containers/v1/containers.pb.go |
429 | @@ -2106,7 +2106,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | 429 | @@ -2106,7 +2106,7 @@ func (m *Container) Unmarshal(dAtA []byt |
430 | if err != nil { | 430 | if err != nil { |
431 | return err | 431 | return err |
432 | } | 432 | } |
@@ -435,7 +435,7 @@ index d951b2683..af56c7de2 100644 | |||
435 | return ErrInvalidLengthContainers | 435 | return ErrInvalidLengthContainers |
436 | } | 436 | } |
437 | if (iNdEx + skippy) > postIndex { | 437 | if (iNdEx + skippy) > postIndex { |
438 | @@ -2469,7 +2469,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | 438 | @@ -2469,7 +2469,7 @@ func (m *Container) Unmarshal(dAtA []byt |
439 | if err != nil { | 439 | if err != nil { |
440 | return err | 440 | return err |
441 | } | 441 | } |
@@ -444,7 +444,7 @@ index d951b2683..af56c7de2 100644 | |||
444 | return ErrInvalidLengthContainers | 444 | return ErrInvalidLengthContainers |
445 | } | 445 | } |
446 | if (iNdEx + skippy) > postIndex { | 446 | if (iNdEx + skippy) > postIndex { |
447 | @@ -2486,10 +2486,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { | 447 | @@ -2486,10 +2486,7 @@ func (m *Container) Unmarshal(dAtA []byt |
448 | if err != nil { | 448 | if err != nil { |
449 | return err | 449 | return err |
450 | } | 450 | } |
@@ -456,7 +456,7 @@ index d951b2683..af56c7de2 100644 | |||
456 | return ErrInvalidLengthContainers | 456 | return ErrInvalidLengthContainers |
457 | } | 457 | } |
458 | if (iNdEx + skippy) > l { | 458 | if (iNdEx + skippy) > l { |
459 | @@ -2608,10 +2605,7 @@ func (m *Container_Runtime) Unmarshal(dAtA []byte) error { | 459 | @@ -2608,10 +2605,7 @@ func (m *Container_Runtime) Unmarshal(dA |
460 | if err != nil { | 460 | if err != nil { |
461 | return err | 461 | return err |
462 | } | 462 | } |
@@ -468,7 +468,7 @@ index d951b2683..af56c7de2 100644 | |||
468 | return ErrInvalidLengthContainers | 468 | return ErrInvalidLengthContainers |
469 | } | 469 | } |
470 | if (iNdEx + skippy) > l { | 470 | if (iNdEx + skippy) > l { |
471 | @@ -2694,10 +2688,7 @@ func (m *GetContainerRequest) Unmarshal(dAtA []byte) error { | 471 | @@ -2694,10 +2688,7 @@ func (m *GetContainerRequest) Unmarshal( |
472 | if err != nil { | 472 | if err != nil { |
473 | return err | 473 | return err |
474 | } | 474 | } |
@@ -480,7 +480,7 @@ index d951b2683..af56c7de2 100644 | |||
480 | return ErrInvalidLengthContainers | 480 | return ErrInvalidLengthContainers |
481 | } | 481 | } |
482 | if (iNdEx + skippy) > l { | 482 | if (iNdEx + skippy) > l { |
483 | @@ -2781,10 +2772,7 @@ func (m *GetContainerResponse) Unmarshal(dAtA []byte) error { | 483 | @@ -2781,10 +2772,7 @@ func (m *GetContainerResponse) Unmarshal |
484 | if err != nil { | 484 | if err != nil { |
485 | return err | 485 | return err |
486 | } | 486 | } |
@@ -492,7 +492,7 @@ index d951b2683..af56c7de2 100644 | |||
492 | return ErrInvalidLengthContainers | 492 | return ErrInvalidLengthContainers |
493 | } | 493 | } |
494 | if (iNdEx + skippy) > l { | 494 | if (iNdEx + skippy) > l { |
495 | @@ -2867,10 +2855,7 @@ func (m *ListContainersRequest) Unmarshal(dAtA []byte) error { | 495 | @@ -2867,10 +2855,7 @@ func (m *ListContainersRequest) Unmarsha |
496 | if err != nil { | 496 | if err != nil { |
497 | return err | 497 | return err |
498 | } | 498 | } |
@@ -504,7 +504,7 @@ index d951b2683..af56c7de2 100644 | |||
504 | return ErrInvalidLengthContainers | 504 | return ErrInvalidLengthContainers |
505 | } | 505 | } |
506 | if (iNdEx + skippy) > l { | 506 | if (iNdEx + skippy) > l { |
507 | @@ -2955,10 +2940,7 @@ func (m *ListContainersResponse) Unmarshal(dAtA []byte) error { | 507 | @@ -2955,10 +2940,7 @@ func (m *ListContainersResponse) Unmarsh |
508 | if err != nil { | 508 | if err != nil { |
509 | return err | 509 | return err |
510 | } | 510 | } |
@@ -516,7 +516,7 @@ index d951b2683..af56c7de2 100644 | |||
516 | return ErrInvalidLengthContainers | 516 | return ErrInvalidLengthContainers |
517 | } | 517 | } |
518 | if (iNdEx + skippy) > l { | 518 | if (iNdEx + skippy) > l { |
519 | @@ -3042,10 +3024,7 @@ func (m *CreateContainerRequest) Unmarshal(dAtA []byte) error { | 519 | @@ -3042,10 +3024,7 @@ func (m *CreateContainerRequest) Unmarsh |
520 | if err != nil { | 520 | if err != nil { |
521 | return err | 521 | return err |
522 | } | 522 | } |
@@ -528,7 +528,7 @@ index d951b2683..af56c7de2 100644 | |||
528 | return ErrInvalidLengthContainers | 528 | return ErrInvalidLengthContainers |
529 | } | 529 | } |
530 | if (iNdEx + skippy) > l { | 530 | if (iNdEx + skippy) > l { |
531 | @@ -3129,10 +3108,7 @@ func (m *CreateContainerResponse) Unmarshal(dAtA []byte) error { | 531 | @@ -3129,10 +3108,7 @@ func (m *CreateContainerResponse) Unmars |
532 | if err != nil { | 532 | if err != nil { |
533 | return err | 533 | return err |
534 | } | 534 | } |
@@ -540,7 +540,7 @@ index d951b2683..af56c7de2 100644 | |||
540 | return ErrInvalidLengthContainers | 540 | return ErrInvalidLengthContainers |
541 | } | 541 | } |
542 | if (iNdEx + skippy) > l { | 542 | if (iNdEx + skippy) > l { |
543 | @@ -3252,10 +3228,7 @@ func (m *UpdateContainerRequest) Unmarshal(dAtA []byte) error { | 543 | @@ -3252,10 +3228,7 @@ func (m *UpdateContainerRequest) Unmarsh |
544 | if err != nil { | 544 | if err != nil { |
545 | return err | 545 | return err |
546 | } | 546 | } |
@@ -552,7 +552,7 @@ index d951b2683..af56c7de2 100644 | |||
552 | return ErrInvalidLengthContainers | 552 | return ErrInvalidLengthContainers |
553 | } | 553 | } |
554 | if (iNdEx + skippy) > l { | 554 | if (iNdEx + skippy) > l { |
555 | @@ -3339,10 +3312,7 @@ func (m *UpdateContainerResponse) Unmarshal(dAtA []byte) error { | 555 | @@ -3339,10 +3312,7 @@ func (m *UpdateContainerResponse) Unmars |
556 | if err != nil { | 556 | if err != nil { |
557 | return err | 557 | return err |
558 | } | 558 | } |
@@ -564,7 +564,7 @@ index d951b2683..af56c7de2 100644 | |||
564 | return ErrInvalidLengthContainers | 564 | return ErrInvalidLengthContainers |
565 | } | 565 | } |
566 | if (iNdEx + skippy) > l { | 566 | if (iNdEx + skippy) > l { |
567 | @@ -3425,10 +3395,7 @@ func (m *DeleteContainerRequest) Unmarshal(dAtA []byte) error { | 567 | @@ -3425,10 +3395,7 @@ func (m *DeleteContainerRequest) Unmarsh |
568 | if err != nil { | 568 | if err != nil { |
569 | return err | 569 | return err |
570 | } | 570 | } |
@@ -576,7 +576,7 @@ index d951b2683..af56c7de2 100644 | |||
576 | return ErrInvalidLengthContainers | 576 | return ErrInvalidLengthContainers |
577 | } | 577 | } |
578 | if (iNdEx + skippy) > l { | 578 | if (iNdEx + skippy) > l { |
579 | @@ -3515,10 +3482,7 @@ func (m *ListContainerMessage) Unmarshal(dAtA []byte) error { | 579 | @@ -3515,10 +3482,7 @@ func (m *ListContainerMessage) Unmarshal |
580 | if err != nil { | 580 | if err != nil { |
581 | return err | 581 | return err |
582 | } | 582 | } |
@@ -588,11 +588,11 @@ index d951b2683..af56c7de2 100644 | |||
588 | return ErrInvalidLengthContainers | 588 | return ErrInvalidLengthContainers |
589 | } | 589 | } |
590 | if (iNdEx + skippy) > l { | 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 | 591 | Index: git/src/import/api/services/content/v1/content.pb.go |
592 | index 1cf0aaa91..97c7d4a92 100644 | 592 | =================================================================== |
593 | --- a/src/import/api/services/content/v1/content.pb.go | 593 | --- git.orig/src/import/api/services/content/v1/content.pb.go |
594 | +++ b/src/import/api/services/content/v1/content.pb.go | 594 | +++ git/src/import/api/services/content/v1/content.pb.go |
595 | @@ -3280,7 +3280,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | 595 | @@ -3280,7 +3280,7 @@ func (m *Info) Unmarshal(dAtA []byte) er |
596 | if err != nil { | 596 | if err != nil { |
597 | return err | 597 | return err |
598 | } | 598 | } |
@@ -601,7 +601,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
601 | return ErrInvalidLengthContent | 601 | return ErrInvalidLengthContent |
602 | } | 602 | } |
603 | if (iNdEx + skippy) > postIndex { | 603 | if (iNdEx + skippy) > postIndex { |
604 | @@ -3297,10 +3297,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | 604 | @@ -3297,10 +3297,7 @@ func (m *Info) Unmarshal(dAtA []byte) er |
605 | if err != nil { | 605 | if err != nil { |
606 | return err | 606 | return err |
607 | } | 607 | } |
@@ -613,7 +613,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
613 | return ErrInvalidLengthContent | 613 | return ErrInvalidLengthContent |
614 | } | 614 | } |
615 | if (iNdEx + skippy) > l { | 615 | if (iNdEx + skippy) > l { |
616 | @@ -3383,10 +3380,7 @@ func (m *InfoRequest) Unmarshal(dAtA []byte) error { | 616 | @@ -3383,10 +3380,7 @@ func (m *InfoRequest) Unmarshal(dAtA []b |
617 | if err != nil { | 617 | if err != nil { |
618 | return err | 618 | return err |
619 | } | 619 | } |
@@ -625,7 +625,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
625 | return ErrInvalidLengthContent | 625 | return ErrInvalidLengthContent |
626 | } | 626 | } |
627 | if (iNdEx + skippy) > l { | 627 | if (iNdEx + skippy) > l { |
628 | @@ -3470,10 +3464,7 @@ func (m *InfoResponse) Unmarshal(dAtA []byte) error { | 628 | @@ -3470,10 +3464,7 @@ func (m *InfoResponse) Unmarshal(dAtA [] |
629 | if err != nil { | 629 | if err != nil { |
630 | return err | 630 | return err |
631 | } | 631 | } |
@@ -637,7 +637,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
637 | return ErrInvalidLengthContent | 637 | return ErrInvalidLengthContent |
638 | } | 638 | } |
639 | if (iNdEx + skippy) > l { | 639 | if (iNdEx + skippy) > l { |
640 | @@ -3593,10 +3584,7 @@ func (m *UpdateRequest) Unmarshal(dAtA []byte) error { | 640 | @@ -3593,10 +3584,7 @@ func (m *UpdateRequest) Unmarshal(dAtA [ |
641 | if err != nil { | 641 | if err != nil { |
642 | return err | 642 | return err |
643 | } | 643 | } |
@@ -649,7 +649,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
649 | return ErrInvalidLengthContent | 649 | return ErrInvalidLengthContent |
650 | } | 650 | } |
651 | if (iNdEx + skippy) > l { | 651 | if (iNdEx + skippy) > l { |
652 | @@ -3680,10 +3668,7 @@ func (m *UpdateResponse) Unmarshal(dAtA []byte) error { | 652 | @@ -3680,10 +3668,7 @@ func (m *UpdateResponse) Unmarshal(dAtA |
653 | if err != nil { | 653 | if err != nil { |
654 | return err | 654 | return err |
655 | } | 655 | } |
@@ -661,7 +661,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
661 | return ErrInvalidLengthContent | 661 | return ErrInvalidLengthContent |
662 | } | 662 | } |
663 | if (iNdEx + skippy) > l { | 663 | if (iNdEx + skippy) > l { |
664 | @@ -3766,10 +3751,7 @@ func (m *ListContentRequest) Unmarshal(dAtA []byte) error { | 664 | @@ -3766,10 +3751,7 @@ func (m *ListContentRequest) Unmarshal(d |
665 | if err != nil { | 665 | if err != nil { |
666 | return err | 666 | return err |
667 | } | 667 | } |
@@ -673,7 +673,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
673 | return ErrInvalidLengthContent | 673 | return ErrInvalidLengthContent |
674 | } | 674 | } |
675 | if (iNdEx + skippy) > l { | 675 | if (iNdEx + skippy) > l { |
676 | @@ -3854,10 +3836,7 @@ func (m *ListContentResponse) Unmarshal(dAtA []byte) error { | 676 | @@ -3854,10 +3836,7 @@ func (m *ListContentResponse) Unmarshal( |
677 | if err != nil { | 677 | if err != nil { |
678 | return err | 678 | return err |
679 | } | 679 | } |
@@ -685,7 +685,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
685 | return ErrInvalidLengthContent | 685 | return ErrInvalidLengthContent |
686 | } | 686 | } |
687 | if (iNdEx + skippy) > l { | 687 | if (iNdEx + skippy) > l { |
688 | @@ -3940,10 +3919,7 @@ func (m *DeleteContentRequest) Unmarshal(dAtA []byte) error { | 688 | @@ -3940,10 +3919,7 @@ func (m *DeleteContentRequest) Unmarshal |
689 | if err != nil { | 689 | if err != nil { |
690 | return err | 690 | return err |
691 | } | 691 | } |
@@ -697,7 +697,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
697 | return ErrInvalidLengthContent | 697 | return ErrInvalidLengthContent |
698 | } | 698 | } |
699 | if (iNdEx + skippy) > l { | 699 | if (iNdEx + skippy) > l { |
700 | @@ -4064,10 +4040,7 @@ func (m *ReadContentRequest) Unmarshal(dAtA []byte) error { | 700 | @@ -4064,10 +4040,7 @@ func (m *ReadContentRequest) Unmarshal(d |
701 | if err != nil { | 701 | if err != nil { |
702 | return err | 702 | return err |
703 | } | 703 | } |
@@ -709,7 +709,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
709 | return ErrInvalidLengthContent | 709 | return ErrInvalidLengthContent |
710 | } | 710 | } |
711 | if (iNdEx + skippy) > l { | 711 | if (iNdEx + skippy) > l { |
712 | @@ -4171,10 +4144,7 @@ func (m *ReadContentResponse) Unmarshal(dAtA []byte) error { | 712 | @@ -4171,10 +4144,7 @@ func (m *ReadContentResponse) Unmarshal( |
713 | if err != nil { | 713 | if err != nil { |
714 | return err | 714 | return err |
715 | } | 715 | } |
@@ -721,7 +721,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
721 | return ErrInvalidLengthContent | 721 | return ErrInvalidLengthContent |
722 | } | 722 | } |
723 | if (iNdEx + skippy) > l { | 723 | if (iNdEx + skippy) > l { |
724 | @@ -4393,10 +4363,7 @@ func (m *Status) Unmarshal(dAtA []byte) error { | 724 | @@ -4393,10 +4363,7 @@ func (m *Status) Unmarshal(dAtA []byte) |
725 | if err != nil { | 725 | if err != nil { |
726 | return err | 726 | return err |
727 | } | 727 | } |
@@ -733,7 +733,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
733 | return ErrInvalidLengthContent | 733 | return ErrInvalidLengthContent |
734 | } | 734 | } |
735 | if (iNdEx + skippy) > l { | 735 | if (iNdEx + skippy) > l { |
736 | @@ -4479,10 +4446,7 @@ func (m *StatusRequest) Unmarshal(dAtA []byte) error { | 736 | @@ -4479,10 +4446,7 @@ func (m *StatusRequest) Unmarshal(dAtA [ |
737 | if err != nil { | 737 | if err != nil { |
738 | return err | 738 | return err |
739 | } | 739 | } |
@@ -745,7 +745,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
745 | return ErrInvalidLengthContent | 745 | return ErrInvalidLengthContent |
746 | } | 746 | } |
747 | if (iNdEx + skippy) > l { | 747 | if (iNdEx + skippy) > l { |
748 | @@ -4569,10 +4533,7 @@ func (m *StatusResponse) Unmarshal(dAtA []byte) error { | 748 | @@ -4569,10 +4533,7 @@ func (m *StatusResponse) Unmarshal(dAtA |
749 | if err != nil { | 749 | if err != nil { |
750 | return err | 750 | return err |
751 | } | 751 | } |
@@ -757,7 +757,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
757 | return ErrInvalidLengthContent | 757 | return ErrInvalidLengthContent |
758 | } | 758 | } |
759 | if (iNdEx + skippy) > l { | 759 | if (iNdEx + skippy) > l { |
760 | @@ -4655,10 +4616,7 @@ func (m *ListStatusesRequest) Unmarshal(dAtA []byte) error { | 760 | @@ -4655,10 +4616,7 @@ func (m *ListStatusesRequest) Unmarshal( |
761 | if err != nil { | 761 | if err != nil { |
762 | return err | 762 | return err |
763 | } | 763 | } |
@@ -769,7 +769,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
769 | return ErrInvalidLengthContent | 769 | return ErrInvalidLengthContent |
770 | } | 770 | } |
771 | if (iNdEx + skippy) > l { | 771 | if (iNdEx + skippy) > l { |
772 | @@ -4743,10 +4701,7 @@ func (m *ListStatusesResponse) Unmarshal(dAtA []byte) error { | 772 | @@ -4743,10 +4701,7 @@ func (m *ListStatusesResponse) Unmarshal |
773 | if err != nil { | 773 | if err != nil { |
774 | return err | 774 | return err |
775 | } | 775 | } |
@@ -781,7 +781,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
781 | return ErrInvalidLengthContent | 781 | return ErrInvalidLengthContent |
782 | } | 782 | } |
783 | if (iNdEx + skippy) > l { | 783 | if (iNdEx + skippy) > l { |
784 | @@ -5062,7 +5017,7 @@ func (m *WriteContentRequest) Unmarshal(dAtA []byte) error { | 784 | @@ -5062,7 +5017,7 @@ func (m *WriteContentRequest) Unmarshal( |
785 | if err != nil { | 785 | if err != nil { |
786 | return err | 786 | return err |
787 | } | 787 | } |
@@ -790,7 +790,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
790 | return ErrInvalidLengthContent | 790 | return ErrInvalidLengthContent |
791 | } | 791 | } |
792 | if (iNdEx + skippy) > postIndex { | 792 | if (iNdEx + skippy) > postIndex { |
793 | @@ -5079,10 +5034,7 @@ func (m *WriteContentRequest) Unmarshal(dAtA []byte) error { | 793 | @@ -5079,10 +5034,7 @@ func (m *WriteContentRequest) Unmarshal( |
794 | if err != nil { | 794 | if err != nil { |
795 | return err | 795 | return err |
796 | } | 796 | } |
@@ -802,7 +802,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
802 | return ErrInvalidLengthContent | 802 | return ErrInvalidLengthContent |
803 | } | 803 | } |
804 | if (iNdEx + skippy) > l { | 804 | if (iNdEx + skippy) > l { |
805 | @@ -5288,10 +5240,7 @@ func (m *WriteContentResponse) Unmarshal(dAtA []byte) error { | 805 | @@ -5288,10 +5240,7 @@ func (m *WriteContentResponse) Unmarshal |
806 | if err != nil { | 806 | if err != nil { |
807 | return err | 807 | return err |
808 | } | 808 | } |
@@ -814,7 +814,7 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
814 | return ErrInvalidLengthContent | 814 | return ErrInvalidLengthContent |
815 | } | 815 | } |
816 | if (iNdEx + skippy) > l { | 816 | if (iNdEx + skippy) > l { |
817 | @@ -5374,10 +5323,7 @@ func (m *AbortRequest) Unmarshal(dAtA []byte) error { | 817 | @@ -5374,10 +5323,7 @@ func (m *AbortRequest) Unmarshal(dAtA [] |
818 | if err != nil { | 818 | if err != nil { |
819 | return err | 819 | return err |
820 | } | 820 | } |
@@ -826,11 +826,11 @@ index 1cf0aaa91..97c7d4a92 100644 | |||
826 | return ErrInvalidLengthContent | 826 | return ErrInvalidLengthContent |
827 | } | 827 | } |
828 | if (iNdEx + skippy) > l { | 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 | 829 | Index: git/src/import/api/services/diff/v1/diff.pb.go |
830 | index 48379234d..b1450ceb8 100644 | 830 | =================================================================== |
831 | --- a/src/import/api/services/diff/v1/diff.pb.go | 831 | --- git.orig/src/import/api/services/diff/v1/diff.pb.go |
832 | +++ b/src/import/api/services/diff/v1/diff.pb.go | 832 | +++ git/src/import/api/services/diff/v1/diff.pb.go |
833 | @@ -1063,7 +1063,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error { | 833 | @@ -1063,7 +1063,7 @@ func (m *ApplyRequest) Unmarshal(dAtA [] |
834 | if err != nil { | 834 | if err != nil { |
835 | return err | 835 | return err |
836 | } | 836 | } |
@@ -839,7 +839,7 @@ index 48379234d..b1450ceb8 100644 | |||
839 | return ErrInvalidLengthDiff | 839 | return ErrInvalidLengthDiff |
840 | } | 840 | } |
841 | if (iNdEx + skippy) > postIndex { | 841 | if (iNdEx + skippy) > postIndex { |
842 | @@ -1080,10 +1080,7 @@ func (m *ApplyRequest) Unmarshal(dAtA []byte) error { | 842 | @@ -1080,10 +1080,7 @@ func (m *ApplyRequest) Unmarshal(dAtA [] |
843 | if err != nil { | 843 | if err != nil { |
844 | return err | 844 | return err |
845 | } | 845 | } |
@@ -851,7 +851,7 @@ index 48379234d..b1450ceb8 100644 | |||
851 | return ErrInvalidLengthDiff | 851 | return ErrInvalidLengthDiff |
852 | } | 852 | } |
853 | if (iNdEx + skippy) > l { | 853 | if (iNdEx + skippy) > l { |
854 | @@ -1170,10 +1167,7 @@ func (m *ApplyResponse) Unmarshal(dAtA []byte) error { | 854 | @@ -1170,10 +1167,7 @@ func (m *ApplyResponse) Unmarshal(dAtA [ |
855 | if err != nil { | 855 | if err != nil { |
856 | return err | 856 | return err |
857 | } | 857 | } |
@@ -863,7 +863,7 @@ index 48379234d..b1450ceb8 100644 | |||
863 | return ErrInvalidLengthDiff | 863 | return ErrInvalidLengthDiff |
864 | } | 864 | } |
865 | if (iNdEx + skippy) > l { | 865 | if (iNdEx + skippy) > l { |
866 | @@ -1466,7 +1460,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error { | 866 | @@ -1466,7 +1460,7 @@ func (m *DiffRequest) Unmarshal(dAtA []b |
867 | if err != nil { | 867 | if err != nil { |
868 | return err | 868 | return err |
869 | } | 869 | } |
@@ -872,7 +872,7 @@ index 48379234d..b1450ceb8 100644 | |||
872 | return ErrInvalidLengthDiff | 872 | return ErrInvalidLengthDiff |
873 | } | 873 | } |
874 | if (iNdEx + skippy) > postIndex { | 874 | if (iNdEx + skippy) > postIndex { |
875 | @@ -1483,10 +1477,7 @@ func (m *DiffRequest) Unmarshal(dAtA []byte) error { | 875 | @@ -1483,10 +1477,7 @@ func (m *DiffRequest) Unmarshal(dAtA []b |
876 | if err != nil { | 876 | if err != nil { |
877 | return err | 877 | return err |
878 | } | 878 | } |
@@ -884,7 +884,7 @@ index 48379234d..b1450ceb8 100644 | |||
884 | return ErrInvalidLengthDiff | 884 | return ErrInvalidLengthDiff |
885 | } | 885 | } |
886 | if (iNdEx + skippy) > l { | 886 | if (iNdEx + skippy) > l { |
887 | @@ -1573,10 +1564,7 @@ func (m *DiffResponse) Unmarshal(dAtA []byte) error { | 887 | @@ -1573,10 +1564,7 @@ func (m *DiffResponse) Unmarshal(dAtA [] |
888 | if err != nil { | 888 | if err != nil { |
889 | return err | 889 | return err |
890 | } | 890 | } |
@@ -896,11 +896,11 @@ index 48379234d..b1450ceb8 100644 | |||
896 | return ErrInvalidLengthDiff | 896 | return ErrInvalidLengthDiff |
897 | } | 897 | } |
898 | if (iNdEx + skippy) > l { | 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 | 899 | Index: git/src/import/api/services/events/v1/events.pb.go |
900 | index a1674f862..4373f3bf2 100644 | 900 | =================================================================== |
901 | --- a/src/import/api/services/events/v1/events.pb.go | 901 | --- git.orig/src/import/api/services/events/v1/events.pb.go |
902 | +++ b/src/import/api/services/events/v1/events.pb.go | 902 | +++ git/src/import/api/services/events/v1/events.pb.go |
903 | @@ -916,10 +916,7 @@ func (m *PublishRequest) Unmarshal(dAtA []byte) error { | 903 | @@ -916,10 +916,7 @@ func (m *PublishRequest) Unmarshal(dAtA |
904 | if err != nil { | 904 | if err != nil { |
905 | return err | 905 | return err |
906 | } | 906 | } |
@@ -912,7 +912,7 @@ index a1674f862..4373f3bf2 100644 | |||
912 | return ErrInvalidLengthEvents | 912 | return ErrInvalidLengthEvents |
913 | } | 913 | } |
914 | if (iNdEx + skippy) > l { | 914 | if (iNdEx + skippy) > l { |
915 | @@ -1006,10 +1003,7 @@ func (m *ForwardRequest) Unmarshal(dAtA []byte) error { | 915 | @@ -1006,10 +1003,7 @@ func (m *ForwardRequest) Unmarshal(dAtA |
916 | if err != nil { | 916 | if err != nil { |
917 | return err | 917 | return err |
918 | } | 918 | } |
@@ -924,7 +924,7 @@ index a1674f862..4373f3bf2 100644 | |||
924 | return ErrInvalidLengthEvents | 924 | return ErrInvalidLengthEvents |
925 | } | 925 | } |
926 | if (iNdEx + skippy) > l { | 926 | if (iNdEx + skippy) > l { |
927 | @@ -1092,10 +1086,7 @@ func (m *SubscribeRequest) Unmarshal(dAtA []byte) error { | 927 | @@ -1092,10 +1086,7 @@ func (m *SubscribeRequest) Unmarshal(dAt |
928 | if err != nil { | 928 | if err != nil { |
929 | return err | 929 | return err |
930 | } | 930 | } |
@@ -936,7 +936,7 @@ index a1674f862..4373f3bf2 100644 | |||
936 | return ErrInvalidLengthEvents | 936 | return ErrInvalidLengthEvents |
937 | } | 937 | } |
938 | if (iNdEx + skippy) > l { | 938 | if (iNdEx + skippy) > l { |
939 | @@ -1279,10 +1270,7 @@ func (m *Envelope) Unmarshal(dAtA []byte) error { | 939 | @@ -1279,10 +1270,7 @@ func (m *Envelope) Unmarshal(dAtA []byte |
940 | if err != nil { | 940 | if err != nil { |
941 | return err | 941 | return err |
942 | } | 942 | } |
@@ -948,11 +948,11 @@ index a1674f862..4373f3bf2 100644 | |||
948 | return ErrInvalidLengthEvents | 948 | return ErrInvalidLengthEvents |
949 | } | 949 | } |
950 | if (iNdEx + skippy) > l { | 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 | 951 | Index: git/src/import/api/services/images/v1/images.pb.go |
952 | index db912b68b..de08cc083 100644 | 952 | =================================================================== |
953 | --- a/src/import/api/services/images/v1/images.pb.go | 953 | --- git.orig/src/import/api/services/images/v1/images.pb.go |
954 | +++ b/src/import/api/services/images/v1/images.pb.go | 954 | +++ git/src/import/api/services/images/v1/images.pb.go |
955 | @@ -1707,7 +1707,7 @@ func (m *Image) Unmarshal(dAtA []byte) error { | 955 | @@ -1707,7 +1707,7 @@ func (m *Image) Unmarshal(dAtA []byte) e |
956 | if err != nil { | 956 | if err != nil { |
957 | return err | 957 | return err |
958 | } | 958 | } |
@@ -961,7 +961,7 @@ index db912b68b..de08cc083 100644 | |||
961 | return ErrInvalidLengthImages | 961 | return ErrInvalidLengthImages |
962 | } | 962 | } |
963 | if (iNdEx + skippy) > postIndex { | 963 | if (iNdEx + skippy) > postIndex { |
964 | @@ -1823,10 +1823,7 @@ func (m *Image) Unmarshal(dAtA []byte) error { | 964 | @@ -1823,10 +1823,7 @@ func (m *Image) Unmarshal(dAtA []byte) e |
965 | if err != nil { | 965 | if err != nil { |
966 | return err | 966 | return err |
967 | } | 967 | } |
@@ -973,7 +973,7 @@ index db912b68b..de08cc083 100644 | |||
973 | return ErrInvalidLengthImages | 973 | return ErrInvalidLengthImages |
974 | } | 974 | } |
975 | if (iNdEx + skippy) > l { | 975 | if (iNdEx + skippy) > l { |
976 | @@ -1909,10 +1906,7 @@ func (m *GetImageRequest) Unmarshal(dAtA []byte) error { | 976 | @@ -1909,10 +1906,7 @@ func (m *GetImageRequest) Unmarshal(dAtA |
977 | if err != nil { | 977 | if err != nil { |
978 | return err | 978 | return err |
979 | } | 979 | } |
@@ -985,7 +985,7 @@ index db912b68b..de08cc083 100644 | |||
985 | return ErrInvalidLengthImages | 985 | return ErrInvalidLengthImages |
986 | } | 986 | } |
987 | if (iNdEx + skippy) > l { | 987 | if (iNdEx + skippy) > l { |
988 | @@ -1999,10 +1993,7 @@ func (m *GetImageResponse) Unmarshal(dAtA []byte) error { | 988 | @@ -1999,10 +1993,7 @@ func (m *GetImageResponse) Unmarshal(dAt |
989 | if err != nil { | 989 | if err != nil { |
990 | return err | 990 | return err |
991 | } | 991 | } |
@@ -997,7 +997,7 @@ index db912b68b..de08cc083 100644 | |||
997 | return ErrInvalidLengthImages | 997 | return ErrInvalidLengthImages |
998 | } | 998 | } |
999 | if (iNdEx + skippy) > l { | 999 | if (iNdEx + skippy) > l { |
1000 | @@ -2086,10 +2077,7 @@ func (m *CreateImageRequest) Unmarshal(dAtA []byte) error { | 1000 | @@ -2086,10 +2077,7 @@ func (m *CreateImageRequest) Unmarshal(d |
1001 | if err != nil { | 1001 | if err != nil { |
1002 | return err | 1002 | return err |
1003 | } | 1003 | } |
@@ -1009,7 +1009,7 @@ index db912b68b..de08cc083 100644 | |||
1009 | return ErrInvalidLengthImages | 1009 | return ErrInvalidLengthImages |
1010 | } | 1010 | } |
1011 | if (iNdEx + skippy) > l { | 1011 | if (iNdEx + skippy) > l { |
1012 | @@ -2173,10 +2161,7 @@ func (m *CreateImageResponse) Unmarshal(dAtA []byte) error { | 1012 | @@ -2173,10 +2161,7 @@ func (m *CreateImageResponse) Unmarshal( |
1013 | if err != nil { | 1013 | if err != nil { |
1014 | return err | 1014 | return err |
1015 | } | 1015 | } |
@@ -1021,7 +1021,7 @@ index db912b68b..de08cc083 100644 | |||
1021 | return ErrInvalidLengthImages | 1021 | return ErrInvalidLengthImages |
1022 | } | 1022 | } |
1023 | if (iNdEx + skippy) > l { | 1023 | if (iNdEx + skippy) > l { |
1024 | @@ -2296,10 +2281,7 @@ func (m *UpdateImageRequest) Unmarshal(dAtA []byte) error { | 1024 | @@ -2296,10 +2281,7 @@ func (m *UpdateImageRequest) Unmarshal(d |
1025 | if err != nil { | 1025 | if err != nil { |
1026 | return err | 1026 | return err |
1027 | } | 1027 | } |
@@ -1033,7 +1033,7 @@ index db912b68b..de08cc083 100644 | |||
1033 | return ErrInvalidLengthImages | 1033 | return ErrInvalidLengthImages |
1034 | } | 1034 | } |
1035 | if (iNdEx + skippy) > l { | 1035 | if (iNdEx + skippy) > l { |
1036 | @@ -2383,10 +2365,7 @@ func (m *UpdateImageResponse) Unmarshal(dAtA []byte) error { | 1036 | @@ -2383,10 +2365,7 @@ func (m *UpdateImageResponse) Unmarshal( |
1037 | if err != nil { | 1037 | if err != nil { |
1038 | return err | 1038 | return err |
1039 | } | 1039 | } |
@@ -1045,7 +1045,7 @@ index db912b68b..de08cc083 100644 | |||
1045 | return ErrInvalidLengthImages | 1045 | return ErrInvalidLengthImages |
1046 | } | 1046 | } |
1047 | if (iNdEx + skippy) > l { | 1047 | if (iNdEx + skippy) > l { |
1048 | @@ -2469,10 +2448,7 @@ func (m *ListImagesRequest) Unmarshal(dAtA []byte) error { | 1048 | @@ -2469,10 +2448,7 @@ func (m *ListImagesRequest) Unmarshal(dA |
1049 | if err != nil { | 1049 | if err != nil { |
1050 | return err | 1050 | return err |
1051 | } | 1051 | } |
@@ -1057,7 +1057,7 @@ index db912b68b..de08cc083 100644 | |||
1057 | return ErrInvalidLengthImages | 1057 | return ErrInvalidLengthImages |
1058 | } | 1058 | } |
1059 | if (iNdEx + skippy) > l { | 1059 | if (iNdEx + skippy) > l { |
1060 | @@ -2557,10 +2533,7 @@ func (m *ListImagesResponse) Unmarshal(dAtA []byte) error { | 1060 | @@ -2557,10 +2533,7 @@ func (m *ListImagesResponse) Unmarshal(d |
1061 | if err != nil { | 1061 | if err != nil { |
1062 | return err | 1062 | return err |
1063 | } | 1063 | } |
@@ -1069,7 +1069,7 @@ index db912b68b..de08cc083 100644 | |||
1069 | return ErrInvalidLengthImages | 1069 | return ErrInvalidLengthImages |
1070 | } | 1070 | } |
1071 | if (iNdEx + skippy) > l { | 1071 | if (iNdEx + skippy) > l { |
1072 | @@ -2663,10 +2636,7 @@ func (m *DeleteImageRequest) Unmarshal(dAtA []byte) error { | 1072 | @@ -2663,10 +2636,7 @@ func (m *DeleteImageRequest) Unmarshal(d |
1073 | if err != nil { | 1073 | if err != nil { |
1074 | return err | 1074 | return err |
1075 | } | 1075 | } |
@@ -1081,11 +1081,11 @@ index db912b68b..de08cc083 100644 | |||
1081 | return ErrInvalidLengthImages | 1081 | return ErrInvalidLengthImages |
1082 | } | 1082 | } |
1083 | if (iNdEx + skippy) > l { | 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 | 1084 | Index: git/src/import/api/services/introspection/v1/introspection.pb.go |
1085 | index b9f912b09..d23c8b61a 100644 | 1085 | =================================================================== |
1086 | --- a/src/import/api/services/introspection/v1/introspection.pb.go | 1086 | --- git.orig/src/import/api/services/introspection/v1/introspection.pb.go |
1087 | +++ b/src/import/api/services/introspection/v1/introspection.pb.go | 1087 | +++ git/src/import/api/services/introspection/v1/introspection.pb.go |
1088 | @@ -1098,7 +1098,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error { | 1088 | @@ -1098,7 +1098,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) |
1089 | if err != nil { | 1089 | if err != nil { |
1090 | return err | 1090 | return err |
1091 | } | 1091 | } |
@@ -1094,7 +1094,7 @@ index b9f912b09..d23c8b61a 100644 | |||
1094 | return ErrInvalidLengthIntrospection | 1094 | return ErrInvalidLengthIntrospection |
1095 | } | 1095 | } |
1096 | if (iNdEx + skippy) > postIndex { | 1096 | if (iNdEx + skippy) > postIndex { |
1097 | @@ -1183,10 +1183,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) error { | 1097 | @@ -1183,10 +1183,7 @@ func (m *Plugin) Unmarshal(dAtA []byte) |
1098 | if err != nil { | 1098 | if err != nil { |
1099 | return err | 1099 | return err |
1100 | } | 1100 | } |
@@ -1106,7 +1106,7 @@ index b9f912b09..d23c8b61a 100644 | |||
1106 | return ErrInvalidLengthIntrospection | 1106 | return ErrInvalidLengthIntrospection |
1107 | } | 1107 | } |
1108 | if (iNdEx + skippy) > l { | 1108 | if (iNdEx + skippy) > l { |
1109 | @@ -1269,10 +1266,7 @@ func (m *PluginsRequest) Unmarshal(dAtA []byte) error { | 1109 | @@ -1269,10 +1266,7 @@ func (m *PluginsRequest) Unmarshal(dAtA |
1110 | if err != nil { | 1110 | if err != nil { |
1111 | return err | 1111 | return err |
1112 | } | 1112 | } |
@@ -1118,7 +1118,7 @@ index b9f912b09..d23c8b61a 100644 | |||
1118 | return ErrInvalidLengthIntrospection | 1118 | return ErrInvalidLengthIntrospection |
1119 | } | 1119 | } |
1120 | if (iNdEx + skippy) > l { | 1120 | if (iNdEx + skippy) > l { |
1121 | @@ -1357,10 +1351,7 @@ func (m *PluginsResponse) Unmarshal(dAtA []byte) error { | 1121 | @@ -1357,10 +1351,7 @@ func (m *PluginsResponse) Unmarshal(dAtA |
1122 | if err != nil { | 1122 | if err != nil { |
1123 | return err | 1123 | return err |
1124 | } | 1124 | } |
@@ -1130,7 +1130,7 @@ index b9f912b09..d23c8b61a 100644 | |||
1130 | return ErrInvalidLengthIntrospection | 1130 | return ErrInvalidLengthIntrospection |
1131 | } | 1131 | } |
1132 | if (iNdEx + skippy) > l { | 1132 | if (iNdEx + skippy) > l { |
1133 | @@ -1443,10 +1434,7 @@ func (m *ServerResponse) Unmarshal(dAtA []byte) error { | 1133 | @@ -1443,10 +1434,7 @@ func (m *ServerResponse) Unmarshal(dAtA |
1134 | if err != nil { | 1134 | if err != nil { |
1135 | return err | 1135 | return err |
1136 | } | 1136 | } |
@@ -1142,11 +1142,11 @@ index b9f912b09..d23c8b61a 100644 | |||
1142 | return ErrInvalidLengthIntrospection | 1142 | return ErrInvalidLengthIntrospection |
1143 | } | 1143 | } |
1144 | if (iNdEx + skippy) > l { | 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 | 1145 | Index: git/src/import/api/services/leases/v1/leases.pb.go |
1146 | index 4dbac3e09..5e7cab71f 100644 | 1146 | =================================================================== |
1147 | --- a/src/import/api/services/leases/v1/leases.pb.go | 1147 | --- git.orig/src/import/api/services/leases/v1/leases.pb.go |
1148 | +++ b/src/import/api/services/leases/v1/leases.pb.go | 1148 | +++ git/src/import/api/services/leases/v1/leases.pb.go |
1149 | @@ -1906,7 +1906,7 @@ func (m *Lease) Unmarshal(dAtA []byte) error { | 1149 | @@ -1906,7 +1906,7 @@ func (m *Lease) Unmarshal(dAtA []byte) e |
1150 | if err != nil { | 1150 | if err != nil { |
1151 | return err | 1151 | return err |
1152 | } | 1152 | } |
@@ -1155,7 +1155,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1155 | return ErrInvalidLengthLeases | 1155 | return ErrInvalidLengthLeases |
1156 | } | 1156 | } |
1157 | if (iNdEx + skippy) > postIndex { | 1157 | if (iNdEx + skippy) > postIndex { |
1158 | @@ -1923,10 +1923,7 @@ func (m *Lease) Unmarshal(dAtA []byte) error { | 1158 | @@ -1923,10 +1923,7 @@ func (m *Lease) Unmarshal(dAtA []byte) e |
1159 | if err != nil { | 1159 | if err != nil { |
1160 | return err | 1160 | return err |
1161 | } | 1161 | } |
@@ -1167,7 +1167,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1167 | return ErrInvalidLengthLeases | 1167 | return ErrInvalidLengthLeases |
1168 | } | 1168 | } |
1169 | if (iNdEx + skippy) > l { | 1169 | if (iNdEx + skippy) > l { |
1170 | @@ -2119,7 +2116,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { | 1170 | @@ -2119,7 +2116,7 @@ func (m *CreateRequest) Unmarshal(dAtA [ |
1171 | if err != nil { | 1171 | if err != nil { |
1172 | return err | 1172 | return err |
1173 | } | 1173 | } |
@@ -1176,7 +1176,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1176 | return ErrInvalidLengthLeases | 1176 | return ErrInvalidLengthLeases |
1177 | } | 1177 | } |
1178 | if (iNdEx + skippy) > postIndex { | 1178 | if (iNdEx + skippy) > postIndex { |
1179 | @@ -2136,10 +2133,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { | 1179 | @@ -2136,10 +2133,7 @@ func (m *CreateRequest) Unmarshal(dAtA [ |
1180 | if err != nil { | 1180 | if err != nil { |
1181 | return err | 1181 | return err |
1182 | } | 1182 | } |
@@ -1188,7 +1188,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1188 | return ErrInvalidLengthLeases | 1188 | return ErrInvalidLengthLeases |
1189 | } | 1189 | } |
1190 | if (iNdEx + skippy) > l { | 1190 | if (iNdEx + skippy) > l { |
1191 | @@ -2226,10 +2220,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { | 1191 | @@ -2226,10 +2220,7 @@ func (m *CreateResponse) Unmarshal(dAtA |
1192 | if err != nil { | 1192 | if err != nil { |
1193 | return err | 1193 | return err |
1194 | } | 1194 | } |
@@ -1200,7 +1200,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1200 | return ErrInvalidLengthLeases | 1200 | return ErrInvalidLengthLeases |
1201 | } | 1201 | } |
1202 | if (iNdEx + skippy) > l { | 1202 | if (iNdEx + skippy) > l { |
1203 | @@ -2332,10 +2323,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { | 1203 | @@ -2332,10 +2323,7 @@ func (m *DeleteRequest) Unmarshal(dAtA [ |
1204 | if err != nil { | 1204 | if err != nil { |
1205 | return err | 1205 | return err |
1206 | } | 1206 | } |
@@ -1212,7 +1212,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1212 | return ErrInvalidLengthLeases | 1212 | return ErrInvalidLengthLeases |
1213 | } | 1213 | } |
1214 | if (iNdEx + skippy) > l { | 1214 | if (iNdEx + skippy) > l { |
1215 | @@ -2418,10 +2406,7 @@ func (m *ListRequest) Unmarshal(dAtA []byte) error { | 1215 | @@ -2418,10 +2406,7 @@ func (m *ListRequest) Unmarshal(dAtA []b |
1216 | if err != nil { | 1216 | if err != nil { |
1217 | return err | 1217 | return err |
1218 | } | 1218 | } |
@@ -1224,7 +1224,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1224 | return ErrInvalidLengthLeases | 1224 | return ErrInvalidLengthLeases |
1225 | } | 1225 | } |
1226 | if (iNdEx + skippy) > l { | 1226 | if (iNdEx + skippy) > l { |
1227 | @@ -2506,10 +2491,7 @@ func (m *ListResponse) Unmarshal(dAtA []byte) error { | 1227 | @@ -2506,10 +2491,7 @@ func (m *ListResponse) Unmarshal(dAtA [] |
1228 | if err != nil { | 1228 | if err != nil { |
1229 | return err | 1229 | return err |
1230 | } | 1230 | } |
@@ -1236,7 +1236,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1236 | return ErrInvalidLengthLeases | 1236 | return ErrInvalidLengthLeases |
1237 | } | 1237 | } |
1238 | if (iNdEx + skippy) > l { | 1238 | if (iNdEx + skippy) > l { |
1239 | @@ -2624,10 +2606,7 @@ func (m *Resource) Unmarshal(dAtA []byte) error { | 1239 | @@ -2624,10 +2606,7 @@ func (m *Resource) Unmarshal(dAtA []byte |
1240 | if err != nil { | 1240 | if err != nil { |
1241 | return err | 1241 | return err |
1242 | } | 1242 | } |
@@ -1248,7 +1248,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1248 | return ErrInvalidLengthLeases | 1248 | return ErrInvalidLengthLeases |
1249 | } | 1249 | } |
1250 | if (iNdEx + skippy) > l { | 1250 | if (iNdEx + skippy) > l { |
1251 | @@ -2743,10 +2722,7 @@ func (m *AddResourceRequest) Unmarshal(dAtA []byte) error { | 1251 | @@ -2743,10 +2722,7 @@ func (m *AddResourceRequest) Unmarshal(d |
1252 | if err != nil { | 1252 | if err != nil { |
1253 | return err | 1253 | return err |
1254 | } | 1254 | } |
@@ -1260,7 +1260,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1260 | return ErrInvalidLengthLeases | 1260 | return ErrInvalidLengthLeases |
1261 | } | 1261 | } |
1262 | if (iNdEx + skippy) > l { | 1262 | if (iNdEx + skippy) > l { |
1263 | @@ -2862,10 +2838,7 @@ func (m *DeleteResourceRequest) Unmarshal(dAtA []byte) error { | 1263 | @@ -2862,10 +2838,7 @@ func (m *DeleteResourceRequest) Unmarsha |
1264 | if err != nil { | 1264 | if err != nil { |
1265 | return err | 1265 | return err |
1266 | } | 1266 | } |
@@ -1272,7 +1272,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1272 | return ErrInvalidLengthLeases | 1272 | return ErrInvalidLengthLeases |
1273 | } | 1273 | } |
1274 | if (iNdEx + skippy) > l { | 1274 | if (iNdEx + skippy) > l { |
1275 | @@ -2948,10 +2921,7 @@ func (m *ListResourcesRequest) Unmarshal(dAtA []byte) error { | 1275 | @@ -2948,10 +2921,7 @@ func (m *ListResourcesRequest) Unmarshal |
1276 | if err != nil { | 1276 | if err != nil { |
1277 | return err | 1277 | return err |
1278 | } | 1278 | } |
@@ -1284,7 +1284,7 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1284 | return ErrInvalidLengthLeases | 1284 | return ErrInvalidLengthLeases |
1285 | } | 1285 | } |
1286 | if (iNdEx + skippy) > l { | 1286 | if (iNdEx + skippy) > l { |
1287 | @@ -3036,10 +3006,7 @@ func (m *ListResourcesResponse) Unmarshal(dAtA []byte) error { | 1287 | @@ -3036,10 +3006,7 @@ func (m *ListResourcesResponse) Unmarsha |
1288 | if err != nil { | 1288 | if err != nil { |
1289 | return err | 1289 | return err |
1290 | } | 1290 | } |
@@ -1296,11 +1296,11 @@ index 4dbac3e09..5e7cab71f 100644 | |||
1296 | return ErrInvalidLengthLeases | 1296 | return ErrInvalidLengthLeases |
1297 | } | 1297 | } |
1298 | if (iNdEx + skippy) > l { | 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 | 1299 | Index: git/src/import/api/services/namespaces/v1/namespace.pb.go |
1300 | index 0d1d650ba..76f9e1172 100644 | 1300 | =================================================================== |
1301 | --- a/src/import/api/services/namespaces/v1/namespace.pb.go | 1301 | --- git.orig/src/import/api/services/namespaces/v1/namespace.pb.go |
1302 | +++ b/src/import/api/services/namespaces/v1/namespace.pb.go | 1302 | +++ git/src/import/api/services/namespaces/v1/namespace.pb.go |
1303 | @@ -1609,7 +1609,7 @@ func (m *Namespace) Unmarshal(dAtA []byte) error { | 1303 | @@ -1609,7 +1609,7 @@ func (m *Namespace) Unmarshal(dAtA []byt |
1304 | if err != nil { | 1304 | if err != nil { |
1305 | return err | 1305 | return err |
1306 | } | 1306 | } |
@@ -1309,7 +1309,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1309 | return ErrInvalidLengthNamespace | 1309 | return ErrInvalidLengthNamespace |
1310 | } | 1310 | } |
1311 | if (iNdEx + skippy) > postIndex { | 1311 | if (iNdEx + skippy) > postIndex { |
1312 | @@ -1626,10 +1626,7 @@ func (m *Namespace) Unmarshal(dAtA []byte) error { | 1312 | @@ -1626,10 +1626,7 @@ func (m *Namespace) Unmarshal(dAtA []byt |
1313 | if err != nil { | 1313 | if err != nil { |
1314 | return err | 1314 | return err |
1315 | } | 1315 | } |
@@ -1321,7 +1321,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1321 | return ErrInvalidLengthNamespace | 1321 | return ErrInvalidLengthNamespace |
1322 | } | 1322 | } |
1323 | if (iNdEx + skippy) > l { | 1323 | if (iNdEx + skippy) > l { |
1324 | @@ -1712,10 +1709,7 @@ func (m *GetNamespaceRequest) Unmarshal(dAtA []byte) error { | 1324 | @@ -1712,10 +1709,7 @@ func (m *GetNamespaceRequest) Unmarshal( |
1325 | if err != nil { | 1325 | if err != nil { |
1326 | return err | 1326 | return err |
1327 | } | 1327 | } |
@@ -1333,7 +1333,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1333 | return ErrInvalidLengthNamespace | 1333 | return ErrInvalidLengthNamespace |
1334 | } | 1334 | } |
1335 | if (iNdEx + skippy) > l { | 1335 | if (iNdEx + skippy) > l { |
1336 | @@ -1799,10 +1793,7 @@ func (m *GetNamespaceResponse) Unmarshal(dAtA []byte) error { | 1336 | @@ -1799,10 +1793,7 @@ func (m *GetNamespaceResponse) Unmarshal |
1337 | if err != nil { | 1337 | if err != nil { |
1338 | return err | 1338 | return err |
1339 | } | 1339 | } |
@@ -1345,7 +1345,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1345 | return ErrInvalidLengthNamespace | 1345 | return ErrInvalidLengthNamespace |
1346 | } | 1346 | } |
1347 | if (iNdEx + skippy) > l { | 1347 | if (iNdEx + skippy) > l { |
1348 | @@ -1885,10 +1876,7 @@ func (m *ListNamespacesRequest) Unmarshal(dAtA []byte) error { | 1348 | @@ -1885,10 +1876,7 @@ func (m *ListNamespacesRequest) Unmarsha |
1349 | if err != nil { | 1349 | if err != nil { |
1350 | return err | 1350 | return err |
1351 | } | 1351 | } |
@@ -1357,7 +1357,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1357 | return ErrInvalidLengthNamespace | 1357 | return ErrInvalidLengthNamespace |
1358 | } | 1358 | } |
1359 | if (iNdEx + skippy) > l { | 1359 | if (iNdEx + skippy) > l { |
1360 | @@ -1973,10 +1961,7 @@ func (m *ListNamespacesResponse) Unmarshal(dAtA []byte) error { | 1360 | @@ -1973,10 +1961,7 @@ func (m *ListNamespacesResponse) Unmarsh |
1361 | if err != nil { | 1361 | if err != nil { |
1362 | return err | 1362 | return err |
1363 | } | 1363 | } |
@@ -1369,7 +1369,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1369 | return ErrInvalidLengthNamespace | 1369 | return ErrInvalidLengthNamespace |
1370 | } | 1370 | } |
1371 | if (iNdEx + skippy) > l { | 1371 | if (iNdEx + skippy) > l { |
1372 | @@ -2060,10 +2045,7 @@ func (m *CreateNamespaceRequest) Unmarshal(dAtA []byte) error { | 1372 | @@ -2060,10 +2045,7 @@ func (m *CreateNamespaceRequest) Unmarsh |
1373 | if err != nil { | 1373 | if err != nil { |
1374 | return err | 1374 | return err |
1375 | } | 1375 | } |
@@ -1381,7 +1381,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1381 | return ErrInvalidLengthNamespace | 1381 | return ErrInvalidLengthNamespace |
1382 | } | 1382 | } |
1383 | if (iNdEx + skippy) > l { | 1383 | if (iNdEx + skippy) > l { |
1384 | @@ -2147,10 +2129,7 @@ func (m *CreateNamespaceResponse) Unmarshal(dAtA []byte) error { | 1384 | @@ -2147,10 +2129,7 @@ func (m *CreateNamespaceResponse) Unmars |
1385 | if err != nil { | 1385 | if err != nil { |
1386 | return err | 1386 | return err |
1387 | } | 1387 | } |
@@ -1393,7 +1393,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1393 | return ErrInvalidLengthNamespace | 1393 | return ErrInvalidLengthNamespace |
1394 | } | 1394 | } |
1395 | if (iNdEx + skippy) > l { | 1395 | if (iNdEx + skippy) > l { |
1396 | @@ -2270,10 +2249,7 @@ func (m *UpdateNamespaceRequest) Unmarshal(dAtA []byte) error { | 1396 | @@ -2270,10 +2249,7 @@ func (m *UpdateNamespaceRequest) Unmarsh |
1397 | if err != nil { | 1397 | if err != nil { |
1398 | return err | 1398 | return err |
1399 | } | 1399 | } |
@@ -1405,7 +1405,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1405 | return ErrInvalidLengthNamespace | 1405 | return ErrInvalidLengthNamespace |
1406 | } | 1406 | } |
1407 | if (iNdEx + skippy) > l { | 1407 | if (iNdEx + skippy) > l { |
1408 | @@ -2357,10 +2333,7 @@ func (m *UpdateNamespaceResponse) Unmarshal(dAtA []byte) error { | 1408 | @@ -2357,10 +2333,7 @@ func (m *UpdateNamespaceResponse) Unmars |
1409 | if err != nil { | 1409 | if err != nil { |
1410 | return err | 1410 | return err |
1411 | } | 1411 | } |
@@ -1417,7 +1417,7 @@ index 0d1d650ba..76f9e1172 100644 | |||
1417 | return ErrInvalidLengthNamespace | 1417 | return ErrInvalidLengthNamespace |
1418 | } | 1418 | } |
1419 | if (iNdEx + skippy) > l { | 1419 | if (iNdEx + skippy) > l { |
1420 | @@ -2443,10 +2416,7 @@ func (m *DeleteNamespaceRequest) Unmarshal(dAtA []byte) error { | 1420 | @@ -2443,10 +2416,7 @@ func (m *DeleteNamespaceRequest) Unmarsh |
1421 | if err != nil { | 1421 | if err != nil { |
1422 | return err | 1422 | return err |
1423 | } | 1423 | } |
@@ -1429,11 +1429,11 @@ index 0d1d650ba..76f9e1172 100644 | |||
1429 | return ErrInvalidLengthNamespace | 1429 | return ErrInvalidLengthNamespace |
1430 | } | 1430 | } |
1431 | if (iNdEx + skippy) > l { | 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 | 1432 | Index: git/src/import/api/services/snapshots/v1/snapshots.pb.go |
1433 | index 1877afded..046c97b01 100644 | 1433 | =================================================================== |
1434 | --- a/src/import/api/services/snapshots/v1/snapshots.pb.go | 1434 | --- git.orig/src/import/api/services/snapshots/v1/snapshots.pb.go |
1435 | +++ b/src/import/api/services/snapshots/v1/snapshots.pb.go | 1435 | +++ git/src/import/api/services/snapshots/v1/snapshots.pb.go |
1436 | @@ -3140,7 +3140,7 @@ func (m *PrepareSnapshotRequest) Unmarshal(dAtA []byte) error { | 1436 | @@ -3140,7 +3140,7 @@ func (m *PrepareSnapshotRequest) Unmarsh |
1437 | if err != nil { | 1437 | if err != nil { |
1438 | return err | 1438 | return err |
1439 | } | 1439 | } |
@@ -1442,7 +1442,7 @@ index 1877afded..046c97b01 100644 | |||
1442 | return ErrInvalidLengthSnapshots | 1442 | return ErrInvalidLengthSnapshots |
1443 | } | 1443 | } |
1444 | if (iNdEx + skippy) > postIndex { | 1444 | if (iNdEx + skippy) > postIndex { |
1445 | @@ -3157,10 +3157,7 @@ func (m *PrepareSnapshotRequest) Unmarshal(dAtA []byte) error { | 1445 | @@ -3157,10 +3157,7 @@ func (m *PrepareSnapshotRequest) Unmarsh |
1446 | if err != nil { | 1446 | if err != nil { |
1447 | return err | 1447 | return err |
1448 | } | 1448 | } |
@@ -1454,7 +1454,7 @@ index 1877afded..046c97b01 100644 | |||
1454 | return ErrInvalidLengthSnapshots | 1454 | return ErrInvalidLengthSnapshots |
1455 | } | 1455 | } |
1456 | if (iNdEx + skippy) > l { | 1456 | if (iNdEx + skippy) > l { |
1457 | @@ -3245,10 +3242,7 @@ func (m *PrepareSnapshotResponse) Unmarshal(dAtA []byte) error { | 1457 | @@ -3245,10 +3242,7 @@ func (m *PrepareSnapshotResponse) Unmars |
1458 | if err != nil { | 1458 | if err != nil { |
1459 | return err | 1459 | return err |
1460 | } | 1460 | } |
@@ -1466,7 +1466,7 @@ index 1877afded..046c97b01 100644 | |||
1466 | return ErrInvalidLengthSnapshots | 1466 | return ErrInvalidLengthSnapshots |
1467 | } | 1467 | } |
1468 | if (iNdEx + skippy) > l { | 1468 | if (iNdEx + skippy) > l { |
1469 | @@ -3505,7 +3499,7 @@ func (m *ViewSnapshotRequest) Unmarshal(dAtA []byte) error { | 1469 | @@ -3505,7 +3499,7 @@ func (m *ViewSnapshotRequest) Unmarshal( |
1470 | if err != nil { | 1470 | if err != nil { |
1471 | return err | 1471 | return err |
1472 | } | 1472 | } |
@@ -1475,7 +1475,7 @@ index 1877afded..046c97b01 100644 | |||
1475 | return ErrInvalidLengthSnapshots | 1475 | return ErrInvalidLengthSnapshots |
1476 | } | 1476 | } |
1477 | if (iNdEx + skippy) > postIndex { | 1477 | if (iNdEx + skippy) > postIndex { |
1478 | @@ -3522,10 +3516,7 @@ func (m *ViewSnapshotRequest) Unmarshal(dAtA []byte) error { | 1478 | @@ -3522,10 +3516,7 @@ func (m *ViewSnapshotRequest) Unmarshal( |
1479 | if err != nil { | 1479 | if err != nil { |
1480 | return err | 1480 | return err |
1481 | } | 1481 | } |
@@ -1487,7 +1487,7 @@ index 1877afded..046c97b01 100644 | |||
1487 | return ErrInvalidLengthSnapshots | 1487 | return ErrInvalidLengthSnapshots |
1488 | } | 1488 | } |
1489 | if (iNdEx + skippy) > l { | 1489 | if (iNdEx + skippy) > l { |
1490 | @@ -3610,10 +3601,7 @@ func (m *ViewSnapshotResponse) Unmarshal(dAtA []byte) error { | 1490 | @@ -3610,10 +3601,7 @@ func (m *ViewSnapshotResponse) Unmarshal |
1491 | if err != nil { | 1491 | if err != nil { |
1492 | return err | 1492 | return err |
1493 | } | 1493 | } |
@@ -1499,7 +1499,7 @@ index 1877afded..046c97b01 100644 | |||
1499 | return ErrInvalidLengthSnapshots | 1499 | return ErrInvalidLengthSnapshots |
1500 | } | 1500 | } |
1501 | if (iNdEx + skippy) > l { | 1501 | if (iNdEx + skippy) > l { |
1502 | @@ -3728,10 +3716,7 @@ func (m *MountsRequest) Unmarshal(dAtA []byte) error { | 1502 | @@ -3728,10 +3716,7 @@ func (m *MountsRequest) Unmarshal(dAtA [ |
1503 | if err != nil { | 1503 | if err != nil { |
1504 | return err | 1504 | return err |
1505 | } | 1505 | } |
@@ -1511,7 +1511,7 @@ index 1877afded..046c97b01 100644 | |||
1511 | return ErrInvalidLengthSnapshots | 1511 | return ErrInvalidLengthSnapshots |
1512 | } | 1512 | } |
1513 | if (iNdEx + skippy) > l { | 1513 | if (iNdEx + skippy) > l { |
1514 | @@ -3816,10 +3801,7 @@ func (m *MountsResponse) Unmarshal(dAtA []byte) error { | 1514 | @@ -3816,10 +3801,7 @@ func (m *MountsResponse) Unmarshal(dAtA |
1515 | if err != nil { | 1515 | if err != nil { |
1516 | return err | 1516 | return err |
1517 | } | 1517 | } |
@@ -1523,7 +1523,7 @@ index 1877afded..046c97b01 100644 | |||
1523 | return ErrInvalidLengthSnapshots | 1523 | return ErrInvalidLengthSnapshots |
1524 | } | 1524 | } |
1525 | if (iNdEx + skippy) > l { | 1525 | if (iNdEx + skippy) > l { |
1526 | @@ -3934,10 +3916,7 @@ func (m *RemoveSnapshotRequest) Unmarshal(dAtA []byte) error { | 1526 | @@ -3934,10 +3916,7 @@ func (m *RemoveSnapshotRequest) Unmarsha |
1527 | if err != nil { | 1527 | if err != nil { |
1528 | return err | 1528 | return err |
1529 | } | 1529 | } |
@@ -1535,7 +1535,7 @@ index 1877afded..046c97b01 100644 | |||
1535 | return ErrInvalidLengthSnapshots | 1535 | return ErrInvalidLengthSnapshots |
1536 | } | 1536 | } |
1537 | if (iNdEx + skippy) > l { | 1537 | if (iNdEx + skippy) > l { |
1538 | @@ -4194,7 +4173,7 @@ func (m *CommitSnapshotRequest) Unmarshal(dAtA []byte) error { | 1538 | @@ -4194,7 +4173,7 @@ func (m *CommitSnapshotRequest) Unmarsha |
1539 | if err != nil { | 1539 | if err != nil { |
1540 | return err | 1540 | return err |
1541 | } | 1541 | } |
@@ -1544,7 +1544,7 @@ index 1877afded..046c97b01 100644 | |||
1544 | return ErrInvalidLengthSnapshots | 1544 | return ErrInvalidLengthSnapshots |
1545 | } | 1545 | } |
1546 | if (iNdEx + skippy) > postIndex { | 1546 | if (iNdEx + skippy) > postIndex { |
1547 | @@ -4211,10 +4190,7 @@ func (m *CommitSnapshotRequest) Unmarshal(dAtA []byte) error { | 1547 | @@ -4211,10 +4190,7 @@ func (m *CommitSnapshotRequest) Unmarsha |
1548 | if err != nil { | 1548 | if err != nil { |
1549 | return err | 1549 | return err |
1550 | } | 1550 | } |
@@ -1556,7 +1556,7 @@ index 1877afded..046c97b01 100644 | |||
1556 | return ErrInvalidLengthSnapshots | 1556 | return ErrInvalidLengthSnapshots |
1557 | } | 1557 | } |
1558 | if (iNdEx + skippy) > l { | 1558 | if (iNdEx + skippy) > l { |
1559 | @@ -4329,10 +4305,7 @@ func (m *StatSnapshotRequest) Unmarshal(dAtA []byte) error { | 1559 | @@ -4329,10 +4305,7 @@ func (m *StatSnapshotRequest) Unmarshal( |
1560 | if err != nil { | 1560 | if err != nil { |
1561 | return err | 1561 | return err |
1562 | } | 1562 | } |
@@ -1568,7 +1568,7 @@ index 1877afded..046c97b01 100644 | |||
1568 | return ErrInvalidLengthSnapshots | 1568 | return ErrInvalidLengthSnapshots |
1569 | } | 1569 | } |
1570 | if (iNdEx + skippy) > l { | 1570 | if (iNdEx + skippy) > l { |
1571 | @@ -4642,7 +4615,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | 1571 | @@ -4642,7 +4615,7 @@ func (m *Info) Unmarshal(dAtA []byte) er |
1572 | if err != nil { | 1572 | if err != nil { |
1573 | return err | 1573 | return err |
1574 | } | 1574 | } |
@@ -1577,7 +1577,7 @@ index 1877afded..046c97b01 100644 | |||
1577 | return ErrInvalidLengthSnapshots | 1577 | return ErrInvalidLengthSnapshots |
1578 | } | 1578 | } |
1579 | if (iNdEx + skippy) > postIndex { | 1579 | if (iNdEx + skippy) > postIndex { |
1580 | @@ -4659,10 +4632,7 @@ func (m *Info) Unmarshal(dAtA []byte) error { | 1580 | @@ -4659,10 +4632,7 @@ func (m *Info) Unmarshal(dAtA []byte) er |
1581 | if err != nil { | 1581 | if err != nil { |
1582 | return err | 1582 | return err |
1583 | } | 1583 | } |
@@ -1589,7 +1589,7 @@ index 1877afded..046c97b01 100644 | |||
1589 | return ErrInvalidLengthSnapshots | 1589 | return ErrInvalidLengthSnapshots |
1590 | } | 1590 | } |
1591 | if (iNdEx + skippy) > l { | 1591 | if (iNdEx + skippy) > l { |
1592 | @@ -4746,10 +4716,7 @@ func (m *StatSnapshotResponse) Unmarshal(dAtA []byte) error { | 1592 | @@ -4746,10 +4716,7 @@ func (m *StatSnapshotResponse) Unmarshal |
1593 | if err != nil { | 1593 | if err != nil { |
1594 | return err | 1594 | return err |
1595 | } | 1595 | } |
@@ -1601,7 +1601,7 @@ index 1877afded..046c97b01 100644 | |||
1601 | return ErrInvalidLengthSnapshots | 1601 | return ErrInvalidLengthSnapshots |
1602 | } | 1602 | } |
1603 | if (iNdEx + skippy) > l { | 1603 | if (iNdEx + skippy) > l { |
1604 | @@ -4901,10 +4868,7 @@ func (m *UpdateSnapshotRequest) Unmarshal(dAtA []byte) error { | 1604 | @@ -4901,10 +4868,7 @@ func (m *UpdateSnapshotRequest) Unmarsha |
1605 | if err != nil { | 1605 | if err != nil { |
1606 | return err | 1606 | return err |
1607 | } | 1607 | } |
@@ -1613,7 +1613,7 @@ index 1877afded..046c97b01 100644 | |||
1613 | return ErrInvalidLengthSnapshots | 1613 | return ErrInvalidLengthSnapshots |
1614 | } | 1614 | } |
1615 | if (iNdEx + skippy) > l { | 1615 | if (iNdEx + skippy) > l { |
1616 | @@ -4988,10 +4952,7 @@ func (m *UpdateSnapshotResponse) Unmarshal(dAtA []byte) error { | 1616 | @@ -4988,10 +4952,7 @@ func (m *UpdateSnapshotResponse) Unmarsh |
1617 | if err != nil { | 1617 | if err != nil { |
1618 | return err | 1618 | return err |
1619 | } | 1619 | } |
@@ -1625,7 +1625,7 @@ index 1877afded..046c97b01 100644 | |||
1625 | return ErrInvalidLengthSnapshots | 1625 | return ErrInvalidLengthSnapshots |
1626 | } | 1626 | } |
1627 | if (iNdEx + skippy) > l { | 1627 | if (iNdEx + skippy) > l { |
1628 | @@ -5106,10 +5067,7 @@ func (m *ListSnapshotsRequest) Unmarshal(dAtA []byte) error { | 1628 | @@ -5106,10 +5067,7 @@ func (m *ListSnapshotsRequest) Unmarshal |
1629 | if err != nil { | 1629 | if err != nil { |
1630 | return err | 1630 | return err |
1631 | } | 1631 | } |
@@ -1637,7 +1637,7 @@ index 1877afded..046c97b01 100644 | |||
1637 | return ErrInvalidLengthSnapshots | 1637 | return ErrInvalidLengthSnapshots |
1638 | } | 1638 | } |
1639 | if (iNdEx + skippy) > l { | 1639 | if (iNdEx + skippy) > l { |
1640 | @@ -5194,10 +5152,7 @@ func (m *ListSnapshotsResponse) Unmarshal(dAtA []byte) error { | 1640 | @@ -5194,10 +5152,7 @@ func (m *ListSnapshotsResponse) Unmarsha |
1641 | if err != nil { | 1641 | if err != nil { |
1642 | return err | 1642 | return err |
1643 | } | 1643 | } |
@@ -1649,7 +1649,7 @@ index 1877afded..046c97b01 100644 | |||
1649 | return ErrInvalidLengthSnapshots | 1649 | return ErrInvalidLengthSnapshots |
1650 | } | 1650 | } |
1651 | if (iNdEx + skippy) > l { | 1651 | if (iNdEx + skippy) > l { |
1652 | @@ -5312,10 +5267,7 @@ func (m *UsageRequest) Unmarshal(dAtA []byte) error { | 1652 | @@ -5312,10 +5267,7 @@ func (m *UsageRequest) Unmarshal(dAtA [] |
1653 | if err != nil { | 1653 | if err != nil { |
1654 | return err | 1654 | return err |
1655 | } | 1655 | } |
@@ -1661,7 +1661,7 @@ index 1877afded..046c97b01 100644 | |||
1661 | return ErrInvalidLengthSnapshots | 1661 | return ErrInvalidLengthSnapshots |
1662 | } | 1662 | } |
1663 | if (iNdEx + skippy) > l { | 1663 | if (iNdEx + skippy) > l { |
1664 | @@ -5404,10 +5356,7 @@ func (m *UsageResponse) Unmarshal(dAtA []byte) error { | 1664 | @@ -5404,10 +5356,7 @@ func (m *UsageResponse) Unmarshal(dAtA [ |
1665 | if err != nil { | 1665 | if err != nil { |
1666 | return err | 1666 | return err |
1667 | } | 1667 | } |
@@ -1673,7 +1673,7 @@ index 1877afded..046c97b01 100644 | |||
1673 | return ErrInvalidLengthSnapshots | 1673 | return ErrInvalidLengthSnapshots |
1674 | } | 1674 | } |
1675 | if (iNdEx + skippy) > l { | 1675 | if (iNdEx + skippy) > l { |
1676 | @@ -5490,10 +5439,7 @@ func (m *CleanupRequest) Unmarshal(dAtA []byte) error { | 1676 | @@ -5490,10 +5439,7 @@ func (m *CleanupRequest) Unmarshal(dAtA |
1677 | if err != nil { | 1677 | if err != nil { |
1678 | return err | 1678 | return err |
1679 | } | 1679 | } |
@@ -1685,19 +1685,19 @@ index 1877afded..046c97b01 100644 | |||
1685 | return ErrInvalidLengthSnapshots | 1685 | return ErrInvalidLengthSnapshots |
1686 | } | 1686 | } |
1687 | if (iNdEx + skippy) > l { | 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 | 1688 | Index: git/src/import/api/services/tasks/v1/tasks.pb.go |
1689 | index 5ac5af11b..4904e6508 100644 | 1689 | =================================================================== |
1690 | --- a/src/import/api/services/tasks/v1/tasks.pb.go | 1690 | --- git.orig/src/import/api/services/tasks/v1/tasks.pb.go |
1691 | +++ b/src/import/api/services/tasks/v1/tasks.pb.go | 1691 | +++ git/src/import/api/services/tasks/v1/tasks.pb.go |
1692 | @@ -9,6 +9,7 @@ import ( | 1692 | @@ -9,6 +9,7 @@ import ( |
1693 | types "github.com/containerd/containerd/api/types" | 1693 | types "github.com/containerd/containerd/api/types" |
1694 | task "github.com/containerd/containerd/src/import/api/types/task" | 1694 | task "github.com/containerd/containerd/api/types/task" |
1695 | proto "github.com/gogo/protobuf/proto" | 1695 | proto "github.com/gogo/protobuf/proto" |
1696 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" | 1696 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" |
1697 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" | 1697 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" |
1698 | types1 "github.com/gogo/protobuf/types" | 1698 | types1 "github.com/gogo/protobuf/types" |
1699 | github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" | 1699 | github_com_opencontainers_go_digest "github.com/opencontainers/go-digest" |
1700 | @@ -934,11 +935,12 @@ func (m *CheckpointTaskResponse) XXX_DiscardUnknown() { | 1700 | @@ -934,11 +935,12 @@ func (m *CheckpointTaskResponse) XXX_Dis |
1701 | var xxx_messageInfo_CheckpointTaskResponse proto.InternalMessageInfo | 1701 | var xxx_messageInfo_CheckpointTaskResponse proto.InternalMessageInfo |
1702 | 1702 | ||
1703 | type UpdateTaskRequest struct { | 1703 | type UpdateTaskRequest struct { |
@@ -1901,7 +1901,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1901 | } | 1901 | } |
1902 | 1902 | ||
1903 | // Reference imports to suppress errors if they are not otherwise used. | 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) { | 1904 | @@ -2943,6 +2949,25 @@ func (m *UpdateTaskRequest) MarshalToSiz |
1905 | i -= len(m.XXX_unrecognized) | 1905 | i -= len(m.XXX_unrecognized) |
1906 | copy(dAtA[i:], m.XXX_unrecognized) | 1906 | copy(dAtA[i:], m.XXX_unrecognized) |
1907 | } | 1907 | } |
@@ -1927,7 +1927,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1927 | if m.Resources != nil { | 1927 | if m.Resources != nil { |
1928 | { | 1928 | { |
1929 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) | 1929 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) |
1930 | @@ -3611,6 +3636,14 @@ func (m *UpdateTaskRequest) Size() (n int) { | 1930 | @@ -3611,6 +3636,14 @@ func (m *UpdateTaskRequest) Size() (n in |
1931 | l = m.Resources.Size() | 1931 | l = m.Resources.Size() |
1932 | n += 1 + l + sovTasks(uint64(l)) | 1932 | n += 1 + l + sovTasks(uint64(l)) |
1933 | } | 1933 | } |
@@ -1942,7 +1942,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1942 | if m.XXX_unrecognized != nil { | 1942 | if m.XXX_unrecognized != nil { |
1943 | n += len(m.XXX_unrecognized) | 1943 | n += len(m.XXX_unrecognized) |
1944 | } | 1944 | } |
1945 | @@ -3991,9 +4024,20 @@ func (this *UpdateTaskRequest) String() string { | 1945 | @@ -3991,9 +4024,20 @@ func (this *UpdateTaskRequest) String() |
1946 | if this == nil { | 1946 | if this == nil { |
1947 | return "nil" | 1947 | return "nil" |
1948 | } | 1948 | } |
@@ -1963,7 +1963,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1963 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, | 1963 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, |
1964 | `}`, | 1964 | `}`, |
1965 | }, "") | 1965 | }, "") |
1966 | @@ -4347,10 +4391,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | 1966 | @@ -4347,10 +4391,7 @@ func (m *CreateTaskRequest) Unmarshal(dA |
1967 | if err != nil { | 1967 | if err != nil { |
1968 | return err | 1968 | return err |
1969 | } | 1969 | } |
@@ -1975,7 +1975,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1975 | return ErrInvalidLengthTasks | 1975 | return ErrInvalidLengthTasks |
1976 | } | 1976 | } |
1977 | if (iNdEx + skippy) > l { | 1977 | if (iNdEx + skippy) > l { |
1978 | @@ -4452,10 +4493,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | 1978 | @@ -4452,10 +4493,7 @@ func (m *CreateTaskResponse) Unmarshal(d |
1979 | if err != nil { | 1979 | if err != nil { |
1980 | return err | 1980 | return err |
1981 | } | 1981 | } |
@@ -1987,7 +1987,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1987 | return ErrInvalidLengthTasks | 1987 | return ErrInvalidLengthTasks |
1988 | } | 1988 | } |
1989 | if (iNdEx + skippy) > l { | 1989 | if (iNdEx + skippy) > l { |
1990 | @@ -4570,10 +4608,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | 1990 | @@ -4570,10 +4608,7 @@ func (m *StartRequest) Unmarshal(dAtA [] |
1991 | if err != nil { | 1991 | if err != nil { |
1992 | return err | 1992 | return err |
1993 | } | 1993 | } |
@@ -1999,7 +1999,7 @@ index 5ac5af11b..4904e6508 100644 | |||
1999 | return ErrInvalidLengthTasks | 1999 | return ErrInvalidLengthTasks |
2000 | } | 2000 | } |
2001 | if (iNdEx + skippy) > l { | 2001 | if (iNdEx + skippy) > l { |
2002 | @@ -4643,10 +4678,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | 2002 | @@ -4643,10 +4678,7 @@ func (m *StartResponse) Unmarshal(dAtA [ |
2003 | if err != nil { | 2003 | if err != nil { |
2004 | return err | 2004 | return err |
2005 | } | 2005 | } |
@@ -2011,7 +2011,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2011 | return ErrInvalidLengthTasks | 2011 | return ErrInvalidLengthTasks |
2012 | } | 2012 | } |
2013 | if (iNdEx + skippy) > l { | 2013 | if (iNdEx + skippy) > l { |
2014 | @@ -4729,10 +4761,7 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { | 2014 | @@ -4729,10 +4761,7 @@ func (m *DeleteTaskRequest) Unmarshal(dA |
2015 | if err != nil { | 2015 | if err != nil { |
2016 | return err | 2016 | return err |
2017 | } | 2017 | } |
@@ -2023,7 +2023,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2023 | return ErrInvalidLengthTasks | 2023 | return ErrInvalidLengthTasks |
2024 | } | 2024 | } |
2025 | if (iNdEx + skippy) > l { | 2025 | if (iNdEx + skippy) > l { |
2026 | @@ -4886,10 +4915,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | 2026 | @@ -4886,10 +4915,7 @@ func (m *DeleteResponse) Unmarshal(dAtA |
2027 | if err != nil { | 2027 | if err != nil { |
2028 | return err | 2028 | return err |
2029 | } | 2029 | } |
@@ -2035,7 +2035,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2035 | return ErrInvalidLengthTasks | 2035 | return ErrInvalidLengthTasks |
2036 | } | 2036 | } |
2037 | if (iNdEx + skippy) > l { | 2037 | if (iNdEx + skippy) > l { |
2038 | @@ -5004,10 +5030,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { | 2038 | @@ -5004,10 +5030,7 @@ func (m *DeleteProcessRequest) Unmarshal |
2039 | if err != nil { | 2039 | if err != nil { |
2040 | return err | 2040 | return err |
2041 | } | 2041 | } |
@@ -2047,7 +2047,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2047 | return ErrInvalidLengthTasks | 2047 | return ErrInvalidLengthTasks |
2048 | } | 2048 | } |
2049 | if (iNdEx + skippy) > l { | 2049 | if (iNdEx + skippy) > l { |
2050 | @@ -5122,10 +5145,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { | 2050 | @@ -5122,10 +5145,7 @@ func (m *GetRequest) Unmarshal(dAtA []by |
2051 | if err != nil { | 2051 | if err != nil { |
2052 | return err | 2052 | return err |
2053 | } | 2053 | } |
@@ -2059,7 +2059,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2059 | return ErrInvalidLengthTasks | 2059 | return ErrInvalidLengthTasks |
2060 | } | 2060 | } |
2061 | if (iNdEx + skippy) > l { | 2061 | if (iNdEx + skippy) > l { |
2062 | @@ -5212,10 +5232,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { | 2062 | @@ -5212,10 +5232,7 @@ func (m *GetResponse) Unmarshal(dAtA []b |
2063 | if err != nil { | 2063 | if err != nil { |
2064 | return err | 2064 | return err |
2065 | } | 2065 | } |
@@ -2071,7 +2071,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2071 | return ErrInvalidLengthTasks | 2071 | return ErrInvalidLengthTasks |
2072 | } | 2072 | } |
2073 | if (iNdEx + skippy) > l { | 2073 | if (iNdEx + skippy) > l { |
2074 | @@ -5298,10 +5315,7 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { | 2074 | @@ -5298,10 +5315,7 @@ func (m *ListTasksRequest) Unmarshal(dAt |
2075 | if err != nil { | 2075 | if err != nil { |
2076 | return err | 2076 | return err |
2077 | } | 2077 | } |
@@ -2083,7 +2083,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2083 | return ErrInvalidLengthTasks | 2083 | return ErrInvalidLengthTasks |
2084 | } | 2084 | } |
2085 | if (iNdEx + skippy) > l { | 2085 | if (iNdEx + skippy) > l { |
2086 | @@ -5386,10 +5400,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { | 2086 | @@ -5386,10 +5400,7 @@ func (m *ListTasksResponse) Unmarshal(dA |
2087 | if err != nil { | 2087 | if err != nil { |
2088 | return err | 2088 | return err |
2089 | } | 2089 | } |
@@ -2095,7 +2095,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2095 | return ErrInvalidLengthTasks | 2095 | return ErrInvalidLengthTasks |
2096 | } | 2096 | } |
2097 | if (iNdEx + skippy) > l { | 2097 | if (iNdEx + skippy) > l { |
2098 | @@ -5543,10 +5554,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | 2098 | @@ -5543,10 +5554,7 @@ func (m *KillRequest) Unmarshal(dAtA []b |
2099 | if err != nil { | 2099 | if err != nil { |
2100 | return err | 2100 | return err |
2101 | } | 2101 | } |
@@ -2107,7 +2107,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2107 | return ErrInvalidLengthTasks | 2107 | return ErrInvalidLengthTasks |
2108 | } | 2108 | } |
2109 | if (iNdEx + skippy) > l { | 2109 | if (iNdEx + skippy) > l { |
2110 | @@ -5813,10 +5821,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | 2110 | @@ -5813,10 +5821,7 @@ func (m *ExecProcessRequest) Unmarshal(d |
2111 | if err != nil { | 2111 | if err != nil { |
2112 | return err | 2112 | return err |
2113 | } | 2113 | } |
@@ -2119,7 +2119,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2119 | return ErrInvalidLengthTasks | 2119 | return ErrInvalidLengthTasks |
2120 | } | 2120 | } |
2121 | if (iNdEx + skippy) > l { | 2121 | if (iNdEx + skippy) > l { |
2122 | @@ -5867,10 +5872,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | 2122 | @@ -5867,10 +5872,7 @@ func (m *ExecProcessResponse) Unmarshal( |
2123 | if err != nil { | 2123 | if err != nil { |
2124 | return err | 2124 | return err |
2125 | } | 2125 | } |
@@ -2131,7 +2131,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2131 | return ErrInvalidLengthTasks | 2131 | return ErrInvalidLengthTasks |
2132 | } | 2132 | } |
2133 | if (iNdEx + skippy) > l { | 2133 | if (iNdEx + skippy) > l { |
2134 | @@ -6023,10 +6025,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | 2134 | @@ -6023,10 +6025,7 @@ func (m *ResizePtyRequest) Unmarshal(dAt |
2135 | if err != nil { | 2135 | if err != nil { |
2136 | return err | 2136 | return err |
2137 | } | 2137 | } |
@@ -2143,7 +2143,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2143 | return ErrInvalidLengthTasks | 2143 | return ErrInvalidLengthTasks |
2144 | } | 2144 | } |
2145 | if (iNdEx + skippy) > l { | 2145 | if (iNdEx + skippy) > l { |
2146 | @@ -6161,10 +6160,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | 2146 | @@ -6161,10 +6160,7 @@ func (m *CloseIORequest) Unmarshal(dAtA |
2147 | if err != nil { | 2147 | if err != nil { |
2148 | return err | 2148 | return err |
2149 | } | 2149 | } |
@@ -2155,7 +2155,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2155 | return ErrInvalidLengthTasks | 2155 | return ErrInvalidLengthTasks |
2156 | } | 2156 | } |
2157 | if (iNdEx + skippy) > l { | 2157 | if (iNdEx + skippy) > l { |
2158 | @@ -6247,10 +6243,7 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { | 2158 | @@ -6247,10 +6243,7 @@ func (m *PauseTaskRequest) Unmarshal(dAt |
2159 | if err != nil { | 2159 | if err != nil { |
2160 | return err | 2160 | return err |
2161 | } | 2161 | } |
@@ -2167,7 +2167,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2167 | return ErrInvalidLengthTasks | 2167 | return ErrInvalidLengthTasks |
2168 | } | 2168 | } |
2169 | if (iNdEx + skippy) > l { | 2169 | if (iNdEx + skippy) > l { |
2170 | @@ -6333,10 +6326,7 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { | 2170 | @@ -6333,10 +6326,7 @@ func (m *ResumeTaskRequest) Unmarshal(dA |
2171 | if err != nil { | 2171 | if err != nil { |
2172 | return err | 2172 | return err |
2173 | } | 2173 | } |
@@ -2179,7 +2179,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2179 | return ErrInvalidLengthTasks | 2179 | return ErrInvalidLengthTasks |
2180 | } | 2180 | } |
2181 | if (iNdEx + skippy) > l { | 2181 | if (iNdEx + skippy) > l { |
2182 | @@ -6419,10 +6409,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA []byte) error { | 2182 | @@ -6419,10 +6409,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA |
2183 | if err != nil { | 2183 | if err != nil { |
2184 | return err | 2184 | return err |
2185 | } | 2185 | } |
@@ -2191,7 +2191,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2191 | return ErrInvalidLengthTasks | 2191 | return ErrInvalidLengthTasks |
2192 | } | 2192 | } |
2193 | if (iNdEx + skippy) > l { | 2193 | if (iNdEx + skippy) > l { |
2194 | @@ -6507,10 +6494,7 @@ func (m *ListPidsResponse) Unmarshal(dAtA []byte) error { | 2194 | @@ -6507,10 +6494,7 @@ func (m *ListPidsResponse) Unmarshal(dAt |
2195 | if err != nil { | 2195 | if err != nil { |
2196 | return err | 2196 | return err |
2197 | } | 2197 | } |
@@ -2203,7 +2203,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2203 | return ErrInvalidLengthTasks | 2203 | return ErrInvalidLengthTasks |
2204 | } | 2204 | } |
2205 | if (iNdEx + skippy) > l { | 2205 | if (iNdEx + skippy) > l { |
2206 | @@ -6661,10 +6645,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | 2206 | @@ -6661,10 +6645,7 @@ func (m *CheckpointTaskRequest) Unmarsha |
2207 | if err != nil { | 2207 | if err != nil { |
2208 | return err | 2208 | return err |
2209 | } | 2209 | } |
@@ -2215,7 +2215,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2215 | return ErrInvalidLengthTasks | 2215 | return ErrInvalidLengthTasks |
2216 | } | 2216 | } |
2217 | if (iNdEx + skippy) > l { | 2217 | if (iNdEx + skippy) > l { |
2218 | @@ -6749,10 +6730,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { | 2218 | @@ -6749,10 +6730,7 @@ func (m *CheckpointTaskResponse) Unmarsh |
2219 | if err != nil { | 2219 | if err != nil { |
2220 | return err | 2220 | return err |
2221 | } | 2221 | } |
@@ -2227,7 +2227,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2227 | return ErrInvalidLengthTasks | 2227 | return ErrInvalidLengthTasks |
2228 | } | 2228 | } |
2229 | if (iNdEx + skippy) > l { | 2229 | if (iNdEx + skippy) > l { |
2230 | @@ -6865,16 +6843,140 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | 2230 | @@ -6865,16 +6843,140 @@ func (m *UpdateTaskRequest) Unmarshal(dA |
2231 | return err | 2231 | return err |
2232 | } | 2232 | } |
2233 | iNdEx = postIndex | 2233 | iNdEx = postIndex |
@@ -2372,7 +2372,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2372 | return ErrInvalidLengthTasks | 2372 | return ErrInvalidLengthTasks |
2373 | } | 2373 | } |
2374 | if (iNdEx + skippy) > l { | 2374 | if (iNdEx + skippy) > l { |
2375 | @@ -6957,10 +7059,7 @@ func (m *MetricsRequest) Unmarshal(dAtA []byte) error { | 2375 | @@ -6957,10 +7059,7 @@ func (m *MetricsRequest) Unmarshal(dAtA |
2376 | if err != nil { | 2376 | if err != nil { |
2377 | return err | 2377 | return err |
2378 | } | 2378 | } |
@@ -2384,7 +2384,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2384 | return ErrInvalidLengthTasks | 2384 | return ErrInvalidLengthTasks |
2385 | } | 2385 | } |
2386 | if (iNdEx + skippy) > l { | 2386 | if (iNdEx + skippy) > l { |
2387 | @@ -7045,10 +7144,7 @@ func (m *MetricsResponse) Unmarshal(dAtA []byte) error { | 2387 | @@ -7045,10 +7144,7 @@ func (m *MetricsResponse) Unmarshal(dAtA |
2388 | if err != nil { | 2388 | if err != nil { |
2389 | return err | 2389 | return err |
2390 | } | 2390 | } |
@@ -2396,7 +2396,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2396 | return ErrInvalidLengthTasks | 2396 | return ErrInvalidLengthTasks |
2397 | } | 2397 | } |
2398 | if (iNdEx + skippy) > l { | 2398 | if (iNdEx + skippy) > l { |
2399 | @@ -7163,10 +7259,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | 2399 | @@ -7163,10 +7259,7 @@ func (m *WaitRequest) Unmarshal(dAtA []b |
2400 | if err != nil { | 2400 | if err != nil { |
2401 | return err | 2401 | return err |
2402 | } | 2402 | } |
@@ -2408,7 +2408,7 @@ index 5ac5af11b..4904e6508 100644 | |||
2408 | return ErrInvalidLengthTasks | 2408 | return ErrInvalidLengthTasks |
2409 | } | 2409 | } |
2410 | if (iNdEx + skippy) > l { | 2410 | if (iNdEx + skippy) > l { |
2411 | @@ -7269,10 +7362,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | 2411 | @@ -7269,10 +7362,7 @@ func (m *WaitResponse) Unmarshal(dAtA [] |
2412 | if err != nil { | 2412 | if err != nil { |
2413 | return err | 2413 | return err |
2414 | } | 2414 | } |
@@ -2420,11 +2420,11 @@ index 5ac5af11b..4904e6508 100644 | |||
2420 | return ErrInvalidLengthTasks | 2420 | return ErrInvalidLengthTasks |
2421 | } | 2421 | } |
2422 | if (iNdEx + skippy) > l { | 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 | 2423 | Index: git/src/import/api/services/ttrpc/events/v1/events.pb.go |
2424 | index 0e61351d5..b1f275bf0 100644 | 2424 | =================================================================== |
2425 | --- a/src/import/api/services/ttrpc/events/v1/events.pb.go | 2425 | --- git.orig/src/import/api/services/ttrpc/events/v1/events.pb.go |
2426 | +++ b/src/import/api/services/ttrpc/events/v1/events.pb.go | 2426 | +++ git/src/import/api/services/ttrpc/events/v1/events.pb.go |
2427 | @@ -474,10 +474,7 @@ func (m *ForwardRequest) Unmarshal(dAtA []byte) error { | 2427 | @@ -474,10 +474,7 @@ func (m *ForwardRequest) Unmarshal(dAtA |
2428 | if err != nil { | 2428 | if err != nil { |
2429 | return err | 2429 | return err |
2430 | } | 2430 | } |
@@ -2436,7 +2436,7 @@ index 0e61351d5..b1f275bf0 100644 | |||
2436 | return ErrInvalidLengthEvents | 2436 | return ErrInvalidLengthEvents |
2437 | } | 2437 | } |
2438 | if (iNdEx + skippy) > l { | 2438 | if (iNdEx + skippy) > l { |
2439 | @@ -661,10 +658,7 @@ func (m *Envelope) Unmarshal(dAtA []byte) error { | 2439 | @@ -661,10 +658,7 @@ func (m *Envelope) Unmarshal(dAtA []byte |
2440 | if err != nil { | 2440 | if err != nil { |
2441 | return err | 2441 | return err |
2442 | } | 2442 | } |
@@ -2448,11 +2448,11 @@ index 0e61351d5..b1f275bf0 100644 | |||
2448 | return ErrInvalidLengthEvents | 2448 | return ErrInvalidLengthEvents |
2449 | } | 2449 | } |
2450 | if (iNdEx + skippy) > l { | 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 | 2451 | Index: git/src/import/api/services/version/v1/version.pb.go |
2452 | index 81b8c3395..b742c6ae6 100644 | 2452 | =================================================================== |
2453 | --- a/src/import/api/services/version/v1/version.pb.go | 2453 | --- git.orig/src/import/api/services/version/v1/version.pb.go |
2454 | +++ b/src/import/api/services/version/v1/version.pb.go | 2454 | +++ git/src/import/api/services/version/v1/version.pb.go |
2455 | @@ -374,10 +374,7 @@ func (m *VersionResponse) Unmarshal(dAtA []byte) error { | 2455 | @@ -374,10 +374,7 @@ func (m *VersionResponse) Unmarshal(dAtA |
2456 | if err != nil { | 2456 | if err != nil { |
2457 | return err | 2457 | return err |
2458 | } | 2458 | } |
@@ -2464,11 +2464,11 @@ index 81b8c3395..b742c6ae6 100644 | |||
2464 | return ErrInvalidLengthVersion | 2464 | return ErrInvalidLengthVersion |
2465 | } | 2465 | } |
2466 | if (iNdEx + skippy) > l { | 2466 | if (iNdEx + skippy) > l { |
2467 | diff --git a/src/import/api/types/descriptor.pb.go b/src/import/api/types/descriptor.pb.go | 2467 | Index: git/src/import/api/types/descriptor.pb.go |
2468 | index 437d41f23..fe71dbf43 100644 | 2468 | =================================================================== |
2469 | --- a/src/import/api/types/descriptor.pb.go | 2469 | --- git.orig/src/import/api/types/descriptor.pb.go |
2470 | +++ b/src/import/api/types/descriptor.pb.go | 2470 | +++ git/src/import/api/types/descriptor.pb.go |
2471 | @@ -479,7 +479,7 @@ func (m *Descriptor) Unmarshal(dAtA []byte) error { | 2471 | @@ -479,7 +479,7 @@ func (m *Descriptor) Unmarshal(dAtA []by |
2472 | if err != nil { | 2472 | if err != nil { |
2473 | return err | 2473 | return err |
2474 | } | 2474 | } |
@@ -2477,7 +2477,7 @@ index 437d41f23..fe71dbf43 100644 | |||
2477 | return ErrInvalidLengthDescriptor | 2477 | return ErrInvalidLengthDescriptor |
2478 | } | 2478 | } |
2479 | if (iNdEx + skippy) > postIndex { | 2479 | if (iNdEx + skippy) > postIndex { |
2480 | @@ -496,10 +496,7 @@ func (m *Descriptor) Unmarshal(dAtA []byte) error { | 2480 | @@ -496,10 +496,7 @@ func (m *Descriptor) Unmarshal(dAtA []by |
2481 | if err != nil { | 2481 | if err != nil { |
2482 | return err | 2482 | return err |
2483 | } | 2483 | } |
@@ -2489,11 +2489,11 @@ index 437d41f23..fe71dbf43 100644 | |||
2489 | return ErrInvalidLengthDescriptor | 2489 | return ErrInvalidLengthDescriptor |
2490 | } | 2490 | } |
2491 | if (iNdEx + skippy) > l { | 2491 | if (iNdEx + skippy) > l { |
2492 | diff --git a/src/import/api/types/metrics.pb.go b/src/import/api/types/metrics.pb.go | 2492 | Index: git/src/import/api/types/metrics.pb.go |
2493 | index 89a8d9cd6..75773e442 100644 | 2493 | =================================================================== |
2494 | --- a/src/import/api/types/metrics.pb.go | 2494 | --- git.orig/src/import/api/types/metrics.pb.go |
2495 | +++ b/src/import/api/types/metrics.pb.go | 2495 | +++ git/src/import/api/types/metrics.pb.go |
2496 | @@ -348,10 +348,7 @@ func (m *Metric) Unmarshal(dAtA []byte) error { | 2496 | @@ -348,10 +348,7 @@ func (m *Metric) Unmarshal(dAtA []byte) |
2497 | if err != nil { | 2497 | if err != nil { |
2498 | return err | 2498 | return err |
2499 | } | 2499 | } |
@@ -2505,11 +2505,11 @@ index 89a8d9cd6..75773e442 100644 | |||
2505 | return ErrInvalidLengthMetrics | 2505 | return ErrInvalidLengthMetrics |
2506 | } | 2506 | } |
2507 | if (iNdEx + skippy) > l { | 2507 | if (iNdEx + skippy) > l { |
2508 | diff --git a/src/import/api/types/mount.pb.go b/src/import/api/types/mount.pb.go | 2508 | Index: git/src/import/api/types/mount.pb.go |
2509 | index 6872e4120..d0a0bee76 100644 | 2509 | =================================================================== |
2510 | --- a/src/import/api/types/mount.pb.go | 2510 | --- git.orig/src/import/api/types/mount.pb.go |
2511 | +++ b/src/import/api/types/mount.pb.go | 2511 | +++ git/src/import/api/types/mount.pb.go |
2512 | @@ -392,10 +392,7 @@ func (m *Mount) Unmarshal(dAtA []byte) error { | 2512 | @@ -392,10 +392,7 @@ func (m *Mount) Unmarshal(dAtA []byte) e |
2513 | if err != nil { | 2513 | if err != nil { |
2514 | return err | 2514 | return err |
2515 | } | 2515 | } |
@@ -2521,11 +2521,11 @@ index 6872e4120..d0a0bee76 100644 | |||
2521 | return ErrInvalidLengthMount | 2521 | return ErrInvalidLengthMount |
2522 | } | 2522 | } |
2523 | if (iNdEx + skippy) > l { | 2523 | if (iNdEx + skippy) > l { |
2524 | diff --git a/src/import/api/types/platform.pb.go b/src/import/api/types/platform.pb.go | 2524 | Index: git/src/import/api/types/platform.pb.go |
2525 | index c03d8b077..a0f78c8a7 100644 | 2525 | =================================================================== |
2526 | --- a/src/import/api/types/platform.pb.go | 2526 | --- git.orig/src/import/api/types/platform.pb.go |
2527 | +++ b/src/import/api/types/platform.pb.go | 2527 | +++ git/src/import/api/types/platform.pb.go |
2528 | @@ -333,10 +333,7 @@ func (m *Platform) Unmarshal(dAtA []byte) error { | 2528 | @@ -333,10 +333,7 @@ func (m *Platform) Unmarshal(dAtA []byte |
2529 | if err != nil { | 2529 | if err != nil { |
2530 | return err | 2530 | return err |
2531 | } | 2531 | } |
@@ -2537,11 +2537,11 @@ index c03d8b077..a0f78c8a7 100644 | |||
2537 | return ErrInvalidLengthPlatform | 2537 | return ErrInvalidLengthPlatform |
2538 | } | 2538 | } |
2539 | if (iNdEx + skippy) > l { | 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 | 2540 | Index: git/src/import/api/types/task/task.pb.go |
2541 | index ae824ff45..f511bbd05 100644 | 2541 | =================================================================== |
2542 | --- a/src/import/api/types/task/task.pb.go | 2542 | --- git.orig/src/import/api/types/task/task.pb.go |
2543 | +++ b/src/import/api/types/task/task.pb.go | 2543 | +++ git/src/import/api/types/task/task.pb.go |
2544 | @@ -772,10 +772,7 @@ func (m *Process) Unmarshal(dAtA []byte) error { | 2544 | @@ -772,10 +772,7 @@ func (m *Process) Unmarshal(dAtA []byte) |
2545 | if err != nil { | 2545 | if err != nil { |
2546 | return err | 2546 | return err |
2547 | } | 2547 | } |
@@ -2553,7 +2553,7 @@ index ae824ff45..f511bbd05 100644 | |||
2553 | return ErrInvalidLengthTask | 2553 | return ErrInvalidLengthTask |
2554 | } | 2554 | } |
2555 | if (iNdEx + skippy) > l { | 2555 | if (iNdEx + skippy) > l { |
2556 | @@ -881,10 +878,7 @@ func (m *ProcessInfo) Unmarshal(dAtA []byte) error { | 2556 | @@ -881,10 +878,7 @@ func (m *ProcessInfo) Unmarshal(dAtA []b |
2557 | if err != nil { | 2557 | if err != nil { |
2558 | return err | 2558 | return err |
2559 | } | 2559 | } |
@@ -2565,11 +2565,11 @@ index ae824ff45..f511bbd05 100644 | |||
2565 | return ErrInvalidLengthTask | 2565 | return ErrInvalidLengthTask |
2566 | } | 2566 | } |
2567 | if (iNdEx + skippy) > l { | 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 | 2568 | Index: git/src/import/runtime/linux/runctypes/runc.pb.go |
2569 | index 26306e594..46d31ff59 100644 | 2569 | =================================================================== |
2570 | --- a/src/import/runtime/linux/runctypes/runc.pb.go | 2570 | --- git.orig/src/import/runtime/linux/runctypes/runc.pb.go |
2571 | +++ b/src/import/runtime/linux/runctypes/runc.pb.go | 2571 | +++ git/src/import/runtime/linux/runctypes/runc.pb.go |
2572 | @@ -978,10 +978,7 @@ func (m *RuncOptions) Unmarshal(dAtA []byte) error { | 2572 | @@ -978,10 +978,7 @@ func (m *RuncOptions) Unmarshal(dAtA []b |
2573 | if err != nil { | 2573 | if err != nil { |
2574 | return err | 2574 | return err |
2575 | } | 2575 | } |
@@ -2581,7 +2581,7 @@ index 26306e594..46d31ff59 100644 | |||
2581 | return ErrInvalidLengthRunc | 2581 | return ErrInvalidLengthRunc |
2582 | } | 2582 | } |
2583 | if (iNdEx + skippy) > l { | 2583 | if (iNdEx + skippy) > l { |
2584 | @@ -1350,10 +1347,7 @@ func (m *CreateOptions) Unmarshal(dAtA []byte) error { | 2584 | @@ -1350,10 +1347,7 @@ func (m *CreateOptions) Unmarshal(dAtA [ |
2585 | if err != nil { | 2585 | if err != nil { |
2586 | return err | 2586 | return err |
2587 | } | 2587 | } |
@@ -2593,7 +2593,7 @@ index 26306e594..46d31ff59 100644 | |||
2593 | return ErrInvalidLengthRunc | 2593 | return ErrInvalidLengthRunc |
2594 | } | 2594 | } |
2595 | if (iNdEx + skippy) > l { | 2595 | if (iNdEx + skippy) > l { |
2596 | @@ -1632,10 +1626,7 @@ func (m *CheckpointOptions) Unmarshal(dAtA []byte) error { | 2596 | @@ -1632,10 +1626,7 @@ func (m *CheckpointOptions) Unmarshal(dA |
2597 | if err != nil { | 2597 | if err != nil { |
2598 | return err | 2598 | return err |
2599 | } | 2599 | } |
@@ -2605,7 +2605,7 @@ index 26306e594..46d31ff59 100644 | |||
2605 | return ErrInvalidLengthRunc | 2605 | return ErrInvalidLengthRunc |
2606 | } | 2606 | } |
2607 | if (iNdEx + skippy) > l { | 2607 | if (iNdEx + skippy) > l { |
2608 | @@ -1718,10 +1709,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { | 2608 | @@ -1718,10 +1709,7 @@ func (m *ProcessDetails) Unmarshal(dAtA |
2609 | if err != nil { | 2609 | if err != nil { |
2610 | return err | 2610 | return err |
2611 | } | 2611 | } |
@@ -2617,11 +2617,11 @@ index 26306e594..46d31ff59 100644 | |||
2617 | return ErrInvalidLengthRunc | 2617 | return ErrInvalidLengthRunc |
2618 | } | 2618 | } |
2619 | if (iNdEx + skippy) > l { | 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 | 2620 | Index: git/src/import/runtime/v1/shim/v1/shim.pb.go |
2621 | index 27f334966..dbc82599d 100644 | 2621 | =================================================================== |
2622 | --- a/src/import/runtime/v1/shim/v1/shim.pb.go | 2622 | --- git.orig/src/import/runtime/v1/shim/v1/shim.pb.go |
2623 | +++ b/src/import/runtime/v1/shim/v1/shim.pb.go | 2623 | +++ git/src/import/runtime/v1/shim/v1/shim.pb.go |
2624 | @@ -3262,10 +3262,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | 2624 | @@ -3262,10 +3262,7 @@ func (m *CreateTaskRequest) Unmarshal(dA |
2625 | if err != nil { | 2625 | if err != nil { |
2626 | return err | 2626 | return err |
2627 | } | 2627 | } |
@@ -2633,7 +2633,7 @@ index 27f334966..dbc82599d 100644 | |||
2633 | return ErrInvalidLengthShim | 2633 | return ErrInvalidLengthShim |
2634 | } | 2634 | } |
2635 | if (iNdEx + skippy) > l { | 2635 | if (iNdEx + skippy) > l { |
2636 | @@ -3335,10 +3332,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | 2636 | @@ -3335,10 +3332,7 @@ func (m *CreateTaskResponse) Unmarshal(d |
2637 | if err != nil { | 2637 | if err != nil { |
2638 | return err | 2638 | return err |
2639 | } | 2639 | } |
@@ -2645,7 +2645,7 @@ index 27f334966..dbc82599d 100644 | |||
2645 | return ErrInvalidLengthShim | 2645 | return ErrInvalidLengthShim |
2646 | } | 2646 | } |
2647 | if (iNdEx + skippy) > l { | 2647 | if (iNdEx + skippy) > l { |
2648 | @@ -3460,10 +3454,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | 2648 | @@ -3460,10 +3454,7 @@ func (m *DeleteResponse) Unmarshal(dAtA |
2649 | if err != nil { | 2649 | if err != nil { |
2650 | return err | 2650 | return err |
2651 | } | 2651 | } |
@@ -2657,7 +2657,7 @@ index 27f334966..dbc82599d 100644 | |||
2657 | return ErrInvalidLengthShim | 2657 | return ErrInvalidLengthShim |
2658 | } | 2658 | } |
2659 | if (iNdEx + skippy) > l { | 2659 | if (iNdEx + skippy) > l { |
2660 | @@ -3546,10 +3537,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { | 2660 | @@ -3546,10 +3537,7 @@ func (m *DeleteProcessRequest) Unmarshal |
2661 | if err != nil { | 2661 | if err != nil { |
2662 | return err | 2662 | return err |
2663 | } | 2663 | } |
@@ -2669,7 +2669,7 @@ index 27f334966..dbc82599d 100644 | |||
2669 | return ErrInvalidLengthShim | 2669 | return ErrInvalidLengthShim |
2670 | } | 2670 | } |
2671 | if (iNdEx + skippy) > l { | 2671 | if (iNdEx + skippy) > l { |
2672 | @@ -3784,10 +3772,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | 2672 | @@ -3784,10 +3772,7 @@ func (m *ExecProcessRequest) Unmarshal(d |
2673 | if err != nil { | 2673 | if err != nil { |
2674 | return err | 2674 | return err |
2675 | } | 2675 | } |
@@ -2681,7 +2681,7 @@ index 27f334966..dbc82599d 100644 | |||
2681 | return ErrInvalidLengthShim | 2681 | return ErrInvalidLengthShim |
2682 | } | 2682 | } |
2683 | if (iNdEx + skippy) > l { | 2683 | if (iNdEx + skippy) > l { |
2684 | @@ -3838,10 +3823,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | 2684 | @@ -3838,10 +3823,7 @@ func (m *ExecProcessResponse) Unmarshal( |
2685 | if err != nil { | 2685 | if err != nil { |
2686 | return err | 2686 | return err |
2687 | } | 2687 | } |
@@ -2693,7 +2693,7 @@ index 27f334966..dbc82599d 100644 | |||
2693 | return ErrInvalidLengthShim | 2693 | return ErrInvalidLengthShim |
2694 | } | 2694 | } |
2695 | if (iNdEx + skippy) > l { | 2695 | if (iNdEx + skippy) > l { |
2696 | @@ -3962,10 +3944,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | 2696 | @@ -3962,10 +3944,7 @@ func (m *ResizePtyRequest) Unmarshal(dAt |
2697 | if err != nil { | 2697 | if err != nil { |
2698 | return err | 2698 | return err |
2699 | } | 2699 | } |
@@ -2705,7 +2705,7 @@ index 27f334966..dbc82599d 100644 | |||
2705 | return ErrInvalidLengthShim | 2705 | return ErrInvalidLengthShim |
2706 | } | 2706 | } |
2707 | if (iNdEx + skippy) > l { | 2707 | if (iNdEx + skippy) > l { |
2708 | @@ -4048,10 +4027,7 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { | 2708 | @@ -4048,10 +4027,7 @@ func (m *StateRequest) Unmarshal(dAtA [] |
2709 | if err != nil { | 2709 | if err != nil { |
2710 | return err | 2710 | return err |
2711 | } | 2711 | } |
@@ -2717,7 +2717,7 @@ index 27f334966..dbc82599d 100644 | |||
2717 | return ErrInvalidLengthShim | 2717 | return ErrInvalidLengthShim |
2718 | } | 2718 | } |
2719 | if (iNdEx + skippy) > l { | 2719 | if (iNdEx + skippy) > l { |
2720 | @@ -4372,10 +4348,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { | 2720 | @@ -4372,10 +4348,7 @@ func (m *StateResponse) Unmarshal(dAtA [ |
2721 | if err != nil { | 2721 | if err != nil { |
2722 | return err | 2722 | return err |
2723 | } | 2723 | } |
@@ -2729,7 +2729,7 @@ index 27f334966..dbc82599d 100644 | |||
2729 | return ErrInvalidLengthShim | 2729 | return ErrInvalidLengthShim |
2730 | } | 2730 | } |
2731 | if (iNdEx + skippy) > l { | 2731 | if (iNdEx + skippy) > l { |
2732 | @@ -4497,10 +4470,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | 2732 | @@ -4497,10 +4470,7 @@ func (m *KillRequest) Unmarshal(dAtA []b |
2733 | if err != nil { | 2733 | if err != nil { |
2734 | return err | 2734 | return err |
2735 | } | 2735 | } |
@@ -2741,7 +2741,7 @@ index 27f334966..dbc82599d 100644 | |||
2741 | return ErrInvalidLengthShim | 2741 | return ErrInvalidLengthShim |
2742 | } | 2742 | } |
2743 | if (iNdEx + skippy) > l { | 2743 | if (iNdEx + skippy) > l { |
2744 | @@ -4603,10 +4573,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | 2744 | @@ -4603,10 +4573,7 @@ func (m *CloseIORequest) Unmarshal(dAtA |
2745 | if err != nil { | 2745 | if err != nil { |
2746 | return err | 2746 | return err |
2747 | } | 2747 | } |
@@ -2753,7 +2753,7 @@ index 27f334966..dbc82599d 100644 | |||
2753 | return ErrInvalidLengthShim | 2753 | return ErrInvalidLengthShim |
2754 | } | 2754 | } |
2755 | if (iNdEx + skippy) > l { | 2755 | if (iNdEx + skippy) > l { |
2756 | @@ -4689,10 +4656,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA []byte) error { | 2756 | @@ -4689,10 +4656,7 @@ func (m *ListPidsRequest) Unmarshal(dAtA |
2757 | if err != nil { | 2757 | if err != nil { |
2758 | return err | 2758 | return err |
2759 | } | 2759 | } |
@@ -2765,7 +2765,7 @@ index 27f334966..dbc82599d 100644 | |||
2765 | return ErrInvalidLengthShim | 2765 | return ErrInvalidLengthShim |
2766 | } | 2766 | } |
2767 | if (iNdEx + skippy) > l { | 2767 | if (iNdEx + skippy) > l { |
2768 | @@ -4777,10 +4741,7 @@ func (m *ListPidsResponse) Unmarshal(dAtA []byte) error { | 2768 | @@ -4777,10 +4741,7 @@ func (m *ListPidsResponse) Unmarshal(dAt |
2769 | if err != nil { | 2769 | if err != nil { |
2770 | return err | 2770 | return err |
2771 | } | 2771 | } |
@@ -2777,7 +2777,7 @@ index 27f334966..dbc82599d 100644 | |||
2777 | return ErrInvalidLengthShim | 2777 | return ErrInvalidLengthShim |
2778 | } | 2778 | } |
2779 | if (iNdEx + skippy) > l { | 2779 | if (iNdEx + skippy) > l { |
2780 | @@ -4899,10 +4860,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | 2780 | @@ -4899,10 +4860,7 @@ func (m *CheckpointTaskRequest) Unmarsha |
2781 | if err != nil { | 2781 | if err != nil { |
2782 | return err | 2782 | return err |
2783 | } | 2783 | } |
@@ -2789,7 +2789,7 @@ index 27f334966..dbc82599d 100644 | |||
2789 | return ErrInvalidLengthShim | 2789 | return ErrInvalidLengthShim |
2790 | } | 2790 | } |
2791 | if (iNdEx + skippy) > l { | 2791 | if (iNdEx + skippy) > l { |
2792 | @@ -4972,10 +4930,7 @@ func (m *ShimInfoResponse) Unmarshal(dAtA []byte) error { | 2792 | @@ -4972,10 +4930,7 @@ func (m *ShimInfoResponse) Unmarshal(dAt |
2793 | if err != nil { | 2793 | if err != nil { |
2794 | return err | 2794 | return err |
2795 | } | 2795 | } |
@@ -2801,7 +2801,7 @@ index 27f334966..dbc82599d 100644 | |||
2801 | return ErrInvalidLengthShim | 2801 | return ErrInvalidLengthShim |
2802 | } | 2802 | } |
2803 | if (iNdEx + skippy) > l { | 2803 | if (iNdEx + skippy) > l { |
2804 | @@ -5062,10 +5017,7 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | 2804 | @@ -5062,10 +5017,7 @@ func (m *UpdateTaskRequest) Unmarshal(dA |
2805 | if err != nil { | 2805 | if err != nil { |
2806 | return err | 2806 | return err |
2807 | } | 2807 | } |
@@ -2813,7 +2813,7 @@ index 27f334966..dbc82599d 100644 | |||
2813 | return ErrInvalidLengthShim | 2813 | return ErrInvalidLengthShim |
2814 | } | 2814 | } |
2815 | if (iNdEx + skippy) > l { | 2815 | if (iNdEx + skippy) > l { |
2816 | @@ -5148,10 +5100,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | 2816 | @@ -5148,10 +5100,7 @@ func (m *StartRequest) Unmarshal(dAtA [] |
2817 | if err != nil { | 2817 | if err != nil { |
2818 | return err | 2818 | return err |
2819 | } | 2819 | } |
@@ -2825,7 +2825,7 @@ index 27f334966..dbc82599d 100644 | |||
2825 | return ErrInvalidLengthShim | 2825 | return ErrInvalidLengthShim |
2826 | } | 2826 | } |
2827 | if (iNdEx + skippy) > l { | 2827 | if (iNdEx + skippy) > l { |
2828 | @@ -5253,10 +5202,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | 2828 | @@ -5253,10 +5202,7 @@ func (m *StartResponse) Unmarshal(dAtA [ |
2829 | if err != nil { | 2829 | if err != nil { |
2830 | return err | 2830 | return err |
2831 | } | 2831 | } |
@@ -2837,7 +2837,7 @@ index 27f334966..dbc82599d 100644 | |||
2837 | return ErrInvalidLengthShim | 2837 | return ErrInvalidLengthShim |
2838 | } | 2838 | } |
2839 | if (iNdEx + skippy) > l { | 2839 | if (iNdEx + skippy) > l { |
2840 | @@ -5339,10 +5285,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | 2840 | @@ -5339,10 +5285,7 @@ func (m *WaitRequest) Unmarshal(dAtA []b |
2841 | if err != nil { | 2841 | if err != nil { |
2842 | return err | 2842 | return err |
2843 | } | 2843 | } |
@@ -2849,7 +2849,7 @@ index 27f334966..dbc82599d 100644 | |||
2849 | return ErrInvalidLengthShim | 2849 | return ErrInvalidLengthShim |
2850 | } | 2850 | } |
2851 | if (iNdEx + skippy) > l { | 2851 | if (iNdEx + skippy) > l { |
2852 | @@ -5445,10 +5388,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | 2852 | @@ -5445,10 +5388,7 @@ func (m *WaitResponse) Unmarshal(dAtA [] |
2853 | if err != nil { | 2853 | if err != nil { |
2854 | return err | 2854 | return err |
2855 | } | 2855 | } |
@@ -2861,11 +2861,11 @@ index 27f334966..dbc82599d 100644 | |||
2861 | return ErrInvalidLengthShim | 2861 | return ErrInvalidLengthShim |
2862 | } | 2862 | } |
2863 | if (iNdEx + skippy) > l { | 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 | 2864 | Index: git/src/import/runtime/v2/runc/options/oci.pb.go |
2865 | index f298452b6..c9c44742a 100644 | 2865 | =================================================================== |
2866 | --- a/src/import/runtime/v2/runc/options/oci.pb.go | 2866 | --- git.orig/src/import/runtime/v2/runc/options/oci.pb.go |
2867 | +++ b/src/import/runtime/v2/runc/options/oci.pb.go | 2867 | +++ git/src/import/runtime/v2/runc/options/oci.pb.go |
2868 | @@ -994,10 +994,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { | 2868 | @@ -994,10 +994,7 @@ func (m *Options) Unmarshal(dAtA []byte) |
2869 | if err != nil { | 2869 | if err != nil { |
2870 | return err | 2870 | return err |
2871 | } | 2871 | } |
@@ -2877,7 +2877,7 @@ index f298452b6..c9c44742a 100644 | |||
2877 | return ErrInvalidLengthOci | 2877 | return ErrInvalidLengthOci |
2878 | } | 2878 | } |
2879 | if (iNdEx + skippy) > l { | 2879 | if (iNdEx + skippy) > l { |
2880 | @@ -1276,10 +1273,7 @@ func (m *CheckpointOptions) Unmarshal(dAtA []byte) error { | 2880 | @@ -1276,10 +1273,7 @@ func (m *CheckpointOptions) Unmarshal(dA |
2881 | if err != nil { | 2881 | if err != nil { |
2882 | return err | 2882 | return err |
2883 | } | 2883 | } |
@@ -2889,7 +2889,7 @@ index f298452b6..c9c44742a 100644 | |||
2889 | return ErrInvalidLengthOci | 2889 | return ErrInvalidLengthOci |
2890 | } | 2890 | } |
2891 | if (iNdEx + skippy) > l { | 2891 | if (iNdEx + skippy) > l { |
2892 | @@ -1362,10 +1356,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { | 2892 | @@ -1362,10 +1356,7 @@ func (m *ProcessDetails) Unmarshal(dAtA |
2893 | if err != nil { | 2893 | if err != nil { |
2894 | return err | 2894 | return err |
2895 | } | 2895 | } |
@@ -2901,19 +2901,19 @@ index f298452b6..c9c44742a 100644 | |||
2901 | return ErrInvalidLengthOci | 2901 | return ErrInvalidLengthOci |
2902 | } | 2902 | } |
2903 | if (iNdEx + skippy) > l { | 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 | 2904 | Index: git/src/import/runtime/v2/task/shim.pb.go |
2905 | index 3cf11d8e3..6366f9c57 100644 | 2905 | =================================================================== |
2906 | --- a/src/import/runtime/v2/task/shim.pb.go | 2906 | --- git.orig/src/import/runtime/v2/task/shim.pb.go |
2907 | +++ b/src/import/runtime/v2/task/shim.pb.go | 2907 | +++ git/src/import/runtime/v2/task/shim.pb.go |
2908 | @@ -10,6 +10,7 @@ import ( | 2908 | @@ -10,6 +10,7 @@ import ( |
2909 | task "github.com/containerd/containerd/src/import/api/types/task" | 2909 | task "github.com/containerd/containerd/api/types/task" |
2910 | github_com_containerd_ttrpc "github.com/containerd/ttrpc" | 2910 | github_com_containerd_ttrpc "github.com/containerd/ttrpc" |
2911 | proto "github.com/gogo/protobuf/proto" | 2911 | proto "github.com/gogo/protobuf/proto" |
2912 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" | 2912 | + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" |
2913 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" | 2913 | github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" |
2914 | types1 "github.com/gogo/protobuf/types" | 2914 | types1 "github.com/gogo/protobuf/types" |
2915 | io "io" | 2915 | io "io" |
2916 | @@ -617,11 +618,12 @@ func (m *CheckpointTaskRequest) XXX_DiscardUnknown() { | 2916 | @@ -617,11 +618,12 @@ func (m *CheckpointTaskRequest) XXX_Disc |
2917 | var xxx_messageInfo_CheckpointTaskRequest proto.InternalMessageInfo | 2917 | var xxx_messageInfo_CheckpointTaskRequest proto.InternalMessageInfo |
2918 | 2918 | ||
2919 | type UpdateTaskRequest struct { | 2919 | type UpdateTaskRequest struct { |
@@ -3108,7 +3108,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3108 | } | 3108 | } |
3109 | 3109 | ||
3110 | func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) { | 3110 | func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) { |
3111 | @@ -2000,6 +2007,25 @@ func (m *UpdateTaskRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { | 3111 | @@ -2000,6 +2007,25 @@ func (m *UpdateTaskRequest) MarshalToSiz |
3112 | i -= len(m.XXX_unrecognized) | 3112 | i -= len(m.XXX_unrecognized) |
3113 | copy(dAtA[i:], m.XXX_unrecognized) | 3113 | copy(dAtA[i:], m.XXX_unrecognized) |
3114 | } | 3114 | } |
@@ -3134,7 +3134,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3134 | if m.Resources != nil { | 3134 | if m.Resources != nil { |
3135 | { | 3135 | { |
3136 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) | 3136 | size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) |
3137 | @@ -2826,6 +2852,14 @@ func (m *UpdateTaskRequest) Size() (n int) { | 3137 | @@ -2826,6 +2852,14 @@ func (m *UpdateTaskRequest) Size() (n in |
3138 | l = m.Resources.Size() | 3138 | l = m.Resources.Size() |
3139 | n += 1 + l + sovShim(uint64(l)) | 3139 | n += 1 + l + sovShim(uint64(l)) |
3140 | } | 3140 | } |
@@ -3149,7 +3149,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3149 | if m.XXX_unrecognized != nil { | 3149 | if m.XXX_unrecognized != nil { |
3150 | n += len(m.XXX_unrecognized) | 3150 | n += len(m.XXX_unrecognized) |
3151 | } | 3151 | } |
3152 | @@ -3237,9 +3271,20 @@ func (this *UpdateTaskRequest) String() string { | 3152 | @@ -3237,9 +3271,20 @@ func (this *UpdateTaskRequest) String() |
3153 | if this == nil { | 3153 | if this == nil { |
3154 | return "nil" | 3154 | return "nil" |
3155 | } | 3155 | } |
@@ -3170,7 +3170,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3170 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, | 3170 | `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, |
3171 | `}`, | 3171 | `}`, |
3172 | }, "") | 3172 | }, "") |
3173 | @@ -4019,10 +4064,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { | 3173 | @@ -4019,10 +4064,7 @@ func (m *CreateTaskRequest) Unmarshal(dA |
3174 | if err != nil { | 3174 | if err != nil { |
3175 | return err | 3175 | return err |
3176 | } | 3176 | } |
@@ -3182,7 +3182,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3182 | return ErrInvalidLengthShim | 3182 | return ErrInvalidLengthShim |
3183 | } | 3183 | } |
3184 | if (iNdEx + skippy) > l { | 3184 | if (iNdEx + skippy) > l { |
3185 | @@ -4092,10 +4134,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { | 3185 | @@ -4092,10 +4134,7 @@ func (m *CreateTaskResponse) Unmarshal(d |
3186 | if err != nil { | 3186 | if err != nil { |
3187 | return err | 3187 | return err |
3188 | } | 3188 | } |
@@ -3194,7 +3194,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3194 | return ErrInvalidLengthShim | 3194 | return ErrInvalidLengthShim |
3195 | } | 3195 | } |
3196 | if (iNdEx + skippy) > l { | 3196 | if (iNdEx + skippy) > l { |
3197 | @@ -4210,10 +4249,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { | 3197 | @@ -4210,10 +4249,7 @@ func (m *DeleteRequest) Unmarshal(dAtA [ |
3198 | if err != nil { | 3198 | if err != nil { |
3199 | return err | 3199 | return err |
3200 | } | 3200 | } |
@@ -3206,7 +3206,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3206 | return ErrInvalidLengthShim | 3206 | return ErrInvalidLengthShim |
3207 | } | 3207 | } |
3208 | if (iNdEx + skippy) > l { | 3208 | if (iNdEx + skippy) > l { |
3209 | @@ -4335,10 +4371,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { | 3209 | @@ -4335,10 +4371,7 @@ func (m *DeleteResponse) Unmarshal(dAtA |
3210 | if err != nil { | 3210 | if err != nil { |
3211 | return err | 3211 | return err |
3212 | } | 3212 | } |
@@ -3218,7 +3218,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3218 | return ErrInvalidLengthShim | 3218 | return ErrInvalidLengthShim |
3219 | } | 3219 | } |
3220 | if (iNdEx + skippy) > l { | 3220 | if (iNdEx + skippy) > l { |
3221 | @@ -4605,10 +4638,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { | 3221 | @@ -4605,10 +4638,7 @@ func (m *ExecProcessRequest) Unmarshal(d |
3222 | if err != nil { | 3222 | if err != nil { |
3223 | return err | 3223 | return err |
3224 | } | 3224 | } |
@@ -3230,7 +3230,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3230 | return ErrInvalidLengthShim | 3230 | return ErrInvalidLengthShim |
3231 | } | 3231 | } |
3232 | if (iNdEx + skippy) > l { | 3232 | if (iNdEx + skippy) > l { |
3233 | @@ -4659,10 +4689,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { | 3233 | @@ -4659,10 +4689,7 @@ func (m *ExecProcessResponse) Unmarshal( |
3234 | if err != nil { | 3234 | if err != nil { |
3235 | return err | 3235 | return err |
3236 | } | 3236 | } |
@@ -3242,7 +3242,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3242 | return ErrInvalidLengthShim | 3242 | return ErrInvalidLengthShim |
3243 | } | 3243 | } |
3244 | if (iNdEx + skippy) > l { | 3244 | if (iNdEx + skippy) > l { |
3245 | @@ -4815,10 +4842,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { | 3245 | @@ -4815,10 +4842,7 @@ func (m *ResizePtyRequest) Unmarshal(dAt |
3246 | if err != nil { | 3246 | if err != nil { |
3247 | return err | 3247 | return err |
3248 | } | 3248 | } |
@@ -3254,7 +3254,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3254 | return ErrInvalidLengthShim | 3254 | return ErrInvalidLengthShim |
3255 | } | 3255 | } |
3256 | if (iNdEx + skippy) > l { | 3256 | if (iNdEx + skippy) > l { |
3257 | @@ -4933,10 +4957,7 @@ func (m *StateRequest) Unmarshal(dAtA []byte) error { | 3257 | @@ -4933,10 +4957,7 @@ func (m *StateRequest) Unmarshal(dAtA [] |
3258 | if err != nil { | 3258 | if err != nil { |
3259 | return err | 3259 | return err |
3260 | } | 3260 | } |
@@ -3266,7 +3266,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3266 | return ErrInvalidLengthShim | 3266 | return ErrInvalidLengthShim |
3267 | } | 3267 | } |
3268 | if (iNdEx + skippy) > l { | 3268 | if (iNdEx + skippy) > l { |
3269 | @@ -5289,10 +5310,7 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { | 3269 | @@ -5289,10 +5310,7 @@ func (m *StateResponse) Unmarshal(dAtA [ |
3270 | if err != nil { | 3270 | if err != nil { |
3271 | return err | 3271 | return err |
3272 | } | 3272 | } |
@@ -3278,7 +3278,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3278 | return ErrInvalidLengthShim | 3278 | return ErrInvalidLengthShim |
3279 | } | 3279 | } |
3280 | if (iNdEx + skippy) > l { | 3280 | if (iNdEx + skippy) > l { |
3281 | @@ -5446,10 +5464,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { | 3281 | @@ -5446,10 +5464,7 @@ func (m *KillRequest) Unmarshal(dAtA []b |
3282 | if err != nil { | 3282 | if err != nil { |
3283 | return err | 3283 | return err |
3284 | } | 3284 | } |
@@ -3290,7 +3290,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3290 | return ErrInvalidLengthShim | 3290 | return ErrInvalidLengthShim |
3291 | } | 3291 | } |
3292 | if (iNdEx + skippy) > l { | 3292 | if (iNdEx + skippy) > l { |
3293 | @@ -5584,10 +5599,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { | 3293 | @@ -5584,10 +5599,7 @@ func (m *CloseIORequest) Unmarshal(dAtA |
3294 | if err != nil { | 3294 | if err != nil { |
3295 | return err | 3295 | return err |
3296 | } | 3296 | } |
@@ -3302,7 +3302,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3302 | return ErrInvalidLengthShim | 3302 | return ErrInvalidLengthShim |
3303 | } | 3303 | } |
3304 | if (iNdEx + skippy) > l { | 3304 | if (iNdEx + skippy) > l { |
3305 | @@ -5670,10 +5682,7 @@ func (m *PidsRequest) Unmarshal(dAtA []byte) error { | 3305 | @@ -5670,10 +5682,7 @@ func (m *PidsRequest) Unmarshal(dAtA []b |
3306 | if err != nil { | 3306 | if err != nil { |
3307 | return err | 3307 | return err |
3308 | } | 3308 | } |
@@ -3314,7 +3314,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3314 | return ErrInvalidLengthShim | 3314 | return ErrInvalidLengthShim |
3315 | } | 3315 | } |
3316 | if (iNdEx + skippy) > l { | 3316 | if (iNdEx + skippy) > l { |
3317 | @@ -5758,10 +5767,7 @@ func (m *PidsResponse) Unmarshal(dAtA []byte) error { | 3317 | @@ -5758,10 +5767,7 @@ func (m *PidsResponse) Unmarshal(dAtA [] |
3318 | if err != nil { | 3318 | if err != nil { |
3319 | return err | 3319 | return err |
3320 | } | 3320 | } |
@@ -3326,7 +3326,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3326 | return ErrInvalidLengthShim | 3326 | return ErrInvalidLengthShim |
3327 | } | 3327 | } |
3328 | if (iNdEx + skippy) > l { | 3328 | if (iNdEx + skippy) > l { |
3329 | @@ -5912,10 +5918,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { | 3329 | @@ -5912,10 +5918,7 @@ func (m *CheckpointTaskRequest) Unmarsha |
3330 | if err != nil { | 3330 | if err != nil { |
3331 | return err | 3331 | return err |
3332 | } | 3332 | } |
@@ -3338,7 +3338,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3338 | return ErrInvalidLengthShim | 3338 | return ErrInvalidLengthShim |
3339 | } | 3339 | } |
3340 | if (iNdEx + skippy) > l { | 3340 | if (iNdEx + skippy) > l { |
3341 | @@ -6028,16 +6031,140 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { | 3341 | @@ -6028,16 +6031,140 @@ func (m *UpdateTaskRequest) Unmarshal(dA |
3342 | return err | 3342 | return err |
3343 | } | 3343 | } |
3344 | iNdEx = postIndex | 3344 | iNdEx = postIndex |
@@ -3483,7 +3483,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3483 | return ErrInvalidLengthShim | 3483 | return ErrInvalidLengthShim |
3484 | } | 3484 | } |
3485 | if (iNdEx + skippy) > l { | 3485 | if (iNdEx + skippy) > l { |
3486 | @@ -6152,10 +6279,7 @@ func (m *StartRequest) Unmarshal(dAtA []byte) error { | 3486 | @@ -6152,10 +6279,7 @@ func (m *StartRequest) Unmarshal(dAtA [] |
3487 | if err != nil { | 3487 | if err != nil { |
3488 | return err | 3488 | return err |
3489 | } | 3489 | } |
@@ -3495,7 +3495,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3495 | return ErrInvalidLengthShim | 3495 | return ErrInvalidLengthShim |
3496 | } | 3496 | } |
3497 | if (iNdEx + skippy) > l { | 3497 | if (iNdEx + skippy) > l { |
3498 | @@ -6225,10 +6349,7 @@ func (m *StartResponse) Unmarshal(dAtA []byte) error { | 3498 | @@ -6225,10 +6349,7 @@ func (m *StartResponse) Unmarshal(dAtA [ |
3499 | if err != nil { | 3499 | if err != nil { |
3500 | return err | 3500 | return err |
3501 | } | 3501 | } |
@@ -3507,7 +3507,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3507 | return ErrInvalidLengthShim | 3507 | return ErrInvalidLengthShim |
3508 | } | 3508 | } |
3509 | if (iNdEx + skippy) > l { | 3509 | if (iNdEx + skippy) > l { |
3510 | @@ -6343,10 +6464,7 @@ func (m *WaitRequest) Unmarshal(dAtA []byte) error { | 3510 | @@ -6343,10 +6464,7 @@ func (m *WaitRequest) Unmarshal(dAtA []b |
3511 | if err != nil { | 3511 | if err != nil { |
3512 | return err | 3512 | return err |
3513 | } | 3513 | } |
@@ -3519,7 +3519,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3519 | return ErrInvalidLengthShim | 3519 | return ErrInvalidLengthShim |
3520 | } | 3520 | } |
3521 | if (iNdEx + skippy) > l { | 3521 | if (iNdEx + skippy) > l { |
3522 | @@ -6449,10 +6567,7 @@ func (m *WaitResponse) Unmarshal(dAtA []byte) error { | 3522 | @@ -6449,10 +6567,7 @@ func (m *WaitResponse) Unmarshal(dAtA [] |
3523 | if err != nil { | 3523 | if err != nil { |
3524 | return err | 3524 | return err |
3525 | } | 3525 | } |
@@ -3531,7 +3531,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3531 | return ErrInvalidLengthShim | 3531 | return ErrInvalidLengthShim |
3532 | } | 3532 | } |
3533 | if (iNdEx + skippy) > l { | 3533 | if (iNdEx + skippy) > l { |
3534 | @@ -6535,10 +6650,7 @@ func (m *StatsRequest) Unmarshal(dAtA []byte) error { | 3534 | @@ -6535,10 +6650,7 @@ func (m *StatsRequest) Unmarshal(dAtA [] |
3535 | if err != nil { | 3535 | if err != nil { |
3536 | return err | 3536 | return err |
3537 | } | 3537 | } |
@@ -3543,7 +3543,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3543 | return ErrInvalidLengthShim | 3543 | return ErrInvalidLengthShim |
3544 | } | 3544 | } |
3545 | if (iNdEx + skippy) > l { | 3545 | if (iNdEx + skippy) > l { |
3546 | @@ -6625,10 +6737,7 @@ func (m *StatsResponse) Unmarshal(dAtA []byte) error { | 3546 | @@ -6625,10 +6737,7 @@ func (m *StatsResponse) Unmarshal(dAtA [ |
3547 | if err != nil { | 3547 | if err != nil { |
3548 | return err | 3548 | return err |
3549 | } | 3549 | } |
@@ -3555,7 +3555,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3555 | return ErrInvalidLengthShim | 3555 | return ErrInvalidLengthShim |
3556 | } | 3556 | } |
3557 | if (iNdEx + skippy) > l { | 3557 | if (iNdEx + skippy) > l { |
3558 | @@ -6711,10 +6820,7 @@ func (m *ConnectRequest) Unmarshal(dAtA []byte) error { | 3558 | @@ -6711,10 +6820,7 @@ func (m *ConnectRequest) Unmarshal(dAtA |
3559 | if err != nil { | 3559 | if err != nil { |
3560 | return err | 3560 | return err |
3561 | } | 3561 | } |
@@ -3567,7 +3567,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3567 | return ErrInvalidLengthShim | 3567 | return ErrInvalidLengthShim |
3568 | } | 3568 | } |
3569 | if (iNdEx + skippy) > l { | 3569 | if (iNdEx + skippy) > l { |
3570 | @@ -6835,10 +6941,7 @@ func (m *ConnectResponse) Unmarshal(dAtA []byte) error { | 3570 | @@ -6835,10 +6941,7 @@ func (m *ConnectResponse) Unmarshal(dAtA |
3571 | if err != nil { | 3571 | if err != nil { |
3572 | return err | 3572 | return err |
3573 | } | 3573 | } |
@@ -3579,7 +3579,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3579 | return ErrInvalidLengthShim | 3579 | return ErrInvalidLengthShim |
3580 | } | 3580 | } |
3581 | if (iNdEx + skippy) > l { | 3581 | if (iNdEx + skippy) > l { |
3582 | @@ -6941,10 +7044,7 @@ func (m *ShutdownRequest) Unmarshal(dAtA []byte) error { | 3582 | @@ -6941,10 +7044,7 @@ func (m *ShutdownRequest) Unmarshal(dAtA |
3583 | if err != nil { | 3583 | if err != nil { |
3584 | return err | 3584 | return err |
3585 | } | 3585 | } |
@@ -3591,7 +3591,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3591 | return ErrInvalidLengthShim | 3591 | return ErrInvalidLengthShim |
3592 | } | 3592 | } |
3593 | if (iNdEx + skippy) > l { | 3593 | if (iNdEx + skippy) > l { |
3594 | @@ -7027,10 +7127,7 @@ func (m *PauseRequest) Unmarshal(dAtA []byte) error { | 3594 | @@ -7027,10 +7127,7 @@ func (m *PauseRequest) Unmarshal(dAtA [] |
3595 | if err != nil { | 3595 | if err != nil { |
3596 | return err | 3596 | return err |
3597 | } | 3597 | } |
@@ -3603,7 +3603,7 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3603 | return ErrInvalidLengthShim | 3603 | return ErrInvalidLengthShim |
3604 | } | 3604 | } |
3605 | if (iNdEx + skippy) > l { | 3605 | if (iNdEx + skippy) > l { |
3606 | @@ -7113,10 +7210,7 @@ func (m *ResumeRequest) Unmarshal(dAtA []byte) error { | 3606 | @@ -7113,10 +7210,7 @@ func (m *ResumeRequest) Unmarshal(dAtA [ |
3607 | if err != nil { | 3607 | if err != nil { |
3608 | return err | 3608 | return err |
3609 | } | 3609 | } |
@@ -3615,11 +3615,11 @@ index 3cf11d8e3..6366f9c57 100644 | |||
3615 | return ErrInvalidLengthShim | 3615 | return ErrInvalidLengthShim |
3616 | } | 3616 | } |
3617 | if (iNdEx + skippy) > l { | 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 | 3618 | Index: git/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go |
3619 | index 9a2374b56..fae67de4f 100644 | 3619 | =================================================================== |
3620 | --- a/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go | 3620 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go |
3621 | +++ b/src/import/vendor/github.com/gogo/protobuf/plugin/unmarshal/unmarshal.go | 3621 | +++ git/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 | 3622 | @@ -844,7 +844,7 @@ func (p *unmarshal) field(file *generato |
3623 | p.P(`return err`) | 3623 | p.P(`return err`) |
3624 | p.Out() | 3624 | p.Out() |
3625 | p.P(`}`) | 3625 | p.P(`}`) |
@@ -3628,7 +3628,7 @@ index 9a2374b56..fae67de4f 100644 | |||
3628 | p.In() | 3628 | p.In() |
3629 | p.P(`return ErrInvalidLength`, p.localName) | 3629 | p.P(`return ErrInvalidLength`, p.localName) |
3630 | p.Out() | 3630 | p.Out() |
3631 | @@ -1484,12 +1484,7 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) { | 3631 | @@ -1484,12 +1484,7 @@ func (p *unmarshal) Generate(file *gener |
3632 | p.P(`return err`) | 3632 | p.P(`return err`) |
3633 | p.Out() | 3633 | p.Out() |
3634 | p.P(`}`) | 3634 | p.P(`}`) |
@@ -3642,7 +3642,7 @@ index 9a2374b56..fae67de4f 100644 | |||
3642 | p.In() | 3642 | p.In() |
3643 | p.P(`return ErrInvalidLength`, p.localName) | 3643 | p.P(`return ErrInvalidLength`, p.localName) |
3644 | p.Out() | 3644 | p.Out() |
3645 | @@ -1512,12 +1507,7 @@ func (p *unmarshal) Generate(file *generator.FileDescriptor) { | 3645 | @@ -1512,12 +1507,7 @@ func (p *unmarshal) Generate(file *gener |
3646 | p.P(`return err`) | 3646 | p.P(`return err`) |
3647 | p.Out() | 3647 | p.Out() |
3648 | p.P(`}`) | 3648 | p.P(`}`) |
@@ -3656,11 +3656,11 @@ index 9a2374b56..fae67de4f 100644 | |||
3656 | p.In() | 3656 | p.In() |
3657 | p.P(`return ErrInvalidLength`, p.localName) | 3657 | p.P(`return ErrInvalidLength`, p.localName) |
3658 | p.Out() | 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 | 3659 | Index: git/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go |
3660 | index 1ce0be2fa..f85c0cc81 100644 | 3660 | =================================================================== |
3661 | --- a/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go | 3661 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go |
3662 | +++ b/src/import/vendor/github.com/gogo/protobuf/proto/text_parser.go | 3662 | +++ git/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) { | 3663 | @@ -318,7 +318,7 @@ func unescape(s string) (ch string, tail |
3664 | if i > utf8.MaxRune { | 3664 | if i > utf8.MaxRune { |
3665 | return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss) | 3665 | return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss) |
3666 | } | 3666 | } |
@@ -3669,11 +3669,11 @@ index 1ce0be2fa..f85c0cc81 100644 | |||
3669 | } | 3669 | } |
3670 | return "", "", fmt.Errorf(`unknown escape \%c`, r) | 3670 | return "", "", fmt.Errorf(`unknown escape \%c`, r) |
3671 | } | 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 | 3672 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go |
3673 | index 98e269d54..e3d4d9490 100644 | 3673 | =================================================================== |
3674 | --- a/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go | 3674 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go |
3675 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go | 3675 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/any.pb.go |
3676 | @@ -592,10 +592,7 @@ func (m *Any) Unmarshal(dAtA []byte) error { | 3676 | @@ -592,10 +592,7 @@ func (m *Any) Unmarshal(dAtA []byte) err |
3677 | if err != nil { | 3677 | if err != nil { |
3678 | return err | 3678 | return err |
3679 | } | 3679 | } |
@@ -3685,11 +3685,11 @@ index 98e269d54..e3d4d9490 100644 | |||
3685 | return ErrInvalidLengthAny | 3685 | return ErrInvalidLengthAny |
3686 | } | 3686 | } |
3687 | if (iNdEx + skippy) > l { | 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 | 3688 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go |
3689 | index 58bf4b53b..83e886920 100644 | 3689 | =================================================================== |
3690 | --- a/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go | 3690 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go |
3691 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go | 3691 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/api.pb.go |
3692 | @@ -1677,10 +1677,7 @@ func (m *Api) Unmarshal(dAtA []byte) error { | 3692 | @@ -1677,10 +1677,7 @@ func (m *Api) Unmarshal(dAtA []byte) err |
3693 | if err != nil { | 3693 | if err != nil { |
3694 | return err | 3694 | return err |
3695 | } | 3695 | } |
@@ -3701,7 +3701,7 @@ index 58bf4b53b..83e886920 100644 | |||
3701 | return ErrInvalidLengthApi | 3701 | return ErrInvalidLengthApi |
3702 | } | 3702 | } |
3703 | if (iNdEx + skippy) > l { | 3703 | if (iNdEx + skippy) > l { |
3704 | @@ -1920,10 +1917,7 @@ func (m *Method) Unmarshal(dAtA []byte) error { | 3704 | @@ -1920,10 +1917,7 @@ func (m *Method) Unmarshal(dAtA []byte) |
3705 | if err != nil { | 3705 | if err != nil { |
3706 | return err | 3706 | return err |
3707 | } | 3707 | } |
@@ -3713,7 +3713,7 @@ index 58bf4b53b..83e886920 100644 | |||
3713 | return ErrInvalidLengthApi | 3713 | return ErrInvalidLengthApi |
3714 | } | 3714 | } |
3715 | if (iNdEx + skippy) > l { | 3715 | if (iNdEx + skippy) > l { |
3716 | @@ -2038,10 +2032,7 @@ func (m *Mixin) Unmarshal(dAtA []byte) error { | 3716 | @@ -2038,10 +2032,7 @@ func (m *Mixin) Unmarshal(dAtA []byte) e |
3717 | if err != nil { | 3717 | if err != nil { |
3718 | return err | 3718 | return err |
3719 | } | 3719 | } |
@@ -3725,11 +3725,11 @@ index 58bf4b53b..83e886920 100644 | |||
3725 | return ErrInvalidLengthApi | 3725 | return ErrInvalidLengthApi |
3726 | } | 3726 | } |
3727 | if (iNdEx + skippy) > l { | 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 | 3728 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go |
3729 | index 3959f0669..4deafcb1c 100644 | 3729 | =================================================================== |
3730 | --- a/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go | 3730 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go |
3731 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go | 3731 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/duration.pb.go |
3732 | @@ -415,10 +415,7 @@ func (m *Duration) Unmarshal(dAtA []byte) error { | 3732 | @@ -415,10 +415,7 @@ func (m *Duration) Unmarshal(dAtA []byte |
3733 | if err != nil { | 3733 | if err != nil { |
3734 | return err | 3734 | return err |
3735 | } | 3735 | } |
@@ -3741,11 +3741,11 @@ index 3959f0669..4deafcb1c 100644 | |||
3741 | return ErrInvalidLengthDuration | 3741 | return ErrInvalidLengthDuration |
3742 | } | 3742 | } |
3743 | if (iNdEx + skippy) > l { | 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 | 3744 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go |
3745 | index 17e3aa558..9e94748b3 100644 | 3745 | =================================================================== |
3746 | --- a/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go | 3746 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go |
3747 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go | 3747 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/empty.pb.go |
3748 | @@ -360,10 +360,7 @@ func (m *Empty) Unmarshal(dAtA []byte) error { | 3748 | @@ -360,10 +360,7 @@ func (m *Empty) Unmarshal(dAtA []byte) e |
3749 | if err != nil { | 3749 | if err != nil { |
3750 | return err | 3750 | return err |
3751 | } | 3751 | } |
@@ -3757,11 +3757,11 @@ index 17e3aa558..9e94748b3 100644 | |||
3757 | return ErrInvalidLengthEmpty | 3757 | return ErrInvalidLengthEmpty |
3758 | } | 3758 | } |
3759 | if (iNdEx + skippy) > l { | 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 | 3760 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go |
3761 | index 7226b57f7..6ae346d92 100644 | 3761 | =================================================================== |
3762 | --- a/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go | 3762 | --- git.orig/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 | 3763 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/field_mask.pb.go |
3764 | @@ -636,10 +636,7 @@ func (m *FieldMask) Unmarshal(dAtA []byte) error { | 3764 | @@ -636,10 +636,7 @@ func (m *FieldMask) Unmarshal(dAtA []byt |
3765 | if err != nil { | 3765 | if err != nil { |
3766 | return err | 3766 | return err |
3767 | } | 3767 | } |
@@ -3773,11 +3773,11 @@ index 7226b57f7..6ae346d92 100644 | |||
3773 | return ErrInvalidLengthFieldMask | 3773 | return ErrInvalidLengthFieldMask |
3774 | } | 3774 | } |
3775 | if (iNdEx + skippy) > l { | 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 | 3776 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go |
3777 | index 61045ce10..8e6ce71b2 100644 | 3777 | =================================================================== |
3778 | --- a/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go | 3778 | --- git.orig/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 | 3779 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/source_context.pb.go |
3780 | @@ -422,10 +422,7 @@ func (m *SourceContext) Unmarshal(dAtA []byte) error { | 3780 | @@ -422,10 +422,7 @@ func (m *SourceContext) Unmarshal(dAtA [ |
3781 | if err != nil { | 3781 | if err != nil { |
3782 | return err | 3782 | return err |
3783 | } | 3783 | } |
@@ -3789,11 +3789,11 @@ index 61045ce10..8e6ce71b2 100644 | |||
3789 | return ErrInvalidLengthSourceContext | 3789 | return ErrInvalidLengthSourceContext |
3790 | } | 3790 | } |
3791 | if (iNdEx + skippy) > l { | 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 | 3792 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go |
3793 | index cea553eef..c0457312e 100644 | 3793 | =================================================================== |
3794 | --- a/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go | 3794 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go |
3795 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go | 3795 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/struct.pb.go |
3796 | @@ -1862,7 +1862,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error { | 3796 | @@ -1862,7 +1862,7 @@ func (m *Struct) Unmarshal(dAtA []byte) |
3797 | if err != nil { | 3797 | if err != nil { |
3798 | return err | 3798 | return err |
3799 | } | 3799 | } |
@@ -3802,7 +3802,7 @@ index cea553eef..c0457312e 100644 | |||
3802 | return ErrInvalidLengthStruct | 3802 | return ErrInvalidLengthStruct |
3803 | } | 3803 | } |
3804 | if (iNdEx + skippy) > postIndex { | 3804 | if (iNdEx + skippy) > postIndex { |
3805 | @@ -1879,10 +1879,7 @@ func (m *Struct) Unmarshal(dAtA []byte) error { | 3805 | @@ -1879,10 +1879,7 @@ func (m *Struct) Unmarshal(dAtA []byte) |
3806 | if err != nil { | 3806 | if err != nil { |
3807 | return err | 3807 | return err |
3808 | } | 3808 | } |
@@ -3814,7 +3814,7 @@ index cea553eef..c0457312e 100644 | |||
3814 | return ErrInvalidLengthStruct | 3814 | return ErrInvalidLengthStruct |
3815 | } | 3815 | } |
3816 | if (iNdEx + skippy) > l { | 3816 | if (iNdEx + skippy) > l { |
3817 | @@ -2087,10 +2084,7 @@ func (m *Value) Unmarshal(dAtA []byte) error { | 3817 | @@ -2087,10 +2084,7 @@ func (m *Value) Unmarshal(dAtA []byte) e |
3818 | if err != nil { | 3818 | if err != nil { |
3819 | return err | 3819 | return err |
3820 | } | 3820 | } |
@@ -3826,7 +3826,7 @@ index cea553eef..c0457312e 100644 | |||
3826 | return ErrInvalidLengthStruct | 3826 | return ErrInvalidLengthStruct |
3827 | } | 3827 | } |
3828 | if (iNdEx + skippy) > l { | 3828 | if (iNdEx + skippy) > l { |
3829 | @@ -2175,10 +2169,7 @@ func (m *ListValue) Unmarshal(dAtA []byte) error { | 3829 | @@ -2175,10 +2169,7 @@ func (m *ListValue) Unmarshal(dAtA []byt |
3830 | if err != nil { | 3830 | if err != nil { |
3831 | return err | 3831 | return err |
3832 | } | 3832 | } |
@@ -3838,11 +3838,11 @@ index cea553eef..c0457312e 100644 | |||
3838 | return ErrInvalidLengthStruct | 3838 | return ErrInvalidLengthStruct |
3839 | } | 3839 | } |
3840 | if (iNdEx + skippy) > l { | 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 | 3841 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go |
3842 | index b81875267..45db7b3bb 100644 | 3842 | =================================================================== |
3843 | --- a/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go | 3843 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go |
3844 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go | 3844 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/timestamp.pb.go |
3845 | @@ -437,10 +437,7 @@ func (m *Timestamp) Unmarshal(dAtA []byte) error { | 3845 | @@ -437,10 +437,7 @@ func (m *Timestamp) Unmarshal(dAtA []byt |
3846 | if err != nil { | 3846 | if err != nil { |
3847 | return err | 3847 | return err |
3848 | } | 3848 | } |
@@ -3854,11 +3854,11 @@ index b81875267..45db7b3bb 100644 | |||
3854 | return ErrInvalidLengthTimestamp | 3854 | return ErrInvalidLengthTimestamp |
3855 | } | 3855 | } |
3856 | if (iNdEx + skippy) > l { | 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 | 3857 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go |
3858 | index 13b7ec02f..791427bb2 100644 | 3858 | =================================================================== |
3859 | --- a/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go | 3859 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go |
3860 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go | 3860 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/type.pb.go |
3861 | @@ -2483,10 +2483,7 @@ func (m *Type) Unmarshal(dAtA []byte) error { | 3861 | @@ -2483,10 +2483,7 @@ func (m *Type) Unmarshal(dAtA []byte) er |
3862 | if err != nil { | 3862 | if err != nil { |
3863 | return err | 3863 | return err |
3864 | } | 3864 | } |
@@ -3870,7 +3870,7 @@ index 13b7ec02f..791427bb2 100644 | |||
3870 | return ErrInvalidLengthType | 3870 | return ErrInvalidLengthType |
3871 | } | 3871 | } |
3872 | if (iNdEx + skippy) > l { | 3872 | if (iNdEx + skippy) > l { |
3873 | @@ -2795,10 +2792,7 @@ func (m *Field) Unmarshal(dAtA []byte) error { | 3873 | @@ -2795,10 +2792,7 @@ func (m *Field) Unmarshal(dAtA []byte) e |
3874 | if err != nil { | 3874 | if err != nil { |
3875 | return err | 3875 | return err |
3876 | } | 3876 | } |
@@ -3882,7 +3882,7 @@ index 13b7ec02f..791427bb2 100644 | |||
3882 | return ErrInvalidLengthType | 3882 | return ErrInvalidLengthType |
3883 | } | 3883 | } |
3884 | if (iNdEx + skippy) > l { | 3884 | if (iNdEx + skippy) > l { |
3885 | @@ -3004,10 +2998,7 @@ func (m *Enum) Unmarshal(dAtA []byte) error { | 3885 | @@ -3004,10 +2998,7 @@ func (m *Enum) Unmarshal(dAtA []byte) er |
3886 | if err != nil { | 3886 | if err != nil { |
3887 | return err | 3887 | return err |
3888 | } | 3888 | } |
@@ -3894,7 +3894,7 @@ index 13b7ec02f..791427bb2 100644 | |||
3894 | return ErrInvalidLengthType | 3894 | return ErrInvalidLengthType |
3895 | } | 3895 | } |
3896 | if (iNdEx + skippy) > l { | 3896 | if (iNdEx + skippy) > l { |
3897 | @@ -3143,10 +3134,7 @@ func (m *EnumValue) Unmarshal(dAtA []byte) error { | 3897 | @@ -3143,10 +3134,7 @@ func (m *EnumValue) Unmarshal(dAtA []byt |
3898 | if err != nil { | 3898 | if err != nil { |
3899 | return err | 3899 | return err |
3900 | } | 3900 | } |
@@ -3906,7 +3906,7 @@ index 13b7ec02f..791427bb2 100644 | |||
3906 | return ErrInvalidLengthType | 3906 | return ErrInvalidLengthType |
3907 | } | 3907 | } |
3908 | if (iNdEx + skippy) > l { | 3908 | if (iNdEx + skippy) > l { |
3909 | @@ -3265,10 +3253,7 @@ func (m *Option) Unmarshal(dAtA []byte) error { | 3909 | @@ -3265,10 +3253,7 @@ func (m *Option) Unmarshal(dAtA []byte) |
3910 | if err != nil { | 3910 | if err != nil { |
3911 | return err | 3911 | return err |
3912 | } | 3912 | } |
@@ -3918,11 +3918,11 @@ index 13b7ec02f..791427bb2 100644 | |||
3918 | return ErrInvalidLengthType | 3918 | return ErrInvalidLengthType |
3919 | } | 3919 | } |
3920 | if (iNdEx + skippy) > l { | 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 | 3921 | Index: git/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go |
3922 | index 8f1edb57d..8d415420a 100644 | 3922 | =================================================================== |
3923 | --- a/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go | 3923 | --- git.orig/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go |
3924 | +++ b/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go | 3924 | +++ git/src/import/vendor/github.com/gogo/protobuf/types/wrappers.pb.go |
3925 | @@ -2020,10 +2020,7 @@ func (m *DoubleValue) Unmarshal(dAtA []byte) error { | 3925 | @@ -2020,10 +2020,7 @@ func (m *DoubleValue) Unmarshal(dAtA []b |
3926 | if err != nil { | 3926 | if err != nil { |
3927 | return err | 3927 | return err |
3928 | } | 3928 | } |
@@ -3934,7 +3934,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3934 | return ErrInvalidLengthWrappers | 3934 | return ErrInvalidLengthWrappers |
3935 | } | 3935 | } |
3936 | if (iNdEx + skippy) > l { | 3936 | if (iNdEx + skippy) > l { |
3937 | @@ -2085,10 +2082,7 @@ func (m *FloatValue) Unmarshal(dAtA []byte) error { | 3937 | @@ -2085,10 +2082,7 @@ func (m *FloatValue) Unmarshal(dAtA []by |
3938 | if err != nil { | 3938 | if err != nil { |
3939 | return err | 3939 | return err |
3940 | } | 3940 | } |
@@ -3946,7 +3946,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3946 | return ErrInvalidLengthWrappers | 3946 | return ErrInvalidLengthWrappers |
3947 | } | 3947 | } |
3948 | if (iNdEx + skippy) > l { | 3948 | if (iNdEx + skippy) > l { |
3949 | @@ -2158,10 +2152,7 @@ func (m *Int64Value) Unmarshal(dAtA []byte) error { | 3949 | @@ -2158,10 +2152,7 @@ func (m *Int64Value) Unmarshal(dAtA []by |
3950 | if err != nil { | 3950 | if err != nil { |
3951 | return err | 3951 | return err |
3952 | } | 3952 | } |
@@ -3958,7 +3958,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3958 | return ErrInvalidLengthWrappers | 3958 | return ErrInvalidLengthWrappers |
3959 | } | 3959 | } |
3960 | if (iNdEx + skippy) > l { | 3960 | if (iNdEx + skippy) > l { |
3961 | @@ -2231,10 +2222,7 @@ func (m *UInt64Value) Unmarshal(dAtA []byte) error { | 3961 | @@ -2231,10 +2222,7 @@ func (m *UInt64Value) Unmarshal(dAtA []b |
3962 | if err != nil { | 3962 | if err != nil { |
3963 | return err | 3963 | return err |
3964 | } | 3964 | } |
@@ -3970,7 +3970,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3970 | return ErrInvalidLengthWrappers | 3970 | return ErrInvalidLengthWrappers |
3971 | } | 3971 | } |
3972 | if (iNdEx + skippy) > l { | 3972 | if (iNdEx + skippy) > l { |
3973 | @@ -2304,10 +2292,7 @@ func (m *Int32Value) Unmarshal(dAtA []byte) error { | 3973 | @@ -2304,10 +2292,7 @@ func (m *Int32Value) Unmarshal(dAtA []by |
3974 | if err != nil { | 3974 | if err != nil { |
3975 | return err | 3975 | return err |
3976 | } | 3976 | } |
@@ -3982,7 +3982,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3982 | return ErrInvalidLengthWrappers | 3982 | return ErrInvalidLengthWrappers |
3983 | } | 3983 | } |
3984 | if (iNdEx + skippy) > l { | 3984 | if (iNdEx + skippy) > l { |
3985 | @@ -2377,10 +2362,7 @@ func (m *UInt32Value) Unmarshal(dAtA []byte) error { | 3985 | @@ -2377,10 +2362,7 @@ func (m *UInt32Value) Unmarshal(dAtA []b |
3986 | if err != nil { | 3986 | if err != nil { |
3987 | return err | 3987 | return err |
3988 | } | 3988 | } |
@@ -3994,7 +3994,7 @@ index 8f1edb57d..8d415420a 100644 | |||
3994 | return ErrInvalidLengthWrappers | 3994 | return ErrInvalidLengthWrappers |
3995 | } | 3995 | } |
3996 | if (iNdEx + skippy) > l { | 3996 | if (iNdEx + skippy) > l { |
3997 | @@ -2451,10 +2433,7 @@ func (m *BoolValue) Unmarshal(dAtA []byte) error { | 3997 | @@ -2451,10 +2433,7 @@ func (m *BoolValue) Unmarshal(dAtA []byt |
3998 | if err != nil { | 3998 | if err != nil { |
3999 | return err | 3999 | return err |
4000 | } | 4000 | } |
@@ -4006,7 +4006,7 @@ index 8f1edb57d..8d415420a 100644 | |||
4006 | return ErrInvalidLengthWrappers | 4006 | return ErrInvalidLengthWrappers |
4007 | } | 4007 | } |
4008 | if (iNdEx + skippy) > l { | 4008 | if (iNdEx + skippy) > l { |
4009 | @@ -2537,10 +2516,7 @@ func (m *StringValue) Unmarshal(dAtA []byte) error { | 4009 | @@ -2537,10 +2516,7 @@ func (m *StringValue) Unmarshal(dAtA []b |
4010 | if err != nil { | 4010 | if err != nil { |
4011 | return err | 4011 | return err |
4012 | } | 4012 | } |
@@ -4018,7 +4018,7 @@ index 8f1edb57d..8d415420a 100644 | |||
4018 | return ErrInvalidLengthWrappers | 4018 | return ErrInvalidLengthWrappers |
4019 | } | 4019 | } |
4020 | if (iNdEx + skippy) > l { | 4020 | if (iNdEx + skippy) > l { |
4021 | @@ -2625,10 +2601,7 @@ func (m *BytesValue) Unmarshal(dAtA []byte) error { | 4021 | @@ -2625,10 +2601,7 @@ func (m *BytesValue) Unmarshal(dAtA []by |
4022 | if err != nil { | 4022 | if err != nil { |
4023 | return err | 4023 | return err |
4024 | } | 4024 | } |
@@ -4030,6 +4030,3 @@ index 8f1edb57d..8d415420a 100644 | |||
4030 | return ErrInvalidLengthWrappers | 4030 | return ErrInvalidLengthWrappers |
4031 | } | 4031 | } |
4032 | if (iNdEx + skippy) > l { | 4032 | if (iNdEx + skippy) > l { |
4033 | -- | ||
4034 | 2.30.2 | ||
4035 | |||