diff options
author | Toby Vincent <tobyv13@gmail.com> | 2022-03-18 16:39:34 -0500 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2022-03-18 16:39:34 -0500 |
commit | 8858295736b507825f279f51303ab6e9f939f423 (patch) | |
tree | 381280272427429287f60c4276b9b6d68f31091c | |
parent | 746b7a438d5a61a31bfa60f9310b502dc0e980af (diff) |
fix: remove default endpoint
-rw-r--r-- | zone/src/lib.rs | 7 | ||||
-rw-r--r-- | zone_core/src/lib.rs | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/zone/src/lib.rs b/zone/src/lib.rs index 5b5f5ef..e187fa6 100644 --- a/zone/src/lib.rs +++ b/zone/src/lib.rs @@ -5,7 +5,7 @@ use log::LevelFilter; use reqwest::Url; use std::{ffi::OsString, io, process::Command}; use tabled::{Style, Table}; -use zone_core::{Container, DEFAULT_ENDPOINT}; +use zone_core::Container; #[derive(Debug, Parser)] #[clap(about, version)] @@ -27,10 +27,9 @@ pub struct Cli { long, env = "ZONE_ENDPOINT", value_name = "ZONE_ENDPOINT", - default_value = DEFAULT_ENDPOINT, value_hint = ValueHint::Url, )] - endpoint: String, + pub endpoint: Url, #[clap(subcommand)] pub command: Commands, @@ -118,7 +117,7 @@ impl Cli { } fn list(&self, query: &Option<String>) -> Result<Option<String>> { - let mut url = Url::parse(&self.endpoint).context("Invalid zone endpoint")?; + let mut url = self.endpoint.to_owned(); url.set_path("containers/list"); url.set_query(query.as_deref()); diff --git a/zone_core/src/lib.rs b/zone_core/src/lib.rs index f5a97f4..163b8eb 100644 --- a/zone_core/src/lib.rs +++ b/zone_core/src/lib.rs @@ -11,8 +11,6 @@ use strum_macros::{Display, EnumString}; use tabled::Tabled; use zone_zfs::FileSystem; -pub static DEFAULT_ENDPOINT: &str = "127.0.0.1:8000"; - pub trait PartialEqOrDefault { fn eq_or_default(&self, other: &Self) -> bool; } |