fix: alex comments

rik-org · Mar 29, 2023 · 86ef7f9 · 86ef7f9
1 parent dd2c423
commit 86ef7f9
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 1,633 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/controller/src/core/instance.rs b/controller/src/core/instance.rs
@@ -1,7 +1,7 @@
 use crate::api::ApiChannel;
 use definition::workload::{Spec, WorkloadKind};
+use definition::InstanceStatus;
 use names::{Generator, Name};
-use proto::InstanceStatus;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone)]

diff --git a/controller/src/core/instance_service.rs b/controller/src/core/instance_service.rs
@@ -5,12 +5,12 @@ use crate::core::instance_repository::InstanceRepositoryImpl;
 use crate::core::{with_backoff, InstanceRepository, InstanceService, Listener};
 use async_trait::async_trait;
 use definition::workload::{WorkloadDefinition, WorkloadKind};
+use definition::InstanceStatus;
 use dotenv::dotenv;
 use proto::common::worker_status::Status;
 use proto::common::InstanceMetric;
 use proto::controller::controller_client::ControllerClient;
 use proto::controller::WorkloadScheduling;
-use proto::InstanceStatus;
 use rand::Rng;
 use std::net::SocketAddr;
 use std::ops::Range;

diff --git a/crates/definition/src/lib.rs b/crates/definition/src/lib.rs
@@ -1,3 +1,7 @@
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+
 pub mod workload {
     use serde::{Deserialize, Serialize};
     use std::fmt::Display;
@@ -129,3 +133,57 @@ pub mod workload {
         }
     }
 }
+
+#[derive(Serialize, Deserialize, Clone)]
+pub enum InstanceStatus {
+    Unknown(String),
+    Pending,
+    Running,
+    Failed,
+    Terminated,
+    Creating,
+    Destroying,
+}
+
+impl Display for InstanceStatus {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            InstanceStatus::Unknown(_) => write!(f, "Unknown"),
+            InstanceStatus::Pending => write!(f, "Pending"),
+            InstanceStatus::Running => write!(f, "Running"),
+            InstanceStatus::Failed => write!(f, "Failed"),
+            InstanceStatus::Terminated => write!(f, "Terminated"),
+            InstanceStatus::Creating => write!(f, "Creating"),
+            InstanceStatus::Destroying => write!(f, "Destroying"),
+        }
+    }
+}
+
+impl From<InstanceStatus> for i32 {
+    fn from(value: InstanceStatus) -> Self {
+        match value {
+            InstanceStatus::Unknown(_) => 0,
+            InstanceStatus::Pending => 1,
+            InstanceStatus::Running => 2,
+            InstanceStatus::Failed => 3,
+            InstanceStatus::Terminated => 4,
+            InstanceStatus::Creating => 5,
+            InstanceStatus::Destroying => 6,
+        }
+    }
+}
+
+impl From<i32> for InstanceStatus {
+    fn from(value: i32) -> Self {
+        match value {
+            0 => InstanceStatus::Unknown(String::from("")),
+            1 => InstanceStatus::Pending,
+            2 => InstanceStatus::Running,
+            3 => InstanceStatus::Failed,
+            4 => InstanceStatus::Terminated,
+            5 => InstanceStatus::Creating,
+            6 => InstanceStatus::Destroying,
+            _ => InstanceStatus::Unknown(String::from("")),
+        }
+    }
+}
diff --git a/proto/Cargo.toml b/proto/Cargo.toml
@@ -10,5 +10,9 @@ prost.workspace = true
 tonic.workspace = true
 protobuf.workspace = true
 
+[dependencies.definition]
+path = "../crates/definition"
+
 [build-dependencies]
 tonic-build.workspace = true
+
diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -1,7 +1,5 @@
-use std::fmt::Display;
-
 use common::{worker_status::Status, InstanceMetric, ResourceStatus, WorkloadRequestKind};
-use serde::{Deserialize, Serialize};
+use definition::InstanceStatus;
 use std::ops::Deref;
 pub mod common {
     tonic::include_proto!("common");
@@ -38,31 +36,6 @@ impl From<i32> for ResourceStatus {
     }
 }
 
-#[derive(Serialize, Deserialize, Clone)]
-pub enum InstanceStatus {
-    Unknown(String),
-    Pending,
-    Running,
-    Failed,
-    Terminated,
-    Creating,
-    Destroying,
-}
-
-impl Display for InstanceStatus {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            InstanceStatus::Unknown(_) => write!(f, "Unknown"),
-            InstanceStatus::Pending => write!(f, "Pending"),
-            InstanceStatus::Running => write!(f, "Running"),
-            InstanceStatus::Failed => write!(f, "Failed"),
-            InstanceStatus::Terminated => write!(f, "Terminated"),
-            InstanceStatus::Creating => write!(f, "Creating"),
-            InstanceStatus::Destroying => write!(f, "Destroying"),
-        }
-    }
-}
-
 impl From<ResourceStatus> for InstanceStatus {
     fn from(value: ResourceStatus) -> Self {
         match value {
@@ -77,35 +50,6 @@ impl From<ResourceStatus> for InstanceStatus {
     }
 }
 
-impl From<InstanceStatus> for i32 {
-    fn from(value: InstanceStatus) -> Self {
-        match value {
-            InstanceStatus::Unknown(_) => 0,
-            InstanceStatus::Pending => 1,
-            InstanceStatus::Running => 2,
-            InstanceStatus::Failed => 3,
-            InstanceStatus::Terminated => 4,
-            InstanceStatus::Creating => 5,
-            InstanceStatus::Destroying => 6,
-        }
-    }
-}
-
-impl From<i32> for InstanceStatus {
-    fn from(value: i32) -> Self {
-        match value {
-            0 => InstanceStatus::Unknown(String::from("")),
-            1 => InstanceStatus::Pending,
-            2 => InstanceStatus::Running,
-            3 => InstanceStatus::Failed,
-            4 => InstanceStatus::Terminated,
-            5 => InstanceStatus::Creating,
-            6 => InstanceStatus::Destroying,
-            _ => InstanceStatus::Unknown(String::from("")),
-        }
-    }
-}
-
 pub extern crate protobuf;
 
 pub enum WorkloadAction {