fix(cargo-shuttle): clashing id arg name in logs, deployment status, redeploy (#2089)

Author: jonaro00

cargo-shuttle/src/args.rs

@@ -214,12 +214,12 @@ pub enum DeploymentCommand {
     #[command(visible_alias = "stat")]
     Status {
         /// ID of deployment to get status for
-        id: Option<String>,
+        deployment_id: Option<String>,
     },
     /// Redeploy a previous deployment (if possible)
     Redeploy {
         /// ID of deployment to redeploy
-        id: Option<String>,
+        deployment_id: Option<String>,
 
         #[command(flatten)]
         tracking_args: DeploymentTrackingArgs,
@@ -516,7 +516,7 @@ impl InitTemplateArg {
 #[derive(Args, Clone, Debug, Default)]
 pub struct LogsArgs {
     /// Deployment ID to get logs for. Defaults to the current deployment
-    pub id: Option<String>,
+    pub deployment_id: Option<String>,
     #[arg(short, long)]
     /// View logs from the most recent deployment (which is not always the running one)
     pub latest: bool,

cargo-shuttle/src/lib.rs

@@ -265,10 +265,13 @@ impl Shuttle {
                 DeploymentCommand::List { page, limit, table } => {
                     self.deployments_list(page, limit, table).await
                 }
-                DeploymentCommand::Status { id } => self.deployment_get(id).await,
-                DeploymentCommand::Redeploy { id, tracking_args } => {
-                    self.deployment_redeploy(id, tracking_args).await
+                DeploymentCommand::Status { deployment_id } => {
+                    self.deployment_get(deployment_id).await
                 }
+                DeploymentCommand::Redeploy {
+                    deployment_id,
+                    tracking_args,
+                } => self.deployment_redeploy(deployment_id, tracking_args).await,
                 DeploymentCommand::Stop { tracking_args } => self.stop(tracking_args).await,
             },
             Command::Resource(cmd) => match cmd {
@@ -997,7 +1000,7 @@ impl Shuttle {
                 };
                 eprintln!("Getting logs from: {}", most_recent.id);
                 most_recent.id
-            } else if let Some(id) = args.id {
+            } else if let Some(id) = args.deployment_id {
                 id
             } else {
                 let Some(current) = client.get_current_deployment(pid).await?.into_inner() else {