Merge pull request #142 from Dstack-TEE/renaming

Better naming for components

Author: kvinwang

Cargo.lock

@@ -14,13 +14,12 @@ members = [
     "tdx-attest",
     "tdxctl",
     "iohash",
-    "tappd",
-    "tappd/rpc",
-    "teepod",
-    "teepod/rpc",
-    "tproxy",
-    "tproxy/rpc",
-    "certgen",
+    "guest-agent",
+    "guest-agent/rpc",
+    "vmm",
+    "vmm/rpc",
+    "gateway",
+    "gateway/rpc",
     "certbot",
     "certbot/cli",
     "ct_monitor",
@@ -43,10 +42,10 @@ resolver = "2"
 # Internal dependencies
 ra-rpc = { path = "ra-rpc", default-features = false }
 ra-tls = { path = "ra-tls" }
-tproxy-rpc = { path = "tproxy/rpc" }
-kms-rpc = { path = "kms/rpc" }
-tappd-rpc = { path = "tappd/rpc" }
-teepod-rpc = { path = "teepod/rpc" }
+dstack-gateway-rpc = { path = "gateway/rpc" }
+dstack-kms-rpc = { path = "kms/rpc" }
+dstack-guest-agent-rpc = { path = "guest-agent/rpc" }
+dstack-vmm-rpc = { path = "vmm/rpc" }
 cc-eventlog = { path = "cc-eventlog" }
 supervisor = { path = "supervisor" }
 supervisor-client = { path = "supervisor/client" }
@@ -142,7 +141,7 @@ x509-parser = "0.16.0"
 
 # RPC/Protocol
 prpc = "0.6.0"
-prpc-build = "0.6.0"
+prpc-build = "0.6.1"
 
 # Development/Testing
 bindgen = "0.71.1"

Cargo.toml

@@ -1,7 +1,7 @@
 [Unit]
 Description=App Compose Service
 Wants=docker.service
-After=docker.service tboot.service tappd.service
+After=docker.service tboot.service dstack-guest-agent.service
 
 [Service]
 Type=oneshot

README.md

@@ -1,11 +1,10 @@
 [Unit]
-Description=Tappd Service
+Description=Dstack Guest Agent Service
 After=network.target tboot.service
 
 [Service]
 OOMScoreAdjust=-1000
-ExecStartPre=-/bin/rm -rf /var/run/tappd.sock
-ExecStart=/bin/tappd --watchdog -c /tapp/tappd.json
+ExecStart=/bin/dstack-guest-agent --watchdog -c /tapp/agent.json
 Restart=always
 User=root
 Group=root

basefiles/app-compose.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Guest Boot Service
 After=network.target
-Before=app-compose.service tappd.service
+Before=app-compose.service dstack-guest-agent.service
 
 [Service]
 Type=oneshot

basefiles/tappd.service renamed to basefiles/dstack-guest-agent.service

@@ -8,7 +8,7 @@ license.workspace = true
 [dependencies]
 anyhow.workspace = true
 dstack-types.workspace = true
-kms-rpc.workspace = true
+dstack-kms-rpc.workspace = true
 ra-rpc = { workspace = true, features = ["client"] }
 ra-tls.workspace = true
 serde_json.workspace = true

basefiles/tappd.init

@@ -1,6 +1,6 @@
 use anyhow::{Context, Result};
+use dstack_kms_rpc::{kms_client::KmsClient, SignCertRequest};
 use dstack_types::{AppKeys, KeyProvider};
-use kms_rpc::{kms_client::KmsClient, SignCertRequest};
 use ra_rpc::client::{RaClient, RaClientConfig};
 use ra_tls::{
     attestation::QuoteContentType,
@@ -79,12 +79,23 @@ impl CertRequestClient {
         }
     }
 
-    pub async fn request_cert(&self, key: &KeyPair, config: CertConfig) -> Result<Vec<String>> {
+    pub async fn request_cert(
+        &self,
+        key: &KeyPair,
+        config: CertConfig,
+        no_ra: bool,
+    ) -> Result<Vec<String>> {
         let pubkey = key.public_key_der();
         let report_data = QuoteContentType::RaTlsCert.to_report_data(&pubkey);
-        let (_, quote) = get_quote(&report_data, None).context("Failed to get quote")?;
-        let event_log = read_event_logs().context("Failed to decode event log")?;
-        let event_log = serde_json::to_vec(&event_log).context("Failed to serialize event log")?;
+        let (quote, event_log) = if !no_ra {
+            let (_, quote) = get_quote(&report_data, None).context("Failed to get quote")?;
+            let event_log = read_event_logs().context("Failed to decode event log")?;
+            let event_log =
+                serde_json::to_vec(&event_log).context("Failed to serialize event log")?;
+            (quote, event_log)
+        } else {
+            (vec![], vec![])
+        };
 
         let csr = CertSigningRequest {
             confirm: "please sign cert:".to_string(),