Merge pull request #297 from stakwork/feat/swarm-url

Feat/swarm url
stakwork · Sep 12, 2024 · 3795e77 · 3795e77
2 parents 368f47a + db72c1f
commit 3795e77
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/src/bin/super/cmd.rs b/src/bin/super/cmd.rs
@@ -56,6 +56,7 @@ pub struct ChildSwarm {
     pub host: String,
     pub username: String,
     pub token: String,
+    pub default_host: String,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

diff --git a/src/bin/super/mod.rs b/src/bin/super/mod.rs
@@ -169,6 +169,7 @@ pub async fn super_handle(
                     pass: Some("".to_string()),
                     ec2: Some(swarm.instance),
                     note: Some(swarm.description),
+                    default_host: Some("".to_string()),
                 };
 
                 let hm = add_new_swarm_details(&mut state, swarm_detail, &mut must_save_stack);
@@ -185,6 +186,7 @@ pub async fn super_handle(
                             note: Some(swarm.description),
                             user: state.stacks[ui].user.clone(),
                             pass: state.stacks[ui].pass.clone(),
+                            default_host: state.stacks[ui].default_host.clone(),
                         };
                         must_save_stack = true;
                         hm = AddSwarmResponse {
@@ -224,6 +226,7 @@ pub async fn super_handle(
                     pass: Some(c.password),
                     user: Some(c.username),
                     ec2: Some("".to_string()),
+                    default_host: Some(c.default_host),
                 };
                 let hm = add_new_swarm_details(&mut state, swarm_details, &mut must_save_stack);
 

diff --git a/src/bin/super/routes.rs b/src/bin/super/routes.rs
@@ -79,6 +79,7 @@ async fn add_new_swarm(
         username: body.username.clone(),
         password: body.password.clone(),
         token: verify_super_token.token.unwrap(),
+        default_host: body.default_host.clone(),
     }));
 
     let txt = serde_json::to_string(&cmd)?;

diff --git a/src/bin/super/state.rs b/src/bin/super/state.rs
@@ -19,6 +19,7 @@ pub struct RemoteStack {
     pub ec2: Option<String>,
     pub user: Option<String>,
     pub pass: Option<String>,
+    pub default_host: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Default)]
@@ -72,6 +73,7 @@ impl Super {
                 ec2: n.ec2.clone(),
                 user: None,
                 pass: None,
+                default_host: n.default_host.clone(),
             })
             .collect();
         let bots = self

diff --git a/src/bin/super/util.rs b/src/bin/super/util.rs
@@ -36,7 +36,7 @@ pub fn add_new_swarm_details(
 pub async fn login_to_child_swarm(swarm_details: &RemoteStack) -> Result<String, Error> {
     let client = make_reqwest_client();
 
-    let base_route = get_child_base_route(&swarm_details.host);
+    let base_route = get_child_base_route(swarm_details.default_host.clone())?;
     let route = format!("{}/login", base_route);
 
     if let None = &swarm_details.user {
@@ -77,7 +77,7 @@ pub async fn get_child_swarm_config(
     let token = login_to_child_swarm(swarm_details).await?;
     // let res = handle_get_child_swarm_config(&swarm_details.host, &token).await?;
     let cmd = Cmd::Swarm(SwarmCmd::GetConfig);
-    let res = swarm_cmd(cmd, &swarm_details.host, &token).await?;
+    let res = swarm_cmd(cmd, swarm_details.default_host.clone(), &token).await?;
 
     if res.status().clone() != 200 {
         return Err(anyhow!(format!(
@@ -97,24 +97,28 @@ pub async fn get_child_swarm_config(
     })
 }
 
-async fn swarm_cmd(cmd: Cmd, host: &str, token: &str) -> Result<Response, Error> {
-    let url = get_child_base_route(host);
+async fn swarm_cmd(cmd: Cmd, host: Option<String>, token: &str) -> Result<Response, Error> {
+    let url = get_child_base_route(host)?;
     let cmd_res = send_cmd_request(cmd, "SWARM", &url, Some("x-jwt"), Some(&token)).await?;
     Ok(cmd_res)
 }
 
-pub fn get_child_base_route(host: &str) -> String {
-    return format!("https://app.{}/api", host);
+pub fn get_child_base_route(host: Option<String>) -> Result<String, Error> {
+    if host.is_none() {
+        return Err(anyhow!("child swarm default host not provided"));
+    };
+
+    return Ok(format!("https://app.{}/api", host.unwrap()));
 
-    // return format!("http://{}/api", host);
+    // return Ok(format!("http://{}/api", host.unwrap()));
 }
 
 pub async fn get_child_swarm_containers(
     swarm_details: &RemoteStack,
 ) -> Result<SuperSwarmResponse, Error> {
     let token = login_to_child_swarm(swarm_details).await?;
     let cmd = Cmd::Swarm(SwarmCmd::ListContainers);
-    let res = swarm_cmd(cmd, &swarm_details.host, &token).await?;
+    let res = swarm_cmd(cmd, swarm_details.default_host.clone(), &token).await?;
 
     if res.status().clone() != 200 {
         return Err(anyhow!(format!(
@@ -153,7 +157,7 @@ pub async fn access_child_swarm_containers(
             cmd = Cmd::Swarm(SwarmCmd::StopContainer(node.clone()))
         }
 
-        match swarm_cmd(cmd, &swarm_details.host, &token).await {
+        match swarm_cmd(cmd, swarm_details.default_host.clone(), &token).await {
             Ok(res) => {
                 if res.status().clone() != 200 {
                     errors.insert(

diff --git a/src/config.rs b/src/config.rs
@@ -91,6 +91,7 @@ pub struct SendSwarmDetailsBody {
     pub username: String,
     pub password: String,
     pub host: String,
+    pub default_host: String,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]

diff --git a/src/defaults.rs b/src/defaults.rs
@@ -225,16 +225,18 @@ pub fn create_super_user() -> User {
             return;
         }
 
-        //get swarm host
-        let mut my_domain = getenv("NAV_BOLTWALL_SHARED_HOST").unwrap_or("".to_string());
+        let default_host = getenv("HOST").unwrap_or("".to_string());
 
-        if my_domain.is_empty() {
-            my_domain = getenv("HOST").unwrap_or("".to_string())
+        if default_host.is_empty() {
+            log::error!("HOST {}", &error_msg);
+            return;
         }
 
+        //get swarm host
+        let mut my_domain = getenv("NAV_BOLTWALL_SHARED_HOST").unwrap_or("".to_string());
+
         if my_domain.is_empty() {
-            log::error!("HOST {}", &error_msg);
-            return;
+            my_domain = default_host.clone();
         }
 
         let client = make_reqwest_client();
@@ -245,6 +247,7 @@ pub fn create_super_user() -> User {
             username: "super".to_string(),
             password: password_,
             host: my_domain,
+            default_host: default_host,
         };
 
         match client