server: add CompletedWithWarnings return type

Author: shiyasmohd

core/graphman/src/commands/deployment/reassign.rs

@@ -82,7 +82,7 @@ pub fn reassign_deployment(
 
     if changes.is_empty() {
         return Err(ReassignDeploymentError::AlreadyAssigned(
-            deployment.locator.hash.to_string(),
+            deployment.locator.to_string(),
             node.to_string(),
         ));
     }

core/graphman/src/commands/deployment/unassign.rs

@@ -51,10 +51,9 @@ pub fn load_assigned_deployment(
         .map_err(GraphmanError::from)?
     {
         Some(_) => Ok(AssignedDeployment { site }),
-        None => Err(UnassignDeploymentError::AlreadyUnassigned(format!(
-            "{}",
-            deployment.as_str()
-        ))),
+        None => Err(UnassignDeploymentError::AlreadyUnassigned(
+            locator.to_string(),
+        )),
     }
 }
 

core/graphman/src/deployment.rs

@@ -31,19 +31,6 @@ pub enum DeploymentSelector {
     All,
 }
 
-impl DeploymentSelector {
-    pub fn as_str(&self) -> String {
-        match self {
-            DeploymentSelector::Name(name) => name.clone(),
-            DeploymentSelector::Subgraph { hash, shard } => {
-                format!("[Hash:{}, Shard:{:?}]", hash, shard)
-            }
-            DeploymentSelector::Schema(schema) => schema.clone(),
-            DeploymentSelector::All => "All".to_string(),
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 pub enum DeploymentVersionSelector {
     Current,

server/graphman/src/entities/mod.rs

@@ -9,8 +9,8 @@ mod deployment_version_selector;
 mod empty_response;
 mod execution;
 mod execution_id;
-mod response;
 mod subgraph_health;
+mod warning_response;
 
 pub use self::block_hash::BlockHash;
 pub use self::block_number::BlockNumber;
@@ -23,5 +23,5 @@ pub use self::deployment_version_selector::DeploymentVersionSelector;
 pub use self::empty_response::EmptyResponse;
 pub use self::execution::Execution;
 pub use self::execution_id::ExecutionId;
-pub use self::response::Response;
 pub use self::subgraph_health::SubgraphHealth;
+pub use self::warning_response::CompletedWithWarnings;

server/graphman/src/entities/response.rs

@@ -0,0 +1,13 @@
+use async_graphql::SimpleObject;
+
+#[derive(Clone, Debug, SimpleObject)]
+pub struct CompletedWithWarnings {
+    pub warnings: Vec<String>,
+}
+
+impl CompletedWithWarnings {
+    /// Returns a response with success & message.
+    pub fn new(msg: Vec<String>) -> Self {
+        Self { warnings: msg }
+    }
+}

server/graphman/src/entities/warning_response.rs

@@ -4,14 +4,15 @@ use anyhow::anyhow;
 use async_graphql::Context;
 use async_graphql::Object;
 use async_graphql::Result;
+use async_graphql::Union;
 use graph::prelude::NodeId;
 use graph_store_postgres::command_support::catalog;
 use graph_store_postgres::graphman::GraphmanStore;
 
+use crate::entities::CompletedWithWarnings;
 use crate::entities::DeploymentSelector;
 use crate::entities::EmptyResponse;
 use crate::entities::ExecutionId;
-use crate::entities::Response;
 use crate::resolvers::context::GraphmanContext;
 
 mod create;
@@ -24,6 +25,12 @@ mod unassign;
 
 pub struct DeploymentMutation;
 
+#[derive(Clone, Debug, Union)]
+pub enum ReassignResponse {
+    EmptyResponse(EmptyResponse),
+    CompletedWithWarnings(CompletedWithWarnings),
+}
+
 /// Mutations related to one or multiple deployments.
 #[Object]
 impl DeploymentMutation {
@@ -93,16 +100,13 @@ impl DeploymentMutation {
         &self,
         ctx: &Context<'_>,
         deployment: DeploymentSelector,
-    ) -> Result<Response> {
+    ) -> Result<EmptyResponse> {
         let ctx = GraphmanContext::new(ctx)?;
         let deployment = deployment.try_into()?;
 
         unassign::run(&ctx, &deployment)?;
 
-        Ok(Response::new(
-            true,
-            format!("Unassigned {}", deployment.as_str()),
-        ))
+        Ok(EmptyResponse::new())
     }
 
     /// Assign or reassign a deployment
@@ -111,7 +115,7 @@ impl DeploymentMutation {
         ctx: &Context<'_>,
         deployment: DeploymentSelector,
         node: String,
-    ) -> Result<Response> {
+    ) -> Result<ReassignResponse> {
         let ctx = GraphmanContext::new(ctx)?;
         let deployment = deployment.try_into()?;
         let node = NodeId::new(node.clone()).map_err(|()| anyhow!("illegal node id `{}`", node))?;
@@ -120,12 +124,12 @@ impl DeploymentMutation {
         let mirror = catalog::Mirror::primary_only(ctx.primary_pool);
         let count = mirror.assignments(&node)?.len();
         if count == 1 {
-            Ok(Response::new(true,format!("warning: this is the only deployment assigned to '{}'. Are you sure it is spelled correctly?",node.as_str())))
-        } else {
-            Ok(Response::new(
-                true,
-                format!("Ressigned {} to {}", deployment.as_str(), node.as_str()),
+            let warning_msg = format!("warning: this is the only deployment assigned to '{}'. Are you sure it is spelled correctly?",node.as_str());
+            Ok(ReassignResponse::CompletedWithWarnings(
+                CompletedWithWarnings::new(vec![warning_msg]),
             ))
+        } else {
+            Ok(ReassignResponse::EmptyResponse(EmptyResponse::new()))
         }
     }
 }