ci: green

deployer/src/deployment/deploy_layer.rs

@@ -586,7 +586,7 @@ mod tests {
         };
 
         select! {
-            _ = sleep(Duration::from_secs(120)) => {
+            _ = sleep(Duration::from_secs(180)) => {
                 panic!("states should go into 'Running' for a valid service");
             }
             _ = test => {}
@@ -710,7 +710,7 @@ mod tests {
         };
 
         select! {
-            _ = sleep(Duration::from_secs(120)) => {
+            _ = sleep(Duration::from_secs(180)) => {
                 panic!("states should go into 'Completed' when a service stops by itself");
             }
             _ = test => {}
@@ -790,7 +790,7 @@ mod tests {
         };
 
         select! {
-            _ = sleep(Duration::from_secs(120)) => {
+            _ = sleep(Duration::from_secs(180)) => {
                 panic!("states should go into 'Crashed' panicing in bind");
             }
             _ = test => {}
@@ -865,7 +865,7 @@ mod tests {
         };
 
         select! {
-            _ = sleep(Duration::from_secs(120)) => {
+            _ = sleep(Duration::from_secs(180)) => {
                 panic!("states should go into 'Crashed' when panicing in main");
             }
             _ = test => {}

deployer/src/persistence/log.rs

@@ -100,14 +100,9 @@ fn extract_message(fields: &Value) -> Option<String> {
             return Some(message.as_str()?.to_string());
         }
 
-        if let Some(message) = map.get("message") {
-            match message {
-                Value::Object(message_object) => {
-                    if let Some(rendered) = message_object.get("rendered") {
-                        return Some(rendered.as_str()?.to_string());
-                    }
-                }
-                _ => {}
+        if let Some(Value::Object(message_object)) = map.get("message") {
+            if let Some(rendered) = message_object.get("rendered") {
+                return Some(rendered.as_str()?.to_string());
             }
         }
     }

resources/persist/Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["shuttle-service", "persistence"]
 async-trait = "0.1.56"
 bincode = "1.2.1"
 serde = { version = "1.0.0", features = ["derive"] }
-shuttle-common = { path = "../../common", version = "0.7.2" }
+shuttle-common = { path = "../../common", version = "0.7.2", default-features = false }
 shuttle-service = { path = "../../service", version = "0.7.2", default-features = false }
 thiserror = "1.0.32"
 tokio = { version = "1.19.2", features = ["rt"] }