From 330e3dcc93c7e5e874e049cd0ecf8fc1c30f2028 Mon Sep 17 00:00:00 2001 From: Fupan Li Date: Fri, 24 Dec 2021 17:37:47 +0800 Subject: [PATCH 1/2] agent: move the oci crate to upper libs Move the oci crate to upper libs thus it can be shared between agent and other rust runtimes. Fixes: #3348 Signed-off-by: Fupan Li --- src/agent/Cargo.toml | 3 +-- src/agent/rustjail/Cargo.toml | 2 +- src/{agent => libs}/oci/Cargo.toml | 0 src/{agent => libs}/oci/src/lib.rs | 0 src/{agent => libs}/oci/src/serialize.rs | 0 src/tools/agent-ctl/Cargo.toml | 2 +- 6 files changed, 3 insertions(+), 4 deletions(-) rename src/{agent => libs}/oci/Cargo.toml (100%) rename src/{agent => libs}/oci/src/lib.rs (100%) rename src/{agent => libs}/oci/src/serialize.rs (100%) diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 492666023..b39b487a2 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Kata Containers community "] edition = "2018" [dependencies] -oci = { path = "oci" } +oci = { path = "../libs/oci" } rustjail = { path = "rustjail" } protocols = { path = "protocols" } lazy_static = "1.3.0" @@ -66,7 +66,6 @@ tempfile = "3.1.0" [workspace] members = [ - "oci", "protocols", "rustjail", ] diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml index 715152572..62e85ecfa 100644 --- a/src/agent/rustjail/Cargo.toml +++ b/src/agent/rustjail/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" serde = "1.0.91" serde_json = "1.0.39" serde_derive = "1.0.91" -oci = { path = "../oci" } +oci = { path = "../../libs/oci" } protocols = { path ="../protocols" } caps = "0.5.0" nix = "0.23.0" diff --git a/src/agent/oci/Cargo.toml b/src/libs/oci/Cargo.toml similarity index 100% rename from src/agent/oci/Cargo.toml rename to src/libs/oci/Cargo.toml diff --git a/src/agent/oci/src/lib.rs b/src/libs/oci/src/lib.rs similarity index 100% rename from src/agent/oci/src/lib.rs rename to src/libs/oci/src/lib.rs diff --git a/src/agent/oci/src/serialize.rs b/src/libs/oci/src/serialize.rs similarity index 100% rename from src/agent/oci/src/serialize.rs rename to src/libs/oci/src/serialize.rs diff --git a/src/tools/agent-ctl/Cargo.toml b/src/tools/agent-ctl/Cargo.toml index 8fc30dbb8..303db2161 100644 --- a/src/tools/agent-ctl/Cargo.toml +++ b/src/tools/agent-ctl/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] protocols = { path = "../../agent/protocols", features = ["with-serde"] } rustjail = { path = "../../agent/rustjail" } -oci = { path = "../../agent/oci" } +oci = { path = "../../libs/oci" } clap = "2.33.0" lazy_static = "1.4.0" From 615224e9939a0e3e6313e23f3534b327a66e737d Mon Sep 17 00:00:00 2001 From: Fupan Li Date: Fri, 24 Dec 2021 17:42:18 +0800 Subject: [PATCH 2/2] 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 --- src/agent/Cargo.lock | 2 -- src/agent/Cargo.toml | 3 +-- src/agent/rustjail/Cargo.toml | 2 +- src/{agent => libs}/protocols/Cargo.toml | 0 src/{agent => libs}/protocols/build.rs | 0 src/{agent => libs}/protocols/hack/update-generated-proto.sh | 0 src/{agent => libs}/protocols/protos/agent.proto | 0 .../protocols/protos/gogo/protobuf/gogoproto/gogo.proto | 0 .../protocols/protos/google/protobuf/descriptor.proto | 0 .../protocols/protos/google/protobuf/empty.proto | 0 .../protocols/protos/google/protobuf/wrappers.proto | 0 src/{agent => libs}/protocols/protos/health.proto | 0 src/{agent => libs}/protocols/protos/oci.proto | 0 src/{agent => libs}/protocols/protos/types.proto | 0 src/{agent => libs}/protocols/src/lib.rs | 0 src/tools/agent-ctl/Cargo.toml | 2 +- 16 files changed, 3 insertions(+), 6 deletions(-) rename src/{agent => libs}/protocols/Cargo.toml (100%) rename src/{agent => libs}/protocols/build.rs (100%) rename src/{agent => libs}/protocols/hack/update-generated-proto.sh (100%) rename src/{agent => libs}/protocols/protos/agent.proto (100%) rename src/{agent => libs}/protocols/protos/gogo/protobuf/gogoproto/gogo.proto (100%) rename src/{agent => libs}/protocols/protos/google/protobuf/descriptor.proto (100%) rename src/{agent => libs}/protocols/protos/google/protobuf/empty.proto (100%) rename src/{agent => libs}/protocols/protos/google/protobuf/wrappers.proto (100%) rename src/{agent => libs}/protocols/protos/health.proto (100%) rename src/{agent => libs}/protocols/protos/oci.proto (100%) rename src/{agent => libs}/protocols/protos/types.proto (100%) rename src/{agent => libs}/protocols/src/lib.rs (100%) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 6c2215d66..2ca62774c 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1104,8 +1104,6 @@ version = "0.1.0" dependencies = [ "async-trait", "protobuf", - "serde", - "serde_json", "ttrpc", "ttrpc-codegen", ] diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index b39b487a2..9a79263ac 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] oci = { path = "../libs/oci" } rustjail = { path = "rustjail" } -protocols = { path = "protocols" } +protocols = { path = "../libs/protocols" } lazy_static = "1.3.0" ttrpc = { version = "0.5.0", features = ["async", "protobuf-codec"], default-features = false } protobuf = "=2.14.0" @@ -66,7 +66,6 @@ tempfile = "3.1.0" [workspace] members = [ - "protocols", "rustjail", ] diff --git a/src/agent/rustjail/Cargo.toml b/src/agent/rustjail/Cargo.toml index 62e85ecfa..9e0624649 100644 --- a/src/agent/rustjail/Cargo.toml +++ b/src/agent/rustjail/Cargo.toml @@ -9,7 +9,7 @@ serde = "1.0.91" serde_json = "1.0.39" serde_derive = "1.0.91" oci = { path = "../../libs/oci" } -protocols = { path ="../protocols" } +protocols = { path ="../../libs/protocols" } caps = "0.5.0" nix = "0.23.0" scopeguard = "1.0.0" diff --git a/src/agent/protocols/Cargo.toml b/src/libs/protocols/Cargo.toml similarity index 100% rename from src/agent/protocols/Cargo.toml rename to src/libs/protocols/Cargo.toml diff --git a/src/agent/protocols/build.rs b/src/libs/protocols/build.rs similarity index 100% rename from src/agent/protocols/build.rs rename to src/libs/protocols/build.rs diff --git a/src/agent/protocols/hack/update-generated-proto.sh b/src/libs/protocols/hack/update-generated-proto.sh similarity index 100% rename from src/agent/protocols/hack/update-generated-proto.sh rename to src/libs/protocols/hack/update-generated-proto.sh diff --git a/src/agent/protocols/protos/agent.proto b/src/libs/protocols/protos/agent.proto similarity index 100% rename from src/agent/protocols/protos/agent.proto rename to src/libs/protocols/protos/agent.proto diff --git a/src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto b/src/libs/protocols/protos/gogo/protobuf/gogoproto/gogo.proto similarity index 100% rename from src/agent/protocols/protos/gogo/protobuf/gogoproto/gogo.proto rename to src/libs/protocols/protos/gogo/protobuf/gogoproto/gogo.proto diff --git a/src/agent/protocols/protos/google/protobuf/descriptor.proto b/src/libs/protocols/protos/google/protobuf/descriptor.proto similarity index 100% rename from src/agent/protocols/protos/google/protobuf/descriptor.proto rename to src/libs/protocols/protos/google/protobuf/descriptor.proto diff --git a/src/agent/protocols/protos/google/protobuf/empty.proto b/src/libs/protocols/protos/google/protobuf/empty.proto similarity index 100% rename from src/agent/protocols/protos/google/protobuf/empty.proto rename to src/libs/protocols/protos/google/protobuf/empty.proto diff --git a/src/agent/protocols/protos/google/protobuf/wrappers.proto b/src/libs/protocols/protos/google/protobuf/wrappers.proto similarity index 100% rename from src/agent/protocols/protos/google/protobuf/wrappers.proto rename to src/libs/protocols/protos/google/protobuf/wrappers.proto diff --git a/src/agent/protocols/protos/health.proto b/src/libs/protocols/protos/health.proto similarity index 100% rename from src/agent/protocols/protos/health.proto rename to src/libs/protocols/protos/health.proto diff --git a/src/agent/protocols/protos/oci.proto b/src/libs/protocols/protos/oci.proto similarity index 100% rename from src/agent/protocols/protos/oci.proto rename to src/libs/protocols/protos/oci.proto diff --git a/src/agent/protocols/protos/types.proto b/src/libs/protocols/protos/types.proto similarity index 100% rename from src/agent/protocols/protos/types.proto rename to src/libs/protocols/protos/types.proto diff --git a/src/agent/protocols/src/lib.rs b/src/libs/protocols/src/lib.rs similarity index 100% rename from src/agent/protocols/src/lib.rs rename to src/libs/protocols/src/lib.rs diff --git a/src/tools/agent-ctl/Cargo.toml b/src/tools/agent-ctl/Cargo.toml index 303db2161..8847f734f 100644 --- a/src/tools/agent-ctl/Cargo.toml +++ b/src/tools/agent-ctl/Cargo.toml @@ -10,7 +10,7 @@ authors = ["The Kata Containers community "] edition = "2018" [dependencies] -protocols = { path = "../../agent/protocols", features = ["with-serde"] } +protocols = { path = "../../libs/protocols", features = ["with-serde"] } rustjail = { path = "../../agent/rustjail" } oci = { path = "../../libs/oci" }