chore: update examples API usage (#17)

Author: rsfreitas

examples/apps/http/src/main.rs

@@ -27,12 +27,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .route("/one", get(handler_one))
         .route("/two", get(handler_two));
 
-    let svc = ServiceBuilder::default().http(api).build();
+    let mut svc = ServiceBuilder::default()
+        .http(api)
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
-
-    Ok(())
+    Ok(svc.start().await?)
 }

examples/apps/http_with_lifecycle/src/main.rs

@@ -68,14 +68,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .route("/two", get(handler_two));
 
     let state = Arc::new(Mutex::new(AppState::default()));
-    let svc = ServiceBuilder::default()
+    let mut svc = ServiceBuilder::default()
         .http_with_lifecycle(api, state.clone())
-        .build();
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
-
-    Ok(())
+    Ok(svc.start().await?)
 }

examples/apps/http_with_lifecycle_and_state/src/main.rs

@@ -68,14 +68,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .route("/two", get(handler_two));
 
     let state = Arc::new(Mutex::new(AppState::default()));
-    let svc = ServiceBuilder::default()
+    let mut svc = ServiceBuilder::default()
         .http_with_lifecycle_and_state(api, state.clone(), state.clone())
-        .build();
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
-
-    Ok(())
+    Ok(svc.start().await?)
 }

examples/apps/http_with_protobuf/src/api/router.rs

@@ -180,10 +180,10 @@ async fn create_card(
     // Adds mikros context inside the request for the wrapper to also access it.
     request.extensions_mut().insert(context.clone());
 
+    // Translates the wrapper response into the endpoint response.
     match router.wrapper.create_card(request).await {
         Ok(response) => Ok(Json(response.into_inner().into())),
         Err(error) => {
-            // Translates the wrapper error into the endpoint response.
             let e: merrors::ServiceError = error.into();
             Err(e.into())
         }
@@ -211,8 +211,13 @@ async fn get_card(
     request.extensions_mut().insert(context.clone());
 
     // Translates the wrapper response into the endpoint response.
-    let res = router.wrapper.get_card(request).await?;
-    Ok(Json(res.into_inner().into()))
+    match router.wrapper.get_card(request).await {
+        Ok(response) => Ok(Json(response.into_inner().into())),
+        Err(error) => {
+            let e: merrors::ServiceError = error.into();
+            Err(e.into())
+        }
+    }
 }
 
 #[derive(Deserialize)]
@@ -245,8 +250,13 @@ async fn update_card(
     request.extensions_mut().insert(context.clone());
 
     // Translates the wrapper response into the endpoint response.
-    let res = router.wrapper.update_card(request).await?;
-    Ok(Json(res.into_inner().into()))
+    match router.wrapper.update_card(request).await {
+        Ok(response) => Ok(Json(response.into_inner().into())),
+        Err(error) => {
+            let e: merrors::ServiceError = error.into();
+            Err(e.into())
+        }
+    }
 }
 
 async fn delete_card(
@@ -270,8 +280,13 @@ async fn delete_card(
     request.extensions_mut().insert(context.clone());
 
     // Translates the wrapper response into the endpoint response.
-    let res = router.wrapper.delete_card(request).await?;
-    Ok(Json(res.into_inner().into()))
+    match router.wrapper.delete_card(request).await {
+        Ok(response) => Ok(Json(response.into_inner().into())),
+        Err(error) => {
+            let e: merrors::ServiceError = error.into();
+            Err(e.into())
+        }
+    }
 }
 
 #[derive(Clone)]

examples/apps/http_with_state/src/main.rs

@@ -50,14 +50,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .route("/two", get(handler_two));
 
     let state = Arc::new(Mutex::new(AppState::default()));
-    let svc = ServiceBuilder::default()
+    let mut svc = ServiceBuilder::default()
         .http_with_state(api, state.clone())
-        .build();
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
-
-    Ok(())
+    Ok(svc.start().await?)
 }

examples/apps/native/src/main.rs

@@ -4,15 +4,12 @@ use mikros::service::builder::ServiceBuilder;
 use service::Service as AppService;
 
 #[tokio::main]
-async fn main() {
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let s = AppService::new();
-    let svc = ServiceBuilder::default()
+    let mut svc = ServiceBuilder::default()
         .native(Box::new(s))
         .with_features(vec![simple_api::new(), example::new()])
-        .build();
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
+    Ok(svc.start().await?)
 }

examples/apps/script/src/main.rs

@@ -4,15 +4,12 @@ use mikros::service::builder::ServiceBuilder;
 use service::Service as AppService;
 
 #[tokio::main]
-async fn main() {
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let s = AppService::new();
-    let svc = ServiceBuilder::default()
+    let mut svc = ServiceBuilder::default()
         .script(Box::new(s))
         .with_features(vec![example::new()])
-        .build();
+        .build()?;
 
-    match svc {
-        Ok(mut svc) => svc.start().await,
-        Err(e) => panic!("{}", e.to_string()),
-    }
+    Ok(svc.start().await?)
 }

examples/services/cronjob/src/lib.rs

@@ -1,5 +1,6 @@
 pub mod builder;
 
+use std::collections::HashMap;
 use std::sync::Arc;
 
 use mikros::definition::ServiceKind;
@@ -55,7 +56,7 @@ impl plugin::service::Service for Cronjob {
         }
     }
 
-    fn initialize(&mut self, _envs: Arc<Env>, definitions: Arc<mikros::definition::Definitions>) -> merrors::Result<()> {
+    fn initialize(&mut self, definitions: Arc<mikros::definition::Definitions>, _envs: Arc<Env>, _: HashMap<String, serde_json::Value>) -> merrors::Result<()> {
         self.definitions = definitions.load_service(self.kind())?;
         if self.definitions.is_none() {
             // TODO: return error here

src/service/context.rs

@@ -125,7 +125,7 @@ macro_rules! link_grpc_service {
             let url = $context.client_connection_url($client_name);
             match $client::connect(url).await {
                 Ok(c) => c,
-                Err(e) => return Err(mikros::errors::Error::Custom($client_name.to_string(), e.to_string()))
+                Err(e) => return Err(mikros::errors::Error::Custom(e.to_string()))
             }
         }
     };