Skip to content

Commit b2492e8

Browse files
authored
chore: remove logs --all-deployments (#2040)
1 parent 752ea29 commit b2492e8

File tree

3 files changed

+19
-29
lines changed

3 files changed

+19
-29
lines changed

api-client/src/lib.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,6 @@ impl ShuttleApiClient {
262262

263263
self.get_json(path).await
264264
}
265-
pub async fn get_project_logs(&self, project: &str) -> Result<LogsResponse> {
266-
let path = format!("/projects/{project}/logs");
267-
268-
self.get_json(path).await
269-
}
270265

271266
pub async fn get_deployments(
272267
&self,

cargo-shuttle/src/args.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,6 @@ pub struct LogsArgs {
504504
/// View all log lines
505505
#[arg(long, group = "output_mode", hide = true)]
506506
pub all: bool,
507-
/// Get logs from all deployments instead of one deployment
508-
#[arg(long)]
509-
pub all_deployments: bool,
510507
}
511508

512509
/// Helper function to parse and return the absolute path

cargo-shuttle/src/lib.rs

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -940,30 +940,28 @@ impl Shuttle {
940940
}
941941
let client = self.client.as_ref().unwrap();
942942
let pid = self.ctx.project_id();
943-
let logs = if args.all_deployments {
944-
client.get_project_logs(pid).await?.logs
943+
944+
let id = if args.latest {
945+
// Find latest deployment (not always an active one)
946+
let deployments = client.get_deployments(pid, 1, 1).await?.deployments;
947+
let Some(most_recent) = deployments.into_iter().next() else {
948+
println!("No deployments found");
949+
return Ok(());
950+
};
951+
eprintln!("Getting logs from: {}", most_recent.id);
952+
most_recent.id
953+
} else if let Some(id) = args.id {
954+
id
945955
} else {
946-
let id = if args.latest {
947-
// Find latest deployment (not always an active one)
948-
let deployments = client.get_deployments(pid, 1, 1).await?.deployments;
949-
let Some(most_recent) = deployments.into_iter().next() else {
950-
println!("No deployments found");
951-
return Ok(());
952-
};
953-
eprintln!("Getting logs from: {}", most_recent.id);
954-
most_recent.id
955-
} else if let Some(id) = args.id {
956-
id
957-
} else {
958-
let Some(current) = client.get_current_deployment(pid).await? else {
959-
println!("No deployments found");
960-
return Ok(());
961-
};
962-
eprintln!("Getting logs from: {}", current.id);
963-
current.id
956+
let Some(current) = client.get_current_deployment(pid).await? else {
957+
println!("No deployments found");
958+
return Ok(());
964959
};
965-
client.get_deployment_logs(pid, &id).await?.logs
960+
eprintln!("Getting logs from: {}", current.id);
961+
current.id
966962
};
963+
let logs = client.get_deployment_logs(pid, &id).await?.logs;
964+
967965
for log in logs {
968966
if args.raw {
969967
println!("{}", log.line);

0 commit comments

Comments
 (0)