diff --git a/api/next.txtpb b/api/next.txtpb index fee2964..bff325a 100644 --- a/api/next.txtpb +++ b/api/next.txtpb @@ -72,7 +72,7 @@ file: { span: 16 span: 0 span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + leading_detached_comments: "\nCopyright The containerd Authors.\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" } location: { path: 2 @@ -115,8 +115,8 @@ file: { path: 2 path: 0 span: 23 - span: 8 - span: 59 + span: 4 + span: 55 } location: { path: 6 @@ -125,8 +125,8 @@ file: { path: 0 path: 1 span: 23 - span: 12 - span: 18 + span: 8 + span: 14 } location: { path: 6 @@ -135,8 +135,8 @@ file: { path: 0 path: 2 span: 23 - span: 19 - span: 32 + span: 15 + span: 28 } location: { path: 6 @@ -145,8 +145,8 @@ file: { path: 0 path: 3 span: 23 - span: 43 - span: 57 + span: 39 + span: 53 } location: { path: 4 @@ -169,19 +169,19 @@ file: { path: 0 path: 2 path: 0 + path: 5 span: 27 - span: 8 - span: 22 + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 0 - path: 5 span: 27 - span: 8 - span: 14 + span: 4 + span: 18 } location: { path: 4 @@ -190,8 +190,8 @@ file: { path: 0 path: 1 span: 27 - span: 15 - span: 17 + span: 11 + span: 13 } location: { path: 4 @@ -200,27 +200,27 @@ file: { path: 0 path: 3 span: 27 - span: 20 - span: 21 + span: 16 + span: 17 } location: { path: 4 path: 0 path: 2 path: 1 + path: 6 span: 28 - span: 8 - span: 37 + span: 4 + span: 22 } location: { path: 4 path: 0 path: 2 path: 1 - path: 6 span: 28 - span: 8 - span: 26 + span: 4 + span: 33 } location: { path: 4 @@ -229,8 +229,8 @@ file: { path: 1 path: 1 span: 28 - span: 27 - span: 32 + span: 23 + span: 28 } location: { path: 4 @@ -239,8 +239,8 @@ file: { path: 1 path: 3 span: 28 - span: 35 - span: 36 + span: 31 + span: 32 } location: { path: 4 @@ -263,19 +263,19 @@ file: { path: 1 path: 2 path: 0 + path: 5 span: 32 - span: 8 - span: 26 + span: 4 + span: 10 } location: { path: 4 path: 1 path: 2 path: 0 - path: 5 span: 32 - span: 8 - span: 14 + span: 4 + span: 22 } location: { path: 4 @@ -284,8 +284,8 @@ file: { path: 0 path: 1 span: 32 - span: 15 - span: 21 + span: 11 + span: 17 } location: { path: 4 @@ -294,8 +294,8 @@ file: { path: 0 path: 3 span: 32 - span: 24 - span: 25 + span: 20 + span: 21 } } syntax: "proto3" @@ -393,7 +393,7 @@ file: { span: 16 span: 0 span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + leading_detached_comments: "\nCopyright The containerd Authors.\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" } location: { path: 2 @@ -436,8 +436,8 @@ file: { path: 2 path: 0 span: 23 - span: 8 - span: 65 + span: 4 + span: 61 } location: { path: 6 @@ -446,8 +446,8 @@ file: { path: 0 path: 1 span: 23 - span: 12 - span: 20 + span: 8 + span: 16 } location: { path: 6 @@ -456,8 +456,8 @@ file: { path: 0 path: 2 span: 23 - span: 21 - span: 36 + span: 17 + span: 32 } location: { path: 6 @@ -466,8 +466,8 @@ file: { path: 0 path: 3 span: 23 - span: 47 - span: 63 + span: 43 + span: 59 } location: { path: 6 @@ -475,8 +475,8 @@ file: { path: 2 path: 1 span: 24 - span: 8 - span: 62 + span: 4 + span: 58 } location: { path: 6 @@ -485,8 +485,8 @@ file: { path: 1 path: 1 span: 24 - span: 12 - span: 19 + span: 8 + span: 15 } location: { path: 6 @@ -495,8 +495,8 @@ file: { path: 1 path: 2 span: 24 - span: 20 - span: 34 + span: 16 + span: 30 } location: { path: 6 @@ -505,8 +505,8 @@ file: { path: 1 path: 3 span: 24 - span: 45 - span: 60 + span: 41 + span: 56 } location: { path: 4 @@ -529,19 +529,19 @@ file: { path: 0 path: 2 path: 0 + path: 5 span: 28 - span: 8 - span: 36 + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 0 - path: 5 span: 28 - span: 8 - span: 14 + span: 4 + span: 32 } location: { path: 4 @@ -550,8 +550,8 @@ file: { path: 0 path: 1 span: 28 + span: 11 span: 15 - span: 19 } location: { path: 4 @@ -560,28 +560,28 @@ file: { path: 0 path: 3 span: 28 - span: 34 - span: 35 + span: 30 + span: 31 } location: { path: 4 path: 0 path: 2 path: 1 + path: 5 span: 29 - span: 8 - span: 36 - trailing_comments: " in-VM path or virtiofs tag\n" + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 1 - path: 5 span: 29 - span: 8 - span: 14 + span: 4 + span: 32 + trailing_comments: " in-VM path or virtiofs tag" } location: { path: 4 @@ -590,8 +590,8 @@ file: { path: 1 path: 1 span: 29 - span: 15 - span: 21 + span: 11 + span: 17 } location: { path: 4 @@ -600,28 +600,28 @@ file: { path: 1 path: 3 span: 29 - span: 34 - span: 35 + span: 30 + span: 31 } location: { path: 4 path: 0 path: 2 path: 2 + path: 5 span: 30 - span: 8 - span: 36 - trailing_comments: " in-VM path\n" + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 2 - path: 5 span: 30 - span: 8 - span: 14 + span: 4 + span: 32 + trailing_comments: " in-VM path" } location: { path: 4 @@ -630,8 +630,8 @@ file: { path: 2 path: 1 span: 30 - span: 15 - span: 21 + span: 11 + span: 17 } location: { path: 4 @@ -640,27 +640,27 @@ file: { path: 2 path: 3 span: 30 - span: 34 - span: 35 + span: 30 + span: 31 } location: { path: 4 path: 0 path: 2 path: 3 + path: 4 span: 31 - span: 8 - span: 36 + span: 4 + span: 12 } location: { path: 4 path: 0 path: 2 path: 3 - path: 4 span: 31 - span: 8 - span: 16 + span: 4 + span: 32 } location: { path: 4 @@ -669,8 +669,8 @@ file: { path: 3 path: 5 span: 31 - span: 17 - span: 23 + span: 13 + span: 19 } location: { path: 4 @@ -679,8 +679,8 @@ file: { path: 3 path: 1 span: 31 - span: 24 - span: 31 + span: 20 + span: 27 } location: { path: 4 @@ -689,8 +689,8 @@ file: { path: 3 path: 3 span: 31 - span: 34 - span: 35 + span: 30 + span: 31 } location: { path: 4 @@ -713,19 +713,19 @@ file: { path: 1 path: 2 path: 0 + path: 4 span: 35 - span: 8 - span: 38 + span: 4 + span: 12 } location: { path: 4 path: 1 path: 2 path: 0 - path: 4 span: 35 - span: 8 - span: 16 + span: 4 + span: 34 } location: { path: 4 @@ -734,8 +734,8 @@ file: { path: 0 path: 6 span: 35 - span: 17 - span: 26 + span: 13 + span: 22 } location: { path: 4 @@ -744,8 +744,8 @@ file: { path: 0 path: 1 span: 35 - span: 27 - span: 33 + span: 23 + span: 29 } location: { path: 4 @@ -754,8 +754,8 @@ file: { path: 0 path: 3 span: 35 - span: 36 - span: 37 + span: 32 + span: 33 } location: { path: 4 @@ -793,20 +793,20 @@ file: { path: 3 path: 2 path: 0 + path: 5 span: 41 - span: 8 - span: 26 - trailing_comments: " in-VM path\n" + span: 4 + span: 10 } location: { path: 4 path: 3 path: 2 path: 0 - path: 5 span: 41 - span: 8 - span: 14 + span: 4 + span: 22 + trailing_comments: " in-VM path" } location: { path: 4 @@ -815,8 +815,8 @@ file: { path: 0 path: 1 span: 41 - span: 15 - span: 21 + span: 11 + span: 17 } location: { path: 4 @@ -825,8 +825,8 @@ file: { path: 0 path: 3 span: 41 - span: 24 - span: 25 + span: 20 + span: 21 } location: { path: 4 @@ -946,7 +946,7 @@ file: { span: 16 span: 0 span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + leading_detached_comments: "\nCopyright The containerd Authors.\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" } location: { path: 2 @@ -997,8 +997,8 @@ file: { path: 2 path: 0 span: 43 - span: 8 - span: 62 + span: 4 + span: 58 leading_comments: " Bind sets up the socket forward entries on the VM side. The VM creates\n UNIX listener sockets at the paths given in socket_path. This RPC returns\n only after all socket files have been created, so the caller can safely\n proceed with container creation (crun bind mounts).\n" } location: { @@ -1008,8 +1008,8 @@ file: { path: 0 path: 1 span: 43 + span: 8 span: 12 - span: 16 } location: { path: 6 @@ -1018,8 +1018,8 @@ file: { path: 0 path: 2 span: 43 - span: 17 - span: 28 + span: 13 + span: 24 } location: { path: 6 @@ -1028,8 +1028,8 @@ file: { path: 0 path: 3 span: 43 - span: 39 - span: 60 + span: 35 + span: 56 } location: { path: 6 @@ -1037,8 +1037,8 @@ file: { path: 2 path: 1 span: 51 - span: 8 - span: 73 + span: 4 + span: 69 leading_comments: " Accept is a bidirectional streaming RPC used to coordinate forwarded\n connections. The VM sends a ConnectRequest when a container process\n connects to a forwarded socket; the host resolves the forward_id,\n dials the target host socket, opens a vsock stream, and sends back a\n ConnectResult reporting success or failure. On failure the VM closes\n the pending container connection immediately.\n" } location: { @@ -1048,8 +1048,8 @@ file: { path: 1 path: 1 span: 51 - span: 12 - span: 18 + span: 8 + span: 14 } location: { path: 6 @@ -1058,8 +1058,8 @@ file: { path: 1 path: 5 span: 51 - span: 19 - span: 25 + span: 15 + span: 21 } location: { path: 6 @@ -1068,8 +1068,8 @@ file: { path: 1 path: 2 span: 51 - span: 26 - span: 39 + span: 22 + span: 35 } location: { path: 6 @@ -1078,8 +1078,8 @@ file: { path: 1 path: 6 span: 51 - span: 50 - span: 56 + span: 46 + span: 52 } location: { path: 6 @@ -1088,8 +1088,8 @@ file: { path: 1 path: 3 span: 51 - span: 57 - span: 71 + span: 53 + span: 67 } location: { path: 4 @@ -1113,19 +1113,19 @@ file: { path: 0 path: 2 path: 0 + path: 4 span: 57 - span: 8 - span: 36 + span: 4 + span: 12 } location: { path: 4 path: 0 path: 2 path: 0 - path: 4 span: 57 - span: 8 - span: 16 + span: 4 + span: 32 } location: { path: 4 @@ -1134,8 +1134,8 @@ file: { path: 0 path: 6 span: 57 - span: 17 - span: 23 + span: 13 + span: 19 } location: { path: 4 @@ -1144,8 +1144,8 @@ file: { path: 0 path: 1 span: 57 - span: 24 - span: 31 + span: 20 + span: 27 } location: { path: 4 @@ -1154,8 +1154,8 @@ file: { path: 0 path: 3 span: 57 - span: 34 - span: 35 + span: 30 + span: 31 } location: { path: 4 @@ -1179,20 +1179,20 @@ file: { path: 1 path: 2 path: 0 + path: 5 span: 64 - span: 8 - span: 30 - leading_comments: " Opaque identifier for this forward. Each side uses it to resolve the local\n socket path from its own configuration.\n" + span: 4 + span: 10 } location: { path: 4 path: 1 path: 2 path: 0 - path: 5 span: 64 - span: 8 - span: 14 + span: 4 + span: 26 + leading_comments: " Opaque identifier for this forward. Each side uses it to resolve the local\n socket path from its own configuration.\n" } location: { path: 4 @@ -1201,8 +1201,8 @@ file: { path: 0 path: 1 span: 64 - span: 15 - span: 25 + span: 11 + span: 21 } location: { path: 4 @@ -1211,28 +1211,28 @@ file: { path: 0 path: 3 span: 64 - span: 28 - span: 29 + span: 24 + span: 25 } location: { path: 4 path: 1 path: 2 path: 1 + path: 5 span: 69 - span: 8 - span: 31 - leading_comments: " Path of the UNIX listener socket in the VM's root filesystem (e.g.\n /run/socketfwd/{forward_id}.sock). vminitd creates the socket here;\n the shim has already rewritten the uds mount to a bind mount from\n this path to the user-specified destination inside the container.\n" + span: 4 + span: 10 } location: { path: 4 path: 1 path: 2 path: 1 - path: 5 span: 69 - span: 8 - span: 14 + span: 4 + span: 27 + leading_comments: " Path of the UNIX listener socket in the VM's root filesystem (e.g.\n /run/socketfwd/{forward_id}.sock). vminitd creates the socket here;\n the shim has already rewritten the uds mount to a bind mount from\n this path to the user-specified destination inside the container.\n" } location: { path: 4 @@ -1241,8 +1241,8 @@ file: { path: 1 path: 1 span: 69 - span: 15 - span: 26 + span: 11 + span: 22 } location: { path: 4 @@ -1251,8 +1251,8 @@ file: { path: 1 path: 3 span: 69 - span: 29 - span: 30 + span: 25 + span: 26 } location: { path: 4 @@ -1276,20 +1276,20 @@ file: { path: 2 path: 2 path: 0 + path: 5 span: 77 - span: 8 - span: 29 - leading_comments: " ID of the vsock stream. The host must open a stream with this ID after\n a successful ConnectResult so that the relay can start.\n" + span: 4 + span: 10 } location: { path: 4 path: 2 path: 2 path: 0 - path: 5 span: 77 - span: 8 - span: 14 + span: 4 + span: 25 + leading_comments: " ID of the vsock stream. The host must open a stream with this ID after\n a successful ConnectResult so that the relay can start.\n" } location: { path: 4 @@ -1298,8 +1298,8 @@ file: { path: 0 path: 1 span: 77 - span: 15 - span: 24 + span: 11 + span: 20 } location: { path: 4 @@ -1308,28 +1308,28 @@ file: { path: 0 path: 3 span: 77 - span: 27 - span: 28 + span: 23 + span: 24 } location: { path: 4 path: 2 path: 2 path: 1 + path: 5 span: 81 - span: 8 - span: 30 - leading_comments: " Identifier of the socket forward entry. The host uses this to resolve the\n target host socket path from its own configuration rather than trusting a\n path supplied by the VM.\n" + span: 4 + span: 10 } location: { path: 4 path: 2 path: 2 path: 1 - path: 5 span: 81 - span: 8 - span: 14 + span: 4 + span: 26 + leading_comments: " Identifier of the socket forward entry. The host uses this to resolve the\n target host socket path from its own configuration rather than trusting a\n path supplied by the VM.\n" } location: { path: 4 @@ -1338,8 +1338,8 @@ file: { path: 1 path: 1 span: 81 - span: 15 - span: 25 + span: 11 + span: 21 } location: { path: 4 @@ -1348,8 +1348,8 @@ file: { path: 1 path: 3 span: 81 - span: 28 - span: 29 + span: 24 + span: 25 } location: { path: 4 @@ -1373,20 +1373,20 @@ file: { path: 3 path: 2 path: 0 + path: 5 span: 90 - span: 8 - span: 29 - leading_comments: " ID of the vsock stream from the corresponding ConnectRequest.\n" + span: 4 + span: 10 } location: { path: 4 path: 3 path: 2 path: 0 - path: 5 span: 90 - span: 8 - span: 14 + span: 4 + span: 25 + leading_comments: " ID of the vsock stream from the corresponding ConnectRequest.\n" } location: { path: 4 @@ -1395,8 +1395,8 @@ file: { path: 0 path: 1 span: 90 - span: 15 - span: 24 + span: 11 + span: 20 } location: { path: 4 @@ -1405,28 +1405,28 @@ file: { path: 0 path: 3 span: 90 - span: 27 - span: 28 + span: 23 + span: 24 } location: { path: 4 path: 3 path: 2 path: 1 + path: 5 span: 93 - span: 8 - span: 25 - leading_comments: " Non-empty if the host failed to dial the target socket. The VM closes\n the pending connection when error is set.\n" + span: 4 + span: 10 } location: { path: 4 path: 3 path: 2 path: 1 - path: 5 span: 93 - span: 8 - span: 14 + span: 4 + span: 21 + leading_comments: " Non-empty if the host failed to dial the target socket. The VM closes\n the pending connection when error is set.\n" } location: { path: 4 @@ -1435,8 +1435,8 @@ file: { path: 1 path: 1 span: 93 - span: 15 - span: 20 + span: 11 + span: 16 } location: { path: 4 @@ -1445,8 +1445,8 @@ file: { path: 1 path: 3 span: 93 - span: 23 - span: 24 + span: 19 + span: 20 } } syntax: "proto3" @@ -1499,7 +1499,7 @@ file: { span: 16 span: 0 span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + leading_detached_comments: "\nCopyright The containerd Authors.\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" } location: { path: 2 @@ -1549,8 +1549,8 @@ file: { path: 2 path: 0 span: 25 - span: 8 - span: 63 + span: 4 + span: 59 } location: { path: 6 @@ -1559,8 +1559,8 @@ file: { path: 0 path: 1 span: 25 + span: 8 span: 12 - span: 16 } location: { path: 6 @@ -1569,8 +1569,8 @@ file: { path: 0 path: 2 span: 25 - span: 17 - span: 38 + span: 13 + span: 34 } location: { path: 6 @@ -1579,8 +1579,8 @@ file: { path: 0 path: 3 span: 25 - span: 49 - span: 61 + span: 45 + span: 57 } location: { path: 4 @@ -1603,19 +1603,19 @@ file: { path: 0 path: 2 path: 0 + path: 5 span: 29 - span: 8 - span: 27 + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 0 - path: 5 span: 29 - span: 8 - span: 14 + span: 4 + span: 23 } location: { path: 4 @@ -1624,8 +1624,8 @@ file: { path: 0 path: 1 span: 29 - span: 15 - span: 22 + span: 11 + span: 18 } location: { path: 4 @@ -1634,27 +1634,27 @@ file: { path: 0 path: 3 span: 29 - span: 25 - span: 26 + span: 21 + span: 22 } location: { path: 4 path: 0 path: 2 path: 1 + path: 5 span: 30 - span: 8 - span: 34 + span: 4 + span: 10 } location: { path: 4 path: 0 path: 2 path: 1 - path: 5 span: 30 - span: 8 - span: 14 + span: 4 + span: 30 } location: { path: 4 @@ -1663,8 +1663,8 @@ file: { path: 1 path: 1 span: 30 - span: 15 - span: 29 + span: 11 + span: 25 } location: { path: 4 @@ -1673,8 +1673,8 @@ file: { path: 1 path: 3 span: 30 - span: 32 - span: 33 + span: 28 + span: 29 } } syntax: "proto3" @@ -1712,7 +1712,7 @@ file: { span: 16 span: 0 span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" + leading_detached_comments: "\nCopyright The containerd Authors.\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\nhttp://www.apache.org/licenses/LICENSE-2.0\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" } location: { path: 2 @@ -1769,8 +1769,8 @@ file: { path: 2 path: 0 span: 27 - span: 8 - span: 85 + span: 4 + span: 81 leading_comments: " Stream events\n" } location: { @@ -1780,8 +1780,8 @@ file: { path: 0 path: 1 span: 27 - span: 12 - span: 18 + span: 8 + span: 14 } location: { path: 6 @@ -1790,8 +1790,8 @@ file: { path: 0 path: 2 span: 27 - span: 19 - span: 40 + span: 15 + span: 36 } location: { path: 6 @@ -1800,8 +1800,8 @@ file: { path: 0 path: 6 span: 27 - span: 51 - span: 57 + span: 47 + span: 53 } location: { path: 6 @@ -1810,530 +1810,8 @@ file: { path: 0 path: 3 span: 27 - span: 58 - span: 83 - } - } - syntax: "proto3" - buf_extension: { - is_import: false - is_syntax_unspecified: false - } -} -file: { - name: "proto/nerdbox/types/transfer/v1/datastream.proto" - package: "containerd.nerdbox.types.transfer.v1" - message_type: { - name: "ReadStream" - field: { - name: "stream" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stream" - } - field: { - name: "media_type" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "mediaType" - } - } - message_type: { - name: "WriteStream" - field: { - name: "stream" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "stream" - } - field: { - name: "media_type" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "mediaType" - } - } - options: { - go_package: "github.com/containerd/nerdbox/api/types/transfer/v1;transfer" - } - source_code_info: { - location: { - span: 16 - span: 0 - span: 36 - span: 1 - } - location: { - path: 12 - span: 16 - span: 0 - span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" - } - location: { - path: 2 - span: 18 - span: 0 - span: 45 - } - location: { - path: 8 - span: 20 - span: 0 - span: 83 - } - location: { - path: 8 - path: 11 - span: 20 - span: 0 - span: 83 - } - location: { - path: 4 - path: 0 - span: 25 - span: 0 - span: 28 - span: 1 - leading_comments: " ReadStream carries data from the client to the server (import\n direction). The client sends data through the stream and the\n server reads it.\n" - } - location: { - path: 4 - path: 0 - path: 1 - span: 25 - span: 8 - span: 18 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - span: 26 - span: 8 - span: 26 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 5 - span: 26 - span: 8 - span: 14 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 1 - span: 26 - span: 15 - span: 21 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 3 - span: 26 - span: 24 - span: 25 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - span: 27 - span: 8 - span: 30 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 5 - span: 27 - span: 8 - span: 14 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 1 - span: 27 - span: 15 - span: 25 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 3 - span: 27 - span: 28 - span: 29 - } - location: { - path: 4 - path: 1 - span: 33 - span: 0 - span: 36 - span: 1 - leading_comments: " WriteStream carries data from the server to the client (export\n direction). The server writes data into the stream and the\n client receives it.\n" - } - location: { - path: 4 - path: 1 - path: 1 - span: 33 - span: 8 - span: 19 - } - location: { - path: 4 - path: 1 - path: 2 - path: 0 - span: 34 - span: 8 - span: 26 - } - location: { - path: 4 - path: 1 - path: 2 - path: 0 - path: 5 - span: 34 - span: 8 - span: 14 - } - location: { - path: 4 - path: 1 - path: 2 - path: 0 - path: 1 - span: 34 - span: 15 - span: 21 - } - location: { - path: 4 - path: 1 - path: 2 - path: 0 - path: 3 - span: 34 - span: 24 - span: 25 - } - location: { - path: 4 - path: 1 - path: 2 - path: 1 - span: 35 - span: 8 - span: 30 - } - location: { - path: 4 - path: 1 - path: 2 - path: 1 - path: 5 - span: 35 - span: 8 - span: 14 - } - location: { - path: 4 - path: 1 - path: 2 - path: 1 - path: 1 - span: 35 - span: 15 - span: 25 - } - location: { - path: 4 - path: 1 - path: 2 - path: 1 - path: 3 - span: 35 - span: 28 - span: 29 - } - } - syntax: "proto3" - buf_extension: { - is_import: false - is_syntax_unspecified: false - } -} -file: { - name: "proto/nerdbox/types/transfer/v1/filesystem.proto" - package: "containerd.nerdbox.types.transfer.v1" - message_type: { - name: "ContainerFilesystem" - field: { - name: "container_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "containerId" - } - field: { - name: "path" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "path" - } - field: { - name: "no_walk" - number: 3 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "noWalk" - } - field: { - name: "preserve_ownership" - number: 4 - label: LABEL_OPTIONAL - type: TYPE_BOOL - json_name: "preserveOwnership" - } - } - options: { - go_package: "github.com/containerd/nerdbox/api/types/transfer/v1;transfer" - } - source_code_info: { - location: { - span: 16 - span: 0 - span: 38 - span: 1 - } - location: { - path: 12 - span: 16 - span: 0 - span: 18 - leading_detached_comments: "\nCopyright The containerd Authors.\n\nLicensed under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an \"AS IS\" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.\n" - } - location: { - path: 2 - span: 18 - span: 0 - span: 45 - } - location: { - path: 8 - span: 20 - span: 0 - span: 83 - } - location: { - path: 8 - path: 11 - span: 20 - span: 0 - span: 83 - } - location: { - path: 4 - path: 0 - span: 25 - span: 0 - span: 38 - span: 1 - leading_comments: " ContainerFilesystem represents a path within a running container's\n filesystem. It acts as either a source or destination in a transfer\n operation, identifying the container and path for archive operations.\n" - } - location: { - path: 4 - path: 0 - path: 1 - span: 25 - span: 8 - span: 27 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - span: 26 - span: 8 - span: 32 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 5 - span: 26 - span: 8 - span: 14 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 1 - span: 26 - span: 15 - span: 27 - } - location: { - path: 4 - path: 0 - path: 2 - path: 0 - path: 3 - span: 26 - span: 30 - span: 31 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - span: 27 - span: 8 - span: 24 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 5 - span: 27 - span: 8 - span: 14 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 1 - span: 27 - span: 15 - span: 19 - } - location: { - path: 4 - path: 0 - path: 2 - path: 1 - path: 3 - span: 27 - span: 22 - span: 23 - } - location: { - path: 4 - path: 0 - path: 2 - path: 2 - span: 32 - span: 8 - span: 25 - leading_comments: " When true and path is a directory, return only the directory entry\n itself without walking into its contents. This is useful for\n stat-like operations where only the directory's metadata is needed.\n" - } - location: { - path: 4 - path: 0 - path: 2 - path: 2 - path: 5 - span: 32 - span: 8 - span: 12 - } - location: { - path: 4 - path: 0 - path: 2 - path: 2 - path: 1 - span: 32 - span: 13 - span: 20 - } - location: { - path: 4 - path: 0 - path: 2 - path: 2 - path: 3 - span: 32 - span: 23 - span: 24 - } - location: { - path: 4 - path: 0 - path: 2 - path: 3 - span: 37 - span: 8 - span: 36 - leading_comments: " When true, preserve the UID/GID from tar headers when extracting\n files. When false, extracted files are owned by the extracting\n process.\n" - } - location: { - path: 4 - path: 0 - path: 2 - path: 3 - path: 5 - span: 37 - span: 8 - span: 12 - } - location: { - path: 4 - path: 0 - path: 2 - path: 3 - path: 1 - span: 37 - span: 13 - span: 31 - } - location: { - path: 4 - path: 0 - path: 2 - path: 3 - path: 3 - span: 37 - span: 34 - span: 35 + span: 54 + span: 79 } } syntax: "proto3" diff --git a/api/proto/nerdbox/types/transfer/v1/datastream.proto b/api/proto/nerdbox/types/transfer/v1/datastream.proto deleted file mode 100644 index b6ae804..0000000 --- a/api/proto/nerdbox/types/transfer/v1/datastream.proto +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -syntax = "proto3"; - -package containerd.nerdbox.types.transfer.v1; - -option go_package = "github.com/containerd/nerdbox/api/types/transfer/v1;transfer"; - -// ReadStream carries data from the client to the server (import -// direction). The client sends data through the stream and the -// server reads it. -message ReadStream { - string stream = 1; - string media_type = 2; -} - -// WriteStream carries data from the server to the client (export -// direction). The server writes data into the stream and the -// client receives it. -message WriteStream { - string stream = 1; - string media_type = 2; -} diff --git a/api/proto/nerdbox/types/transfer/v1/filesystem.proto b/api/proto/nerdbox/types/transfer/v1/filesystem.proto deleted file mode 100644 index 695a12b..0000000 --- a/api/proto/nerdbox/types/transfer/v1/filesystem.proto +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright The containerd Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -syntax = "proto3"; - -package containerd.nerdbox.types.transfer.v1; - -option go_package = "github.com/containerd/nerdbox/api/types/transfer/v1;transfer"; - -// ContainerFilesystem represents a path within a running container's -// filesystem. It acts as either a source or destination in a transfer -// operation, identifying the container and path for archive operations. -message ContainerFilesystem { - string container_id = 1; - string path = 2; - - // When true and path is a directory, return only the directory entry - // itself without walking into its contents. This is useful for - // stat-like operations where only the directory's metadata is needed. - bool no_walk = 3; - - // When true, preserve the UID/GID from tar headers when extracting - // files. When false, extracted files are owned by the extracting - // process. - bool preserve_ownership = 4; -} diff --git a/api/services/bundle/v1/bundle.pb.go b/api/services/bundle/v1/bundle.pb.go index 41775ab..22ecf3d 100644 --- a/api/services/bundle/v1/bundle.pb.go +++ b/api/services/bundle/v1/bundle.pb.go @@ -1,12 +1,9 @@ // //Copyright The containerd Authors. -// //Licensed under the Apache License, Version 2.0 (the "License"); //you may not use this file except in compliance with the License. //You may obtain a copy of the License at -// //http://www.apache.org/licenses/LICENSE-2.0 -// //Unless required by applicable law or agreed to in writing, software //distributed under the License is distributed on an "AS IS" BASIS, //WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/api/services/mount/v1/mount.pb.go b/api/services/mount/v1/mount.pb.go index a7ba0bb..5297d80 100644 --- a/api/services/mount/v1/mount.pb.go +++ b/api/services/mount/v1/mount.pb.go @@ -1,12 +1,9 @@ // //Copyright The containerd Authors. -// //Licensed under the Apache License, Version 2.0 (the "License"); //you may not use this file except in compliance with the License. //You may obtain a copy of the License at -// //http://www.apache.org/licenses/LICENSE-2.0 -// //Unless required by applicable law or agreed to in writing, software //distributed under the License is distributed on an "AS IS" BASIS, //WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/api/services/socketforward/v1/socketforward.pb.go b/api/services/socketforward/v1/socketforward.pb.go index 5a9fc66..0fb7748 100644 --- a/api/services/socketforward/v1/socketforward.pb.go +++ b/api/services/socketforward/v1/socketforward.pb.go @@ -1,12 +1,9 @@ // //Copyright The containerd Authors. -// //Licensed under the Apache License, Version 2.0 (the "License"); //you may not use this file except in compliance with the License. //You may obtain a copy of the License at -// //http://www.apache.org/licenses/LICENSE-2.0 -// //Unless required by applicable law or agreed to in writing, software //distributed under the License is distributed on an "AS IS" BASIS, //WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/api/services/system/v1/info.pb.go b/api/services/system/v1/info.pb.go index e7035ee..c2ea2c9 100644 --- a/api/services/system/v1/info.pb.go +++ b/api/services/system/v1/info.pb.go @@ -1,12 +1,9 @@ // //Copyright The containerd Authors. -// //Licensed under the Apache License, Version 2.0 (the "License"); //you may not use this file except in compliance with the License. //You may obtain a copy of the License at -// //http://www.apache.org/licenses/LICENSE-2.0 -// //Unless required by applicable law or agreed to in writing, software //distributed under the License is distributed on an "AS IS" BASIS, //WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/api/services/vmevents/v1/events.pb.go b/api/services/vmevents/v1/events.pb.go index 9ab054a..a4e5d1c 100644 --- a/api/services/vmevents/v1/events.pb.go +++ b/api/services/vmevents/v1/events.pb.go @@ -1,12 +1,9 @@ // //Copyright The containerd Authors. -// //Licensed under the Apache License, Version 2.0 (the "License"); //you may not use this file except in compliance with the License. //You may obtain a copy of the License at -// //http://www.apache.org/licenses/LICENSE-2.0 -// //Unless required by applicable law or agreed to in writing, software //distributed under the License is distributed on an "AS IS" BASIS, //WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. diff --git a/api/types/transfer/v1/datastream.pb.go b/api/types/transfer/v1/datastream.pb.go deleted file mode 100644 index 425fec5..0000000 --- a/api/types/transfer/v1/datastream.pb.go +++ /dev/null @@ -1,252 +0,0 @@ -// -//Copyright The containerd Authors. -// -//Licensed under the Apache License, Version 2.0 (the "License"); -//you may not use this file except in compliance with the License. -//You may obtain a copy of the License at -// -//http://www.apache.org/licenses/LICENSE-2.0 -// -//Unless required by applicable law or agreed to in writing, software -//distributed under the License is distributed on an "AS IS" BASIS, -//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -//See the License for the specific language governing permissions and -//limitations under the License. - -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.1 -// protoc (unknown) -// source: proto/nerdbox/types/transfer/v1/datastream.proto - -package transfer - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// ReadStream carries data from the client to the server (import -// direction). The client sends data through the stream and the -// server reads it. -type ReadStream struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Stream string `protobuf:"bytes,1,opt,name=stream,proto3" json:"stream,omitempty"` - MediaType string `protobuf:"bytes,2,opt,name=media_type,json=mediaType,proto3" json:"media_type,omitempty"` -} - -func (x *ReadStream) Reset() { - *x = ReadStream{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ReadStream) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ReadStream) ProtoMessage() {} - -func (x *ReadStream) ProtoReflect() protoreflect.Message { - mi := &file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ReadStream.ProtoReflect.Descriptor instead. -func (*ReadStream) Descriptor() ([]byte, []int) { - return file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescGZIP(), []int{0} -} - -func (x *ReadStream) GetStream() string { - if x != nil { - return x.Stream - } - return "" -} - -func (x *ReadStream) GetMediaType() string { - if x != nil { - return x.MediaType - } - return "" -} - -// WriteStream carries data from the server to the client (export -// direction). The server writes data into the stream and the -// client receives it. -type WriteStream struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Stream string `protobuf:"bytes,1,opt,name=stream,proto3" json:"stream,omitempty"` - MediaType string `protobuf:"bytes,2,opt,name=media_type,json=mediaType,proto3" json:"media_type,omitempty"` -} - -func (x *WriteStream) Reset() { - *x = WriteStream{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *WriteStream) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*WriteStream) ProtoMessage() {} - -func (x *WriteStream) ProtoReflect() protoreflect.Message { - mi := &file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use WriteStream.ProtoReflect.Descriptor instead. -func (*WriteStream) Descriptor() ([]byte, []int) { - return file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescGZIP(), []int{1} -} - -func (x *WriteStream) GetStream() string { - if x != nil { - return x.Stream - } - return "" -} - -func (x *WriteStream) GetMediaType() string { - if x != nil { - return x.MediaType - } - return "" -} - -var File_proto_nerdbox_types_transfer_v1_datastream_proto protoreflect.FileDescriptor - -var file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDesc = []byte{ - 0x0a, 0x30, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2f, 0x76, - 0x31, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x24, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x6e, - 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x22, 0x43, 0x0a, 0x0a, 0x52, 0x65, 0x61, 0x64, - 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1d, - 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x22, 0x44, 0x0a, - 0x0b, 0x57, 0x72, 0x69, 0x74, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, - 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, - 0x72, 0x65, 0x61, 0x6d, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x54, - 0x79, 0x70, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, - 0x64, 0x62, 0x6f, 0x78, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x66, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescOnce sync.Once - file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescData = file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDesc -) - -func file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescGZIP() []byte { - file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescOnce.Do(func() { - file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescData) - }) - return file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDescData -} - -var file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_proto_nerdbox_types_transfer_v1_datastream_proto_goTypes = []interface{}{ - (*ReadStream)(nil), // 0: containerd.nerdbox.types.transfer.v1.ReadStream - (*WriteStream)(nil), // 1: containerd.nerdbox.types.transfer.v1.WriteStream -} -var file_proto_nerdbox_types_transfer_v1_datastream_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_proto_nerdbox_types_transfer_v1_datastream_proto_init() } -func file_proto_nerdbox_types_transfer_v1_datastream_proto_init() { - if File_proto_nerdbox_types_transfer_v1_datastream_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ReadStream); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WriteStream); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDesc, - NumEnums: 0, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_proto_nerdbox_types_transfer_v1_datastream_proto_goTypes, - DependencyIndexes: file_proto_nerdbox_types_transfer_v1_datastream_proto_depIdxs, - MessageInfos: file_proto_nerdbox_types_transfer_v1_datastream_proto_msgTypes, - }.Build() - File_proto_nerdbox_types_transfer_v1_datastream_proto = out.File - file_proto_nerdbox_types_transfer_v1_datastream_proto_rawDesc = nil - file_proto_nerdbox_types_transfer_v1_datastream_proto_goTypes = nil - file_proto_nerdbox_types_transfer_v1_datastream_proto_depIdxs = nil -} diff --git a/api/types/transfer/v1/filesystem.pb.go b/api/types/transfer/v1/filesystem.pb.go deleted file mode 100644 index d42342b..0000000 --- a/api/types/transfer/v1/filesystem.pb.go +++ /dev/null @@ -1,204 +0,0 @@ -// -//Copyright The containerd Authors. -// -//Licensed under the Apache License, Version 2.0 (the "License"); -//you may not use this file except in compliance with the License. -//You may obtain a copy of the License at -// -//http://www.apache.org/licenses/LICENSE-2.0 -// -//Unless required by applicable law or agreed to in writing, software -//distributed under the License is distributed on an "AS IS" BASIS, -//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -//See the License for the specific language governing permissions and -//limitations under the License. - -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.28.1 -// protoc (unknown) -// source: proto/nerdbox/types/transfer/v1/filesystem.proto - -package transfer - -import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// ContainerFilesystem represents a path within a running container's -// filesystem. It acts as either a source or destination in a transfer -// operation, identifying the container and path for archive operations. -type ContainerFilesystem struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - Path string `protobuf:"bytes,2,opt,name=path,proto3" json:"path,omitempty"` - // When true and path is a directory, return only the directory entry - // itself without walking into its contents. This is useful for - // stat-like operations where only the directory's metadata is needed. - NoWalk bool `protobuf:"varint,3,opt,name=no_walk,json=noWalk,proto3" json:"no_walk,omitempty"` - // When true, preserve the UID/GID from tar headers when extracting - // files. When false, extracted files are owned by the extracting - // process. - PreserveOwnership bool `protobuf:"varint,4,opt,name=preserve_ownership,json=preserveOwnership,proto3" json:"preserve_ownership,omitempty"` -} - -func (x *ContainerFilesystem) Reset() { - *x = ContainerFilesystem{} - if protoimpl.UnsafeEnabled { - mi := &file_proto_nerdbox_types_transfer_v1_filesystem_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ContainerFilesystem) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ContainerFilesystem) ProtoMessage() {} - -func (x *ContainerFilesystem) ProtoReflect() protoreflect.Message { - mi := &file_proto_nerdbox_types_transfer_v1_filesystem_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ContainerFilesystem.ProtoReflect.Descriptor instead. -func (*ContainerFilesystem) Descriptor() ([]byte, []int) { - return file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescGZIP(), []int{0} -} - -func (x *ContainerFilesystem) GetContainerID() string { - if x != nil { - return x.ContainerID - } - return "" -} - -func (x *ContainerFilesystem) GetPath() string { - if x != nil { - return x.Path - } - return "" -} - -func (x *ContainerFilesystem) GetNoWalk() bool { - if x != nil { - return x.NoWalk - } - return false -} - -func (x *ContainerFilesystem) GetPreserveOwnership() bool { - if x != nil { - return x.PreserveOwnership - } - return false -} - -var File_proto_nerdbox_types_transfer_v1_filesystem_proto protoreflect.FileDescriptor - -var file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDesc = []byte{ - 0x0a, 0x30, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2f, - 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2f, 0x76, - 0x31, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x24, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x6e, - 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x66, 0x65, 0x72, 0x2e, 0x76, 0x31, 0x22, 0x94, 0x01, 0x0a, 0x13, 0x43, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x46, 0x69, 0x6c, 0x65, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, - 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x5f, 0x77, 0x61, - 0x6c, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x6e, 0x6f, 0x57, 0x61, 0x6c, 0x6b, - 0x12, 0x2d, 0x0a, 0x12, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x6f, 0x77, 0x6e, - 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x70, 0x72, - 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x42, - 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, - 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x6e, 0x65, 0x72, 0x64, 0x62, 0x6f, 0x78, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x66, 0x65, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescOnce sync.Once - file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescData = file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDesc -) - -func file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescGZIP() []byte { - file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescOnce.Do(func() { - file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescData) - }) - return file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDescData -} - -var file_proto_nerdbox_types_transfer_v1_filesystem_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_proto_nerdbox_types_transfer_v1_filesystem_proto_goTypes = []interface{}{ - (*ContainerFilesystem)(nil), // 0: containerd.nerdbox.types.transfer.v1.ContainerFilesystem -} -var file_proto_nerdbox_types_transfer_v1_filesystem_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name -} - -func init() { file_proto_nerdbox_types_transfer_v1_filesystem_proto_init() } -func file_proto_nerdbox_types_transfer_v1_filesystem_proto_init() { - if File_proto_nerdbox_types_transfer_v1_filesystem_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_proto_nerdbox_types_transfer_v1_filesystem_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ContainerFilesystem); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDesc, - NumEnums: 0, - NumMessages: 1, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_proto_nerdbox_types_transfer_v1_filesystem_proto_goTypes, - DependencyIndexes: file_proto_nerdbox_types_transfer_v1_filesystem_proto_depIdxs, - MessageInfos: file_proto_nerdbox_types_transfer_v1_filesystem_proto_msgTypes, - }.Build() - File_proto_nerdbox_types_transfer_v1_filesystem_proto = out.File - file_proto_nerdbox_types_transfer_v1_filesystem_proto_rawDesc = nil - file_proto_nerdbox_types_transfer_v1_filesystem_proto_goTypes = nil - file_proto_nerdbox_types_transfer_v1_filesystem_proto_depIdxs = nil -} diff --git a/internal/transfer/containerfs.go b/internal/transfer/containerfs.go index 06ff3bf..8cc3371 100644 --- a/internal/transfer/containerfs.go +++ b/internal/transfer/containerfs.go @@ -33,7 +33,7 @@ import ( const mediaTypeTar = "application/x-tar" // NewContainerFSTransferrer returns a Transferrer that handles -// ContainerFilesystem + ReadStream/WriteStream transfer pairs. +// ContainerPath + ReadStream/WriteStream transfer pairs. func NewContainerFSTransferrer(bundleDir string) ctransfer.Transferrer { return &containerFSTransferrer{bundleDir: bundleDir} } @@ -44,8 +44,8 @@ type containerFSTransferrer struct { func (t *containerFSTransferrer) Transfer(ctx context.Context, src, dst any, opts ...ctransfer.Opt) error { switch s := src.(type) { - case *ContainerFilesystem: - // Copy-from: ContainerFilesystem -> WriteStream + case *ContainerPath: + // Copy-from: ContainerPath -> WriteStream d, ok := dst.(*WriteStream) if !ok { return errdefs.ErrNotImplemented @@ -56,8 +56,8 @@ func (t *containerFSTransferrer) Transfer(ctx context.Context, src, dst any, opt return writePath(rootfs, s.Path, w, d.MediaType, s.NoWalk) case *ReadStream: - // Copy-to: ReadStream -> ContainerFilesystem - d, ok := dst.(*ContainerFilesystem) + // Copy-to: ReadStream -> ContainerPath + d, ok := dst.(*ContainerPath) if !ok { return errdefs.ErrNotImplemented } diff --git a/internal/transfer/types.go b/internal/transfer/types.go index d3291a6..aae9731 100644 --- a/internal/transfer/types.go +++ b/internal/transfer/types.go @@ -21,33 +21,32 @@ import ( "context" "io" + transferpb "github.com/containerd/containerd/api/types/transfer" "github.com/containerd/containerd/v2/core/streaming" tplugins "github.com/containerd/containerd/v2/core/transfer/plugins" tstreaming "github.com/containerd/containerd/v2/core/transfer/streaming" "github.com/containerd/typeurl/v2" - - transferpb "github.com/containerd/nerdbox/api/types/transfer/v1" ) func init() { - tplugins.Register(&transferpb.ContainerFilesystem{}, ContainerFilesystem{}) + tplugins.Register(&transferpb.ContainerPath{}, ContainerPath{}) tplugins.Register(&transferpb.ReadStream{}, ReadStream{}) tplugins.Register(&transferpb.WriteStream{}, WriteStream{}) } -// ContainerFilesystem represents a path within a running container's +// ContainerPath represents a path within a running container's // filesystem. It acts as either a source or destination in a transfer // operation, identifying the container and path for archive operations. -type ContainerFilesystem struct { +type ContainerPath struct { ContainerID string Path string NoWalk bool PreserveOwnership bool } -// MarshalAny marshals the ContainerFilesystem to a typeurl.Any. -func (cf *ContainerFilesystem) MarshalAny(ctx context.Context, sm streaming.StreamCreator) (typeurl.Any, error) { - return typeurl.MarshalAny(&transferpb.ContainerFilesystem{ +// MarshalAny marshals the ContainerPath to a typeurl.Any. +func (cf *ContainerPath) MarshalAny(ctx context.Context, sm streaming.StreamCreator) (typeurl.Any, error) { + return typeurl.MarshalAny(&transferpb.ContainerPath{ ContainerID: cf.ContainerID, Path: cf.Path, NoWalk: cf.NoWalk, @@ -55,9 +54,9 @@ func (cf *ContainerFilesystem) MarshalAny(ctx context.Context, sm streaming.Stre }) } -// UnmarshalAny unmarshals a ContainerFilesystem from a typeurl.Any. -func (cf *ContainerFilesystem) UnmarshalAny(ctx context.Context, sg streaming.StreamGetter, a typeurl.Any) error { - var p transferpb.ContainerFilesystem +// UnmarshalAny unmarshals a ContainerPath from a typeurl.Any. +func (cf *ContainerPath) UnmarshalAny(ctx context.Context, sg streaming.StreamGetter, a typeurl.Any) error { + var p transferpb.ContainerPath if err := typeurl.UnmarshalTo(a, &p); err != nil { return err }