agent: move the protocols to upper libs

move the protocols to upper libs thus it can
be shared between agent and other rust runtime.

Depends-on: github.com/kata-containers/tests#4306

Fixes: #3348

Signed-off-by: Fupan Li <fupan.lfp@antgroup.com>
This commit is contained in:
Fupan Li 2021-12-24 17:42:18 +08:00
parent 330e3dcc93
commit 615224e993
16 changed files with 3 additions and 6 deletions

2
src/agent/Cargo.lock generated
View File

@ -1104,8 +1104,6 @@ version = "0.1.0"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"protobuf", "protobuf",
"serde",
"serde_json",
"ttrpc", "ttrpc",
"ttrpc-codegen", "ttrpc-codegen",
] ]

View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
oci = { path = "../libs/oci" } oci = { path = "../libs/oci" }
rustjail = { path = "rustjail" } rustjail = { path = "rustjail" }
protocols = { path = "protocols" } protocols = { path = "../libs/protocols" }
lazy_static = "1.3.0" lazy_static = "1.3.0"
ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false } ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false }
protobuf = "=2.14.0" protobuf = "=2.14.0"
@ -66,7 +66,6 @@ tempfile = "3.1.0"
[workspace] [workspace]
members = [ members = [
"protocols",
"rustjail", "rustjail",
] ]

View File

@ -9,7 +9,7 @@ serde = "1.0.91"
serde_json = "1.0.39" serde_json = "1.0.39"
serde_derive = "1.0.91" serde_derive = "1.0.91"
oci = { path = "../../libs/oci" } oci = { path = "../../libs/oci" }
protocols = { path ="../protocols" } protocols = { path ="../../libs/protocols" }
caps = "0.5.0" caps = "0.5.0"
nix = "0.23.0" nix = "0.23.0"
scopeguard = "1.0.0" scopeguard = "1.0.0"

View File

@ -10,7 +10,7 @@ authors = ["The Kata Containers community <kata-dev@lists.katacontainers.io>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
protocols = { path = "../../agent/protocols", features = ["with-serde"] } protocols = { path = "../../libs/protocols", features = ["with-serde"] }
rustjail = { path = "../../agent/rustjail" } rustjail = { path = "../../agent/rustjail" }
oci = { path = "../../libs/oci" } oci = { path = "../../libs/oci" }