Skip to content

Commit b9b95b3

Browse files
lyang2821lyang2821
committed
update
1 parent 4dd174f commit b9b95b3

10 files changed

Lines changed: 30 additions & 50 deletions

File tree

‎crates/api/src/devbox.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ impl DevboxSessionRpc for DevboxSessionRpcServer {
614614

615615
Ok(Some(lapdev_devbox_rpc::DevboxEnvironmentInfo {
616616
environment_id: env_id,
617+
environment_name: environment.name.clone(),
617618
cluster_name: cluster.name,
618619
namespace: environment.namespace,
619620
}))
@@ -709,6 +710,7 @@ impl DevboxSessionRpc for DevboxSessionRpcServer {
709710
// Notify client about the environment change
710711
let env_info = lapdev_devbox_rpc::DevboxEnvironmentInfo {
711712
environment_id: environment.id,
713+
environment_name: environment.name.clone(),
712714
cluster_name: cluster.name,
713715
namespace: environment.namespace.clone(),
714716
};

‎crates/api/src/hrpc_service.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ impl HrpcService for CoreState {
182182

183183
let env_info = lapdev_devbox_rpc::DevboxEnvironmentInfo {
184184
environment_id: environment.id,
185+
environment_name: environment.name.clone(),
185186
cluster_name: cluster.name.clone(),
186187
namespace: environment.namespace.clone(),
187188
};

‎crates/api/src/state.rs‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,7 @@ impl CoreState {
493493
&intercept,
494494
route_workload_id,
495495
)
496-
})
497-
{
496+
}) {
498497
Ok(route) => {
499498
let (target_environment_id, _) = Self::route_environment_targets(&environment);
500499
if let Err(err) = self
@@ -530,10 +529,7 @@ impl CoreState {
530529
let (target_environment_id, branch_environment_id) =
531530
Self::route_environment_targets(&environment);
532531

533-
let route_workload_id = match self
534-
.route_workload_id_for_intercept(&intercept)
535-
.await
536-
{
532+
let route_workload_id = match self.route_workload_id_for_intercept(&intercept).await {
537533
Ok(id) => id,
538534
Err(err) => {
539535
tracing::warn!(
@@ -635,9 +631,7 @@ impl CoreState {
635631
continue;
636632
}
637633

638-
let route_workload_id = self
639-
.route_workload_id_for_intercept(&intercept)
640-
.await?;
634+
let route_workload_id = self.route_workload_id_for_intercept(&intercept).await?;
641635

642636
let route = Self::build_devbox_route_config_from_intercept(
643637
base_trimmed,

‎crates/cli/src/devbox/commands/connect.rs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,10 @@ impl DevboxClientRpc for DevboxClientRpcServer {
166166

167167
if let Some(ref env) = environment {
168168
println!(
169-
"\n{} Environment changed to: {} / {}",
169+
"\n{} Environment changed to: {} ({} / {})",
170170
"🔄".cyan(),
171-
env.cluster_name.bright_white(),
171+
env.environment_name.bright_white(),
172+
env.cluster_name.cyan(),
172173
env.namespace.cyan()
173174
);
174175
tracing::info!(
@@ -574,8 +575,9 @@ impl DevboxTunnelManager {
574575
session_info: &lapdev_devbox_rpc::DevboxSessionInfo,
575576
) {
576577
println!(
577-
" Active environment: {} / {}",
578-
env.cluster_name.bright_white(),
578+
" Active environment: {} ({} / {})",
579+
env.environment_name.bright_white(),
580+
env.cluster_name.cyan(),
579581
env.namespace.cyan()
580582
);
581583

‎crates/cli/src/main.rs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,13 @@ async fn main() -> anyhow::Result<()> {
8484
.add_directive("tarpc=warn".parse().unwrap())
8585
.add_directive("tarpc::client=warn".parse().unwrap()); // Only show tarpc warnings/errors
8686

87-
let console_layer = fmt::layer()
88-
.with_target(false)
89-
.without_time()
90-
.with_writer(std::io::stderr);
91-
9287
let file_layer = fmt::layer()
9388
.with_target(true)
9489
.with_ansi(false)
9590
.with_writer(file_writer);
9691

9792
tracing_subscriber::registry()
9893
.with(filter)
99-
.with(console_layer)
10094
.with(file_layer)
10195
.init();
10296

‎crates/db/migration/src/m20250815_000001_create_kube_environment_preview_url.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,7 @@ impl MigrationTrait for Migration {
114114
.table(KubeEnvironmentPreviewUrl::Table)
115115
.col(KubeEnvironmentPreviewUrl::EnvironmentId)
116116
.col(KubeEnvironmentPreviewUrl::DeletedAt)
117-
.col((
118-
KubeEnvironmentPreviewUrl::CreatedAt,
119-
IndexOrder::Desc,
120-
))
117+
.col((KubeEnvironmentPreviewUrl::CreatedAt, IndexOrder::Desc))
121118
.to_owned(),
122119
)
123120
.await?;

‎crates/devbox-rpc/src/lib.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ pub struct DevboxSessionInfo {
6666
#[derive(Debug, Clone, Serialize, Deserialize)]
6767
pub struct DevboxEnvironmentInfo {
6868
pub environment_id: Uuid,
69+
pub environment_name: String,
6970
pub cluster_name: String,
7071
pub namespace: String,
7172
}

‎crates/kube-manager/src/sidecar_proxy_manager.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ impl SidecarProxyManager {
218218
environment_id: Uuid,
219219
mut routes: HashMap<Uuid, DevboxRouteConfig>,
220220
) -> Result<(), String> {
221-
let previous_routes =
222-
self.snapshot_devbox_routes_for_environment(environment_id, routes.clone())
223-
.await;
221+
let previous_routes = self
222+
.snapshot_devbox_routes_for_environment(environment_id, routes.clone())
223+
.await;
224224

225225
let Some(connections) = self.latest_clients_for_environment(environment_id).await else {
226226
warn!(
@@ -243,8 +243,9 @@ impl SidecarProxyManager {
243243
));
244244
}
245245
} else {
246-
let prior_branch =
247-
previous_routes.get(&workload_id).and_then(|route| route.branch_environment_id);
246+
let prior_branch = previous_routes
247+
.get(&workload_id)
248+
.and_then(|route| route.branch_environment_id);
248249
if let Err(e) = client
249250
.stop_devbox(tarpc::context::current(), prior_branch)
250251
.await

‎crates/kube-sidecar-proxy/src/server.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,7 @@ async fn handle_connection(
561561
connection,
562562
target_port,
563563
} => {
564-
let shutdown_rx = connection_registry
565-
.subscribe(Some(branch_env_id))
566-
.await;
564+
let shutdown_rx = connection_registry.subscribe(Some(branch_env_id)).await;
567565
let metadata = connection.metadata();
568566
info!(
569567
"TCP {} via proxy port {} (service {}) intercepted by Devbox (intercept_id={}, workload_id={}, target_port={})",
@@ -743,9 +741,7 @@ async fn handle_http_proxy(
743741
metadata.workload_id,
744742
target_port
745743
);
746-
let shutdown_rx = connection_registry
747-
.subscribe(Some(branch_env_id))
748-
.await;
744+
let shutdown_rx = connection_registry.subscribe(Some(branch_env_id)).await;
749745
return handle_devbox_tunnel(
750746
inbound_stream,
751747
client_addr,

‎crates/kube/src/http_proxy.rs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -744,10 +744,8 @@ impl PreviewUrlProxy {
744744
modified_headers.push_str("\r\n");
745745
} else if line.is_empty() {
746746
if !tracestate_added {
747-
modified_headers.push_str(&format!(
748-
"tracestate: {}\r\n",
749-
environment_tracestate
750-
));
747+
modified_headers
748+
.push_str(&format!("tracestate: {}\r\n", environment_tracestate));
751749
tracestate_added = true;
752750
}
753751
if !connection_header_written && !is_upgrade_request {
@@ -864,12 +862,9 @@ mod tests {
864862
fn test_add_environment_headers_force_connection_close() {
865863
let request = b"GET / HTTP/1.1\r\nHost: example.test\r\n\r\n";
866864
let env_id = Uuid::new_v4();
867-
let modified = PreviewUrlProxy::add_environment_id_to_headers(
868-
request,
869-
request.len(),
870-
env_id,
871-
)
872-
.expect("request rewrite should succeed");
865+
let modified =
866+
PreviewUrlProxy::add_environment_id_to_headers(request, request.len(), env_id)
867+
.expect("request rewrite should succeed");
873868
let modified_str = String::from_utf8(modified).unwrap();
874869
assert!(modified_str.contains(&format!("lapdev-env-id={env_id}")));
875870
assert!(modified_str.to_lowercase().contains("connection: close"));
@@ -879,12 +874,9 @@ mod tests {
879874
fn test_add_environment_headers_respect_upgrades() {
880875
let request = b"GET /chat HTTP/1.1\r\nHost: example.test\r\nConnection: Upgrade\r\nUpgrade: websocket\r\n\r\n";
881876
let env_id = Uuid::new_v4();
882-
let modified = PreviewUrlProxy::add_environment_id_to_headers(
883-
request,
884-
request.len(),
885-
env_id,
886-
)
887-
.expect("request rewrite should succeed");
877+
let modified =
878+
PreviewUrlProxy::add_environment_id_to_headers(request, request.len(), env_id)
879+
.expect("request rewrite should succeed");
888880
let modified_str = String::from_utf8(modified).unwrap();
889881
assert!(modified_str.contains("Connection: Upgrade"));
890882
assert!(modified_str.contains("Upgrade: websocket"));

0 commit comments

Comments
 (0)