Add check update flag (#262)

Author: trueleo

server/src/banner.rs

@@ -27,7 +27,7 @@ pub fn print(config: &Config, meta: StorageMetadata) {
     let scheme = config.parseable.get_scheme();
     status_info(config, &scheme, meta.deployment_id);
     storage_info(config);
-    about::print(meta);
+    about::print(config, meta);
     println!();
 }
 
@@ -95,6 +95,7 @@ pub mod about {
     use crossterm::style::Stylize;
     use std::fmt;
 
+    use crate::option::Config;
     use crate::storage::StorageMetadata;
     use crate::utils::update;
 
@@ -114,8 +115,8 @@ pub mod about {
 
     pub fn print_about(
         current_version: semver::Version,
+        latest_release: Option<update::LatestRelease>,
         commit_hash: String,
-        meta: StorageMetadata,
     ) {
         eprint!(
             "
@@ -125,7 +126,7 @@ pub mod about {
             current_version,
         );
 
-        if let Ok(latest_release) = update::get_latest(meta) {
+        if let Some(latest_release) = latest_release {
             if latest_release.version > current_version {
                 print_latest_release(latest_release);
             }
@@ -149,13 +150,18 @@ pub mod about {
         eprint!("{}", fmt_latest_version.red());
     }
 
-    pub fn print(meta: StorageMetadata) {
+    pub fn print(config: &Config, meta: StorageMetadata) {
         // print current version
         let current = current();
+        let latest_release = if config.parseable.check_update {
+            update::get_latest(&meta).ok()
+        } else {
+            None
+        };
 
         match current.0 {
             ParseableVersion::Version(current_version) => {
-                print_about(current_version, current.1, meta);
+                print_about(current_version, latest_release, current.1);
             }
             ParseableVersion::Prerelease(current_prerelease) => {
                 eprintln!(

server/src/option.rs

@@ -187,6 +187,9 @@ pub struct Server {
 
     /// Password for the basic authentication on the server
     pub password: String,
+
+    /// Server should check for update or not
+    pub check_update: bool,
 }
 
 impl FromArgMatches for Server {
@@ -219,6 +222,10 @@ impl FromArgMatches for Server {
             .get_one::<String>(Self::PASSWORD)
             .cloned()
             .expect("default for password");
+        self.check_update = m
+            .get_one::<bool>(Self::CHECK_UPDATE)
+            .cloned()
+            .expect("default for check update");
 
         Ok(())
     }
@@ -233,6 +240,7 @@ impl Server {
     pub const UPLOAD_INTERVAL: &str = "upload-interval";
     pub const USERNAME: &str = "username";
     pub const PASSWORD: &str = "password";
+    pub const CHECK_UPDATE: &str = "check-update";
     pub const DEFAULT_USERNAME: &str = "admin";
     pub const DEFAULT_PASSWORD: &str = "admin";
 
@@ -311,6 +319,16 @@ impl Server {
                     .required(true)
                     .help("Password for the basic authentication on the server"),
             )
+            .arg(
+                Arg::new(Self::CHECK_UPDATE)
+                    .long(Self::CHECK_UPDATE)
+                    .env("P_CHECK_UPDATE")
+                    .value_name("BOOL")
+                    .required(false)
+                    .default_value("true")
+                    .value_parser(value_parser!(bool))
+                    .help("Password for the basic authentication on the server"),
+            )
     }
 }
 

server/src/utils.rs

@@ -145,36 +145,33 @@ pub mod update {
 
     static K8S_ENV_TO_CHECK: &str = "KUBERNETES_SERVICE_HOST";
 
+    #[derive(Debug)]
     pub struct LatestRelease {
         pub version: semver::Version,
         pub date: DateTime<Utc>,
     }
 
-    fn is_docker() -> String {
-        if Path::new("/.dockerenv").exists() {
-            return "Docker".to_string();
-        }
-        "Native".to_string()
+    fn is_docker() -> bool {
+        Path::new("/.dockerenv").exists()
     }
 
-    fn is_k8s() -> String {
-        if env::var(K8S_ENV_TO_CHECK).is_ok() {
-            return "Kubernetes".to_string();
-        }
-        "".to_string()
+    fn is_k8s() -> bool {
+        env::var(K8S_ENV_TO_CHECK).is_ok()
     }
 
-    fn platform() -> String {
-        let mut platform = is_k8s();
-        if platform.is_empty() {
-            platform = is_docker();
+    fn platform() -> &'static str {
+        if is_k8s() {
+            "Kubernetes"
+        } else if is_docker() {
+            "Docker"
+        } else {
+            "Native"
         }
-        platform
     }
 
     // User Agent for Download API call
     // Format: Parseable/<UID>/<version>/<commit_hash> (<OS>; <Platform>)
-    fn user_agent(uid: Ulid) -> String {
+    fn user_agent(uid: &Ulid) -> String {
         let info = os_info::get();
         format!(
             "Parseable/{}/{}/{} ({}; {})",
@@ -186,9 +183,9 @@ pub mod update {
         )
     }
 
-    pub fn get_latest(meta: StorageMetadata) -> Result<LatestRelease, anyhow::Error> {
+    pub fn get_latest(meta: &StorageMetadata) -> Result<LatestRelease, anyhow::Error> {
         let agent = ureq::builder()
-            .user_agent(user_agent(meta.deployment_id).as_str())
+            .user_agent(user_agent(&meta.deployment_id).as_str())
             .timeout(Duration::from_secs(8))
             .build();