Merge oak_containers_orchestrator_client into o_c_c

Ref project-oak#4531
jblebrun · Jan 4, 2024 · ee2ff76 · ee2ff76
1 parent 78cba93
commit ee2ff76
Show file tree

Hide file tree

Showing 17 changed files with 14 additions and 262 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,6 @@ members = [
   "oak_containers_hello_world_untrusted_app",
   "oak_containers_launcher",
   "oak_containers_orchestrator",
-  "oak_containers_orchestrator_client",
   "oak_containers_stage1",
   "oak_containers_syslogd",
   "oak_core",
@@ -82,7 +81,7 @@ micro_rpc_build = { path = "./micro_rpc_build" }
 oak_attestation_verification = { path = "./oak_attestation_verification" }
 oak_channel = { path = "./oak_channel" }
 oak_client = { path = "./oak_client" }
-oak_containers_orchestrator_client = { path = "./oak_containers_orchestrator_client" }
+oak_containers_orchestrator = { path = "./oak_containers_orchestrator" }
 oak_containers_launcher = { path = "./oak_containers_launcher" }
 oak_core = { path = "./oak_core" }
 oak_crypto = { path = "./oak_crypto" }

diff --git a/oak_containers_orchestrator/Cargo.toml b/oak_containers_orchestrator/Cargo.toml
@@ -12,7 +12,6 @@ clap = { version = "*", features = ["derive"] }
 coset = { version = "*", features = ["std"] }
 log = "*"
 nix = "*"
-oak_containers_orchestrator_client = { workspace = true }
 oak_crypto = { workspace = true }
 oak_dice = { workspace = true }
 oak_remote_attestation = { workspace = true }

diff --git a/oak_containers_orchestrator/build.rs b/oak_containers_orchestrator/build.rs
@@ -20,13 +20,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     generate_grpc_code(
         "../",
         &[
+            "oak_remote_attestation/proto/v1/messages.proto",
             "oak_containers/proto/interfaces.proto",
             "proto/key_provisioning/key_provisioning.proto",
             "proto/containers/orchestrator_crypto.proto",
             "proto/containers/hostlib_key_provisioning.proto",
         ],
         CodegenOptions {
             build_server: true,
+            build_client: true,
             ..Default::default()
         },
     )?;

diff --git a/oak_containers_orchestrator/src/ipc_server.rs b/oak_containers_orchestrator/src/ipc_server.rs
@@ -15,14 +15,14 @@
 
 use crate::{
     crypto::{CryptoService, KeyStore},
+    launcher_client::LauncherClient,
     proto::oak::containers::{
         orchestrator_server::{Orchestrator, OrchestratorServer},
         v1::orchestrator_crypto_server::OrchestratorCryptoServer,
         GetApplicationConfigResponse, GetCryptoContextRequest, GetCryptoContextResponse,
     },
 };
 use anyhow::Context;
-use oak_containers_orchestrator_client::LauncherClient;
 use oak_crypto::encryptor::{EncryptionKeyProvider, RecipientContextGenerator};
 use std::{fs::Permissions, os::unix::prelude::PermissionsExt, sync::Arc};
 use tokio::{fs::set_permissions, net::UnixListener};

diff --git a/oak_containers_orchestrator/src/lib.rs b/oak_containers_orchestrator/src/lib.rs
@@ -39,5 +39,6 @@ pub mod crypto;
 pub mod dice;
 pub mod ipc_server;
 pub mod key_provisioning;
+pub mod launcher_client;
 pub mod logging;
 pub mod metrics;
diff --git a/oak_containers_orchestrator/src/main.rs b/oak_containers_orchestrator/src/main.rs
@@ -15,8 +15,7 @@
 
 use anyhow::{anyhow, Context};
 use clap::Parser;
-use oak_containers_orchestrator::crypto::KeyStore;
-use oak_containers_orchestrator_client::LauncherClient;
+use oak_containers_orchestrator::{crypto::KeyStore, launcher_client::LauncherClient};
 use oak_dice::cert::generate_ecdsa_key_pair;
 use oak_remote_attestation::attester::{Attester, EmptyAttestationReportGenerator};
 use std::{path::PathBuf, sync::Arc};

diff --git a/oak_containers_orchestrator/src/metrics.rs b/oak_containers_orchestrator/src/metrics.rs
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
+use crate::launcher_client::LauncherClient;
 use anyhow::Result;
-use oak_containers_orchestrator_client::LauncherClient;
 use opentelemetry_api::{
     metrics::{AsyncInstrument, Meter, MeterProvider, ObservableCounter, ObservableGauge, Unit},
     KeyValue,

diff --git a/oak_containers_orchestrator_client/Cargo.toml b/oak_containers_orchestrator_client/Cargo.toml
diff --git a/oak_containers_orchestrator_client/README.md b/oak_containers_orchestrator_client/README.md
diff --git a/oak_containers_orchestrator_client/build.rs b/oak_containers_orchestrator_client/build.rs
diff --git a/oak_containers_orchestrator_client/src/lib.rs b/oak_containers_orchestrator_client/src/lib.rs
diff --git a/oak_containers_syslogd/Cargo.toml b/oak_containers_syslogd/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 anyhow = "*"
 bitflags = "*"
 clap = { version = "*", features = ["derive"] }
-oak_containers_orchestrator_client = { workspace = true }
+oak_containers_orchestrator = { workspace = true }
 opentelemetry_api = { version = "*", default-features = false, features = [
   "logs"
 ] }

diff --git a/oak_containers_syslogd/src/log_relay.rs b/oak_containers_syslogd/src/log_relay.rs
@@ -16,7 +16,7 @@
 
 use crate::systemd_journal::{Journal, JournalOpenFlags};
 use anyhow::{Context, Result};
-use oak_containers_orchestrator_client::LauncherClient;
+use oak_containers_orchestrator::launcher_client::LauncherClient;
 use opentelemetry_api::logs::{AnyValue, LogRecord, Logger, Severity};
 use std::{
     sync::Arc,

diff --git a/oak_containers_syslogd/src/main.rs b/oak_containers_syslogd/src/main.rs
@@ -21,7 +21,7 @@ mod systemd_journal;
 
 use anyhow::anyhow;
 use clap::Parser;
-use oak_containers_orchestrator_client::LauncherClient;
+use oak_containers_orchestrator::launcher_client::LauncherClient;
 use opentelemetry_api::global::set_error_handler;
 use signal_hook::consts::signal::SIGTERM;
 use signal_hook_tokio::Signals;