refactor: use ExitNodeStatus::new constructor

Author: korewaChino

src/cloud/aws.rs

@@ -206,13 +206,21 @@ impl Provisioner for AWSProvisioner {
             }
         };
 
-        let exit_node = ExitNodeStatus {
-            name: name.clone(),
-            ip: public_ip,
-            id: Some(instance.instance_id.unwrap()),
-            provider: provisioner.clone(),
-            service_binding: vec![],
-        };
+        // let exit_node = ExitNodeStatus {
+        //     name: name.clone(),
+        //     ip: public_ip,
+        //     id: Some(instance.instance_id.unwrap()),
+        //     provider: provisioner.clone(),
+        //     service_binding: vec![],
+        // };
+        let exit_node = ExitNodeStatus::new(
+            provisioner.clone(),
+            name.clone(),
+            public_ip,
+            // needless conversion?
+            // todo: Clean this up, minor performance hit
+            instance.instance_id.map(|id| id.to_string()).as_deref(),
+        );
 
         Ok(exit_node)
     }

src/cloud/digitalocean.rs

@@ -131,13 +131,12 @@ impl Provisioner for DigitalOceanProvisioner {
             }
         };
 
-        let exit_node = ExitNodeStatus {
-            name: name.clone(),
-            ip: droplet_ip.clone(),
-            id: Some(droplet.id.to_string()),
-            provider: provisioner.clone(),
-            service_binding: vec![],
-        };
+        let exit_node = ExitNodeStatus::new(
+            provisioner.clone(),
+            name.clone(),
+            droplet_ip.clone(),
+            Some(&droplet_id),
+        );
 
         Ok(exit_node)
     }

src/cloud/linode.rs

@@ -111,13 +111,20 @@ impl Provisioner for LinodeProvisioner {
             }
         };
 
-        let status = ExitNodeStatus {
-            ip: instance_ip,
-            name: instance.label,
-            provider: provisioner.to_string(),
-            id: Some(instance.id.to_string()),
-            service_binding: vec![],
-        };
+        // let status = ExitNodeStatus {
+        //     ip: instance_ip,
+        //     name: instance.label,
+        //     provider: provisioner.to_string(),
+        //     id: Some(instance.id.to_string()),
+        //     service_binding: vec![],
+        // };
+
+        let status = ExitNodeStatus::new(
+            instance_ip,
+            instance.label,
+            provisioner.to_string(),
+            Some(&instance.id.to_string()),
+        );
 
         Ok(status)
     }

src/ops.rs

@@ -145,6 +145,16 @@ impl ExitNodeStatus {
             .find(|svc| svc.namespace == namespace && svc.name == name)
             .cloned()
     }
+
+    pub fn new(provider: String, name: String, ip: String, id: Option<&str>) -> Self {
+        Self {
+            provider,
+            name,
+            ip,
+            id: None,
+            service_binding: vec![],
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]