Rename kms to dstack-kms

kvinwang · kvinwang · commit 50888e4b5e58 · 2025-04-03T07:37:17.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,7 +43,7 @@ resolver = "2"
 ra-rpc = { path = "ra-rpc", default-features = false }
 ra-tls = { path = "ra-tls" }
 dstack-gateway-rpc = { path = "gateway/rpc" }
-kms-rpc = { path = "kms/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" }
diff --git a/README.md b/README.md
@@ -121,12 +121,12 @@ Run build.sh again to build the artifacts.
 
 # If everything is okay, you should see the built artifacts in the `build` directory.
 $ ls
-certs  images  kms  kms.toml  run  dstack-vmm  vmm.toml  dstack-gateway  gateway.toml
+certs  images  dstack-kms  kms.toml  run  dstack-vmm  vmm.toml  dstack-gateway  gateway.toml
 ```
 
 Now you can open 3 terminals to start the components:
 
-1. Run `./kms`
+1. Run `./dstack-kms -c kms.toml`
 2. Run `sudo ./dstack-gateway -c gateway.toml`
 3. Run `./dstack-vmm -c vmm.toml`
 
@@ -260,12 +260,6 @@ Given the config `GATEWAY_LISTEN_PORT_PASSTHROUGH=9008`, now we can go to [`http
 ## Upgrade an App
 
 Got to the dstack-vmm webpage, click the [Upgrade] button, select or paste the compose file you want to upgrade to, and click the [Upgrade] button again.
-Upon successful initiation of the upgrade, you'll see a message prompting you to run the following command in your terminal to authorize the upgrade through KMS:
-
-```shell
-./kms-allow-upgrade.sh <app_id> <upgraded_app_id>
-```
-
 The app id does not change after the upgrade. Stop and start the app to apply the upgrade.
 
 ## HTTPS Certificate Transparency
diff --git a/cert-client/Cargo.toml b/cert-client/Cargo.toml
@@ -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
diff --git a/cert-client/src/lib.rs b/cert-client/src/lib.rs
@@ -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,
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
@@ -35,7 +35,7 @@ smallvec.workspace = true
 futures.workspace = true
 cmd_lib.workspace = true
 load_config.workspace = true
-kms-rpc.workspace = true
+dstack-kms-rpc.workspace = true
 ra-tls.workspace = true
 dstack-guest-agent-rpc.workspace = true
 http-client = { workspace = true, features = ["prpc"] }
diff --git a/gateway/src/main.rs b/gateway/src/main.rs
@@ -98,7 +98,7 @@ async fn maybe_gen_certs(config: &Config, tls_config: &TlsConfig) -> Result<()>
     let kms_url = format!("{kms_url}/prpc");
     info!("Getting CA cert from {kms_url}");
     let client = RaClient::new(kms_url, true).context("Failed to create kms client")?;
-    let client = kms_rpc::kms_client::KmsClient::new(client);
+    let client = dstack_kms_rpc::kms_client::KmsClient::new(client);
     let ca_cert = client.get_meta().await?.ca_cert;
     let key = ra_tls::rcgen::KeyPair::generate().context("Failed to generate key")?;
     let cert = ra_tls::cert::CertRequest::builder()
diff --git a/kms/Cargo.toml b/kms/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "kms"
+name = "dstack-kms"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -20,7 +20,7 @@ tracing-subscriber.workspace = true
 x25519-dalek.workspace = true
 yasna.workspace = true
 
-kms-rpc.workspace = true
+dstack-kms-rpc.workspace = true
 ra-rpc = { workspace = true, features = ["client", "rocket"] }
 ra-tls.workspace = true
 load_config.workspace = true
diff --git a/kms/rpc/Cargo.toml b/kms/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "kms-rpc"
+name = "dstack-kms-rpc"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
diff --git a/kms/src/main_service.rs b/kms/src/main_service.rs
@@ -1,13 +1,13 @@
 use std::sync::Arc;
 
 use anyhow::{bail, Context, Result};
