From 08dbc6f0f3ae0af272318f3ba9b76c4deadf2fb1 Mon Sep 17 00:00:00 2001
From: Costin Lupu <lvpv@amazon.com>
Date: Wed, 3 Jan 2024 17:58:19 +0100
Subject: [PATCH] Cargo.toml: Declare command-executer as a workspace member

... instead of defining a separate workspace for it. With this occasion
we also need to update Cargo.lock with the new dependencies.

Signed-off-by: Costin Lupu <lvpv@amazon.com>
---
 Cargo.lock                          | 83 +++++++++++++++++++++++++++++
 Cargo.toml                          |  2 +-
 samples/command_executer/Cargo.toml |  2 -
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a794150..3f1e037f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -251,6 +251,21 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "command-executer"
+version = "0.1.0"
+dependencies = [
+ "byteorder",
+ "clap",
+ "log",
+ "nix 0.26.2",
+ "num",
+ "num-derive",
+ "num-traits",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
@@ -1098,6 +1113,41 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "num"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
 [[package]]
 name = "num-derive"
 version = "0.3.3"
@@ -1109,6 +1159,39 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.15"
diff --git a/Cargo.toml b/Cargo.toml
index 27adc146..59f5aa0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,7 +41,7 @@ num-traits = "0.2"
 tempfile = "3.5"
 
 [workspace]
-members = [".", "driver-bindings", "eif_loader", "enclave_build", "vsock_proxy"]
+members = [".", "samples/command_executer", "driver-bindings", "eif_loader", "enclave_build", "vsock_proxy"]
 
 [features]
 default = []
diff --git a/samples/command_executer/Cargo.toml b/samples/command_executer/Cargo.toml
index b57c7295..f98ebb5e 100644
--- a/samples/command_executer/Cargo.toml
+++ b/samples/command_executer/Cargo.toml
@@ -17,5 +17,3 @@ byteorder = "1.3"
 num = "0.2"
 num-derive = "0.3"
 num-traits = "0.2"
-
-[workspace]