Monitor subsequent cloud operations (#1134)

edgedb · Oct 11, 2023 · 1d9c1cb · 1d9c1cb
1 parent c97cd8b
commit 1d9c1cb
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/src/cloud/ops.rs b/src/cloud/ops.rs
@@ -118,6 +118,7 @@ pub struct CloudOperation {
     pub status: OperationStatus,
     pub description: String,
     pub message: String,
+    pub subsequent_id: Option<String>,
 }
 
 #[tokio::main]
@@ -170,19 +171,32 @@ async fn wait_for_operation(
         .with_message(format!("Monitoring {}...", operation.description));
     spinner.enable_steady_tick(SPINNER_TICK);
 
-    let url = format!("operations/{}", operation.id);
+    let mut url = format!("operations/{}", operation.id);
     let deadline = Instant::now() + OPERATION_WAIT_TIME;
+
+    let mut original_error = None;
+
     while Instant::now() < deadline {
-        match operation.status {
-            OperationStatus::Failed => {
-                anyhow::bail!(operation.message);
+        match (operation.status, operation.subsequent_id) {
+            (OperationStatus::Failed, Some(subsequent_id)) => {
+                original_error = original_error.or(Some(operation.message));
+
+                url = format!("operations/{}", subsequent_id);
+                operation = client.get(&url).await?;
+            },
+            (OperationStatus::Failed, None) => {
+                anyhow::bail!(original_error.unwrap_or(operation.message));
             },
-            OperationStatus::InProgress => {
+            (OperationStatus::InProgress, _) => {
                 sleep(POLLING_INTERVAL).await;
                 operation = client.get(&url).await?;
             }
-            OperationStatus::Completed => {
-                return Ok(());
+            (OperationStatus::Completed, _) => {
+                if let Some(message) = original_error {
+                    anyhow::bail!(message)
+                } else {
+                    return Ok(())
+                }
             }
         }
     }