-use fs_err as fs;
-use k256::ecdsa::SigningKey;
-use kms_rpc::{
+use dstack_kms_rpc::{
     kms_server::{KmsRpc, KmsServer},
     AppId, AppKeyResponse, GetAppKeyRequest, GetMetaResponse, GetTempCaCertResponse,
     KmsKeyResponse, KmsKeys, PublicKeyResponse, SignCertRequest, SignCertResponse,
 };
+use fs_err as fs;
+use k256::ecdsa::SigningKey;
 use ra_rpc::{Attestation, CallContext, RpcCall};
 use ra_tls::{
     attestation::VerifiedAttestation,
diff --git a/kms/src/onboard_service.rs b/kms/src/onboard_service.rs
@@ -2,13 +2,13 @@ use anyhow::{Context, Result};
 use dstack_guest_agent_rpc::{
     dstack_guest_client::DstackGuestClient, GetQuoteResponse, RawQuoteArgs,
 };
-use http_client::prpc::PrpcClient;
-use k256::ecdsa::SigningKey;
-use kms_rpc::{
+use dstack_kms_rpc::{
     kms_client::KmsClient,
     onboard_server::{OnboardRpc, OnboardServer},
     BootstrapRequest, BootstrapResponse, OnboardRequest, OnboardResponse,
 };
+use http_client::prpc::PrpcClient;
+use k256::ecdsa::SigningKey;
 use ra_rpc::{client::RaClient, CallContext, RpcCall};
 use ra_tls::{
     attestation::QuoteContentType,
diff --git a/tdxctl/Cargo.toml b/tdxctl/Cargo.toml
@@ -26,7 +26,7 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 x25519-dalek.workspace = true
 
-kms-rpc.workspace = true
+dstack-kms-rpc.workspace = true
 ra-rpc = { workspace = true, features = ["client"] }
 ra-tls.workspace = true
 dstack-gateway-rpc.workspace = true
diff --git a/tdxctl/src/fde_setup.rs b/tdxctl/src/fde_setup.rs
@@ -6,6 +6,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Context, Result};
+use dstack_kms_rpc::GetAppKeyRequest;
 use dstack_types::{
     shared_filenames::{
         APP_COMPOSE, APP_KEYS, DECRYPTED_ENV, DECRYPTED_ENV_JSON, ENCRYPTED_ENV, INSTANCE_INFO,
@@ -14,7 +15,6 @@ use dstack_types::{
     KeyProvider, KeyProviderInfo,
 };
 use fs_err as fs;
-use kms_rpc::GetAppKeyRequest;
 use ra_rpc::client::{RaClient, RaClientConfig};
 use ra_tls::cert::generate_ra_cert;
 use serde::{Deserialize, Serialize};
@@ -229,7 +229,7 @@ impl SetupFdeArgs {
         let tmp_ca = {
             info!("Getting temp ca cert");
             let client = RaClient::new(kms_url.clone(), true)?;
-            let kms_client = kms_rpc::kms_client::KmsClient::new(client);
+            let kms_client = dstack_kms_rpc::kms_client::KmsClient::new(client);
             kms_client
                 .get_temp_ca_cert()
                 .await
@@ -265,7 +265,7 @@ impl SetupFdeArgs {
             .build()
             .into_client()
             .context("Failed to create client")?;
-        let kms_client = kms_rpc::kms_client::KmsClient::new(ra_client);
+        let kms_client = dstack_kms_rpc::kms_client::KmsClient::new(ra_client);
         let response = kms_client
             .get_app_key(GetAppKeyRequest { app_compose })
             .await
diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml
@@ -32,7 +32,7 @@ rocket-apitoken.workspace = true
 supervisor-client.workspace = true
 ra-rpc = { workspace = true, features = ["client", "rocket"] }
 dstack-vmm-rpc.workspace = true
-kms-rpc.workspace = true
+dstack-kms-rpc.workspace = true
 path-absolutize.workspace = true
 host-api.workspace = true
 safe-write.workspace = true
diff --git a/vmm/src/app.rs b/vmm/src/app.rs
@@ -2,21 +2,21 @@ use crate::config::{Config, ProcessNote, Protocol};
 
 use anyhow::{bail, Context, Result};
 use bon::Builder;
+use dstack_kms_rpc::kms_client::KmsClient;
 use dstack_types::shared_filenames::{
     compat_v3, APP_COMPOSE, ENCRYPTED_ENV, INSTANCE_INFO, SYS_CONFIG, USER_CONFIG,
 };
+use dstack_vmm_rpc::{self as pb, GpuInfo, StatusRequest, StatusResponse, VmConfiguration};
 use fs_err as fs;
 use guest_api::client::DefaultClient as GuestClient;
 use id_pool::IdPool;
-use kms_rpc::kms_client::KmsClient;
 use ra_rpc::client::RaClient;
 use serde::{Deserialize, Serialize};
 use std::collections::{HashMap, HashSet};
 use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, MutexGuard};
 use supervisor_client::SupervisorClient;
-use dstack_vmm_rpc::{self as pb, GpuInfo, StatusRequest, StatusResponse, VmConfiguration};
 use tracing::{error, info};
 
 pub use image::{Image, ImageInfo};
diff --git a/vmm/src/app/qemu.rs b/vmm/src/app/qemu.rs
@@ -16,10 +16,10 @@ use super::{image::Image, VmState};
 use anyhow::{bail, Context, Result};
 use bon::Builder;
 use dstack_types::shared_filenames::{APP_COMPOSE, ENCRYPTED_ENV, INSTANCE_INFO, USER_CONFIG};
+use dstack_vmm_rpc as pb;
 use fs_err as fs;
 use serde::{Deserialize, Serialize};
 use supervisor_client::supervisor::{ProcessConfig, ProcessInfo};
-use dstack_vmm_rpc as pb;
 
 #[derive(Debug, Deserialize)]
 pub struct InstanceInfo {
diff --git a/vmm/src/main_service.rs b/vmm/src/main_service.rs
@@ -253,7 +253,7 @@ impl VmmRpc for RpcHandler {
     async fn get_app_env_encrypt_pub_key(self, request: AppId) -> Result<PublicKeyResponse> {
         let kms = self.kms_client()?;
         let response = kms
-            .get_app_env_encrypt_pub_key(kms_rpc::AppId {
+            .get_app_env_encrypt_pub_key(dstack_kms_rpc::AppId {
                 app_id: request.app_id,
             })
             .await?;
