chore: common util for urls

Author: pxseu

src/commands/deploy/mod.rs

@@ -6,7 +6,6 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
-use console::style;
 use hyper::Method;
 use reqwest::multipart::{Form, Part};
 use tokio::fs;
@@ -28,6 +27,7 @@ use crate::commands::ignite::util::{create_deployment, rollout, update_deploymen
 use crate::commands::projects::util::format_project;
 use crate::state::State;
 use crate::store::hopfile::HopFile;
+use crate::utils::urlify;
 
 const HOP_BUILD_BASE_URL: &str = "https://builder.hop.io/v1";
 const HOP_REGISTRY_URL: &str = "registry.hop.io";
@@ -201,7 +201,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
                 if gateway.type_ == GatewayType::External {
                     log::info!(
                         "Your deployment will be accesible via {}",
-                        style(gateway.full_url()).underlined().bold()
+                        urlify(&gateway.full_url())
                     );
                 }
             }
@@ -297,7 +297,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
                 println!();
                 panic!(
                     "Push failed, for help contact us on {} and mention the deployment id: {}",
-                    style("https://discord.gg/hop").underlined().bold(),
+                    urlify("https://discord.gg/hop"),
                     deployment.id
                 );
             }
@@ -321,12 +321,10 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
 
     log::info!(
         "Deployed successfuly, you can find it at: {}",
-        style(format!(
+        urlify(&format!(
             "{}{}?project={}",
             WEB_DEPLOYMENTS_URL, deployment.id, project.namespace
         ))
-        .underlined()
-        .bold()
     );
 
     Ok(())

src/commands/gateways/create.rs

@@ -1,12 +1,12 @@
 use anyhow::{ensure, Result};
 use clap::Parser;
-use console::style;
 
 use super::types::{GatewayProtocol, GatewayType};
 use crate::commands::gateways::types::GatewayConfig;
 use crate::commands::gateways::util::{create_gateway, update_gateway_config};
 use crate::commands::ignite::util::{format_deployments, get_all_deployments};
 use crate::state::State;
+use crate::utils::urlify;
 
 #[derive(Debug, Parser, Default, PartialEq)]
 pub struct GatewayOptions {
@@ -72,7 +72,7 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
     if gateway.type_ == GatewayType::External {
         log::info!(
             "You can now access your app at {}",
-            style(gateway.full_url()).underlined().bold()
+            urlify(&gateway.full_url())
         );
     }
 

src/commands/ignite/create.rs

@@ -1,13 +1,13 @@
 use anyhow::Result;
 use clap::Parser;
-use console::style;
 
 use super::types::{Env, RamSizes, ScalingStrategy};
 use crate::commands::containers::types::ContainerType;
 use crate::commands::containers::utils::create_containers;
 use crate::commands::ignite::types::Deployment;
 use crate::commands::ignite::util::{create_deployment, update_deployment_config};
 use crate::state::State;
+use crate::utils::urlify;
 
 pub const WEB_DEPLOYMENTS_URL: &str = "https://console.hop.io/ignite/deployment/";
 
@@ -115,12 +115,10 @@ pub async fn handle(options: Options, state: State) -> Result<()> {
 
     log::info!(
         "Deployed successfuly, you can find it at: {}",
-        style(format!(
+        urlify(&format!(
             "{}{}?project={}",
             WEB_DEPLOYMENTS_URL, deployment.id, project.namespace
         ))
-        .underlined()
-        .bold()
     );
 
     Ok(())

src/commands/update/mod.rs

@@ -4,6 +4,7 @@ pub mod util;
 
 use anyhow::Result;
 use clap::Parser;
+use tokio::fs;
 
 use self::types::Version;
 use self::util::{
@@ -42,7 +43,10 @@ pub async fn handle(options: Options, mut state: State) -> Result<()> {
         .expect("Failed to download");
 
     // unpack the new release
-    let unpacked = unpack(packed_temp).await?;
+    let unpacked = unpack(packed_temp.clone()).await?;
+
+    // remove the tarball since it's no longer needed
+    fs::remove_file(packed_temp).await?;
 
     let mut non_elevated_args: Vec<String> = vec![];
     let mut elevated_args: Vec<String> = vec![];

src/utils.rs

@@ -5,6 +5,7 @@ use std::{
 };
 
 use chrono::{DateTime, Utc};
+use console::style;
 use fern::colors::{Color, ColoredLevelConfig};
 use log::{Level, LevelFilter};
 use ms::{__to_string__, ms};
@@ -147,3 +148,7 @@ pub async fn in_path(program: &str) -> bool {
 
     false
 }
+
+pub fn urlify(s: &str) -> String {
+    style(s).bold().underlined().to_string()
+}