diff --git a/Cargo.toml b/Cargo.toml index eb10e6b..c1a8cee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "crates/client-protos", + "crates/client", "crates/logging", "crates/shim-protos", "crates/shim" diff --git a/README.md b/README.md index ac59af1..dd3754d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ This repository contains the following crates: | [containerd-shim-protos](crates/shim-protos) | TTRPC bindings to shim interfaces | | [containerd-shim-logging](crates/logging) | Shim logger | | [containerd-shim](crates/shim) | Runtime v2 shim wrapper 🚧 | -| [containerd-client-protos](crates/client-protos) | GRPC bindings to containerd APIs | +| [containerd-client](crates/client) | GRPC bindings to containerd APIs | ## How to build The build process as easy as: diff --git a/crates/client-protos/Cargo.toml b/crates/client/Cargo.toml similarity index 92% rename from crates/client-protos/Cargo.toml rename to crates/client/Cargo.toml index 376bc7d..2d89ed1 100644 --- a/crates/client-protos/Cargo.toml +++ b/crates/client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "containerd-client-protos" +name = "containerd-client" version = "0.1.0" authors = ["Maksym Pavlenko "] edition = "2018" diff --git a/crates/client-protos/README.md b/crates/client/README.md similarity index 100% rename from crates/client-protos/README.md rename to crates/client/README.md diff --git a/crates/client-protos/build.rs b/crates/client/build.rs similarity index 100% rename from crates/client-protos/build.rs rename to crates/client/build.rs diff --git a/crates/client-protos/examples/version.rs b/crates/client/examples/version.rs similarity index 85% rename from crates/client-protos/examples/version.rs rename to crates/client/examples/version.rs index f216ecf..d36895c 100644 --- a/crates/client-protos/examples/version.rs +++ b/crates/client/examples/version.rs @@ -1,9 +1,8 @@ use std::convert::TryFrom; use tokio::net::UnixStream; -use containerd_client_protos as protos; -use protos::services::v1::version_client::VersionClient; -use protos::tonic::transport::Endpoint; +use containerd_client::services::v1::version_client::VersionClient; +use containerd_client::tonic::transport::Endpoint; /// Make sure you run containerd before running this example. #[tokio::main(flavor = "current_thread")] diff --git a/crates/client-protos/src/lib.rs b/crates/client/src/lib.rs similarity index 100% rename from crates/client-protos/src/lib.rs rename to crates/client/src/lib.rs diff --git a/crates/client-protos/vendor/README.md b/crates/client/vendor/README.md similarity index 100% rename from crates/client-protos/vendor/README.md rename to crates/client/vendor/README.md diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/container.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/container.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/container.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/container.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/content.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/content.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/content.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/content.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/image.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/image.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/image.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/image.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/namespace.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/namespace.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/namespace.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/namespace.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/snapshot.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/snapshot.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/snapshot.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/snapshot.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/events/task.proto b/crates/client/vendor/github.com/containerd/containerd/api/events/task.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/events/task.proto rename to crates/client/vendor/github.com/containerd/containerd/api/events/task.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/containers/v1/containers.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/containers/v1/containers.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/containers/v1/containers.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/containers/v1/containers.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/content/v1/content.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/content/v1/content.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/content/v1/content.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/content/v1/content.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/diff/v1/diff.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/diff/v1/diff.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/diff/v1/diff.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/diff/v1/diff.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/events/v1/events.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/events/v1/events.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/events/v1/events.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/events/v1/events.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/images/v1/images.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/introspection/v1/introspection.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/introspection/v1/introspection.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/introspection/v1/introspection.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/introspection/v1/introspection.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/leases/v1/leases.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/leases/v1/leases.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/leases/v1/leases.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/leases/v1/leases.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/namespaces/v1/namespace.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/snapshots/v1/snapshots.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/snapshots/v1/snapshots.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/snapshots/v1/snapshots.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/snapshots/v1/snapshots.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/tasks/v1/tasks.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/services/version/v1/version.proto b/crates/client/vendor/github.com/containerd/containerd/api/services/version/v1/version.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/services/version/v1/version.proto rename to crates/client/vendor/github.com/containerd/containerd/api/services/version/v1/version.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/types/descriptor.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/descriptor.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/types/descriptor.proto rename to crates/client/vendor/github.com/containerd/containerd/api/types/descriptor.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/types/metrics.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/metrics.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/types/metrics.proto rename to crates/client/vendor/github.com/containerd/containerd/api/types/metrics.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/types/mount.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/mount.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/types/mount.proto rename to crates/client/vendor/github.com/containerd/containerd/api/types/mount.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/types/platform.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/platform.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/types/platform.proto rename to crates/client/vendor/github.com/containerd/containerd/api/types/platform.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/api/types/task/task.proto b/crates/client/vendor/github.com/containerd/containerd/api/types/task/task.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/api/types/task/task.proto rename to crates/client/vendor/github.com/containerd/containerd/api/types/task/task.proto diff --git a/crates/client-protos/vendor/github.com/containerd/containerd/protobuf/plugin/fieldpath.proto b/crates/client/vendor/github.com/containerd/containerd/protobuf/plugin/fieldpath.proto similarity index 100% rename from crates/client-protos/vendor/github.com/containerd/containerd/protobuf/plugin/fieldpath.proto rename to crates/client/vendor/github.com/containerd/containerd/protobuf/plugin/fieldpath.proto diff --git a/crates/client-protos/vendor/gogoproto/gogo.proto b/crates/client/vendor/gogoproto/gogo.proto similarity index 100% rename from crates/client-protos/vendor/gogoproto/gogo.proto rename to crates/client/vendor/gogoproto/gogo.proto diff --git a/crates/client-protos/vendor/google/protobuf/any.proto b/crates/client/vendor/google/protobuf/any.proto similarity index 100% rename from crates/client-protos/vendor/google/protobuf/any.proto rename to crates/client/vendor/google/protobuf/any.proto diff --git a/crates/client-protos/vendor/google/protobuf/descriptor.proto b/crates/client/vendor/google/protobuf/descriptor.proto similarity index 100% rename from crates/client-protos/vendor/google/protobuf/descriptor.proto rename to crates/client/vendor/google/protobuf/descriptor.proto diff --git a/crates/client-protos/vendor/google/protobuf/empty.proto b/crates/client/vendor/google/protobuf/empty.proto similarity index 100% rename from crates/client-protos/vendor/google/protobuf/empty.proto rename to crates/client/vendor/google/protobuf/empty.proto diff --git a/crates/client-protos/vendor/google/protobuf/timestamp.proto b/crates/client/vendor/google/protobuf/timestamp.proto similarity index 100% rename from crates/client-protos/vendor/google/protobuf/timestamp.proto rename to crates/client/vendor/google/protobuf/timestamp.proto diff --git a/crates/client-protos/vendor/google/rpc/status.proto b/crates/client/vendor/google/rpc/status.proto similarity index 100% rename from crates/client-protos/vendor/google/rpc/status.proto rename to crates/client/vendor/google/rpc/status.proto diff --git a/crates/shim/examples/empty-shim.rs b/crates/shim/examples/empty_shim.rs similarity index 100% rename from crates/shim/examples/empty-shim.rs rename to crates/shim/examples/empty_shim.rs