cargo-shuttle: add the beta deployment status cmd handler

shuttle-hq · Apr 17, 2024 · ec57108 · ec57108
1 parent b8c5b84
commit ec57108
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 12 deletions.
diff --git a/cargo-shuttle/src/args.rs b/cargo-shuttle/src/args.rs
@@ -167,7 +167,7 @@ pub enum DeploymentCommand {
     /// View status of a deployment
     Status {
         /// ID of deployment to get status for
-        id: Uuid,
+        id: String,
     },
 }
 

diff --git a/cargo-shuttle/src/client.rs b/cargo-shuttle/src/client.rs
@@ -246,6 +246,16 @@ impl ShuttleApiClient {
         self.get(path).await
     }
 
+    pub async fn deployment_status(
+        &self,
+        project: &str,
+        deployment_id: &str,
+    ) -> Result<deployment::EcsResponse> {
+        let path = format!("/projects/{project}/deployments/{deployment_id}");
+
+        self.get(path).await
+    }
+
     pub async fn get_deployment_details(
         &self,
         project: &str,

diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
@@ -132,8 +132,7 @@ impl Shuttle {
             }
             if matches!(
                 args.cmd,
-                Command::Deployment(..)
-                    | Command::Resource(..)
+                Command::Resource(..)
                     | Command::Stop
                     | Command::Clean
                     | Command::Status
@@ -221,9 +220,14 @@ impl Shuttle {
             Command::Status => self.status().await,
             Command::Logs(logs_args) => self.logs(logs_args).await,
             Command::Deployment(DeploymentCommand::List { page, limit, raw }) => {
+                if self.beta {
+                    unimplemented!();
+                }
                 self.deployments_list(page, limit, raw).await
             }
-            Command::Deployment(DeploymentCommand::Status { id }) => self.deployment_get(id).await,
+            Command::Deployment(DeploymentCommand::Status { id }) => {
+                self.deployment_get(id.as_str()).await
+            }
             Command::Resource(ResourceCommand::List { raw, show_secrets }) => {
                 self.resources_list(raw, show_secrets).await
             }
@@ -952,14 +956,28 @@ impl Shuttle {
         Ok(CommandOutcome::Ok)
     }
 
-    async fn deployment_get(&self, deployment_id: Uuid) -> Result<CommandOutcome> {
+    async fn deployment_get(&self, deployment_id: &str) -> Result<CommandOutcome> {
         let client = self.client.as_ref().unwrap();
-        let deployment = client
-            .get_deployment_details(self.ctx.project_name(), &deployment_id)
-            .await
-            .map_err(suggestions::deployment::get_deployment_status_failure)?;
 
-        println!("{deployment}");
+        if self.beta {
+            let deployment = client
+                .deployment_status(self.ctx.project_name(), deployment_id)
+                .await
+                .map_err(suggestions::deployment::get_deployment_status_failure)?;
+            deployment.colored_println();
+        } else {
+            let deployment = client
+                .get_deployment_details(
+                    self.ctx.project_name(),
+                    &Uuid::from_str(deployment_id).map_err(|err| {
+                        anyhow!("Provided deployment id is not a valid UUID: {err}")
+                    })?,
+                )
+                .await
+                .map_err(suggestions::deployment::get_deployment_status_failure)?;
+
+            println!("{deployment}");
+        }
 
         Ok(CommandOutcome::Ok)
     }

diff --git a/common/src/models/deployment.rs b/common/src/models/deployment.rs
@@ -90,8 +90,12 @@ impl EcsResponse {
         );
 
         let state_with_uri = match self.running_id {
-            None => format!("{latest_state} ({})", self.uri),
-            Some(_) => latest_state,
+            None if EcsState::Running == self.latest_deployment_state
+                || EcsState::InProgress == self.latest_deployment_state =>
+            {
+                format!("{latest_state} ({})", self.uri)
+            }
+            _ => latest_state,
         };
 
         println!(