From 018cd100022e1a3891dbb497b363c046ea731789 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Thu, 8 Dec 2022 12:28:43 +0530 Subject: [PATCH 1/2] Update the URL for checking for new releases --- server/Cargo.toml | 2 +- server/build.rs | 7 +++++-- server/src/banner.rs | 14 +++++++------- server/src/utils.rs | 17 +++++++++-------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/server/Cargo.toml b/server/Cargo.toml index a12487bc5..244b9a20a 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -59,7 +59,7 @@ static-files = "0.2.1" cargo_toml = "0.12.4" ureq = "2.5.0" sha1_smol = { version = "1.0.0", features = ["std"] } -vergen = { version = "7.4.2", features = ["build", "git"] } +vergen = { version = "7.4.2", features = ["build", "git", "cargo"] } zip = { version = "0.6.3", default_features = false, features = ["deflate"] } [dev-dependencies] diff --git a/server/build.rs b/server/build.rs index f52aa6ae7..c81e4384f 100644 --- a/server/build.rs +++ b/server/build.rs @@ -16,11 +16,14 @@ * */ -use vergen::{vergen, Config}; +use vergen::{vergen, Config, ShaKind,}; fn main() { // Init vergen - if let Err(e) = vergen(Config::default()) { + let mut config = Config::default(); + *config.git_mut().sha_kind_mut() = ShaKind::Short; + + if let Err(e) = vergen(config) { println!( "cargo:warning=initializing vergen failed due to error: {}", e diff --git a/server/src/banner.rs b/server/src/banner.rs index d68cfdcad..739e02e51 100644 --- a/server/src/banner.rs +++ b/server/src/banner.rs @@ -70,7 +70,7 @@ pub mod version { // print current version let current = current(); - match current { + match current.0 { ParseableVersion::Version(current_version) => { // not eprintln because if it is old release then time passed with be displayed beside it eprint!( @@ -118,9 +118,9 @@ pub mod version { } } - pub fn current() -> ParseableVersion { + pub fn current() -> (ParseableVersion, String) { let build_semver = env!("VERGEN_BUILD_SEMVER"); - + let sha_hash = env!("VERGEN_GIT_SHA_SHORT"); let mut git_semver = env!("VERGEN_GIT_SEMVER"); if &git_semver[..1] == "v" { @@ -128,15 +128,15 @@ pub mod version { } if build_semver == git_semver { - ParseableVersion::Version( + (ParseableVersion::Version( semver::Version::parse(build_semver) .expect("VERGEN_BUILD_SEMVER is always valid semver"), - ) + ), sha_hash.to_string()) } else { - ParseableVersion::Prerelease( + ( ParseableVersion::Prerelease( semver::Prerelease::new(git_semver) .expect("VERGEN_GIT_SEMVER is always valid semver"), - ) + ), sha_hash.to_string()) } } diff --git a/server/src/utils.rs b/server/src/utils.rs index e2618e817..c0d144722 100644 --- a/server/src/utils.rs +++ b/server/src/utils.rs @@ -95,7 +95,7 @@ pub mod header_parsing { pub enum ParseHeaderError { #[error("Too many headers received. Limit is of 5 headers")] MaxHeadersLimitExceeded, - #[error("A value passed in header is not formattable to plain visible ASCII")] + #[error("A value passed in header can't be formatted to plain visible ASCII")] InvalidValue, #[error("Invalid Key was passed which terminated just after the end of prefix")] Emptykey, @@ -154,13 +154,14 @@ pub mod update { "Native".to_string() } - // User Agent for Github API call - // Format: Parseable/ (OS; Platform) + // User Agent for Download API call + // Format: Parseable// (OS; Platform) fn user_agent() -> String { let info = os_info::get(); format!( - "Parseable/{} ({}; {})", - current(), + "Parseable/{}/{} ({}; {})", + current().0, + current().1, info.os_type(), is_docker() ) @@ -170,7 +171,7 @@ pub mod update { let agent = ureq::builder().user_agent(user_agent().as_str()).build(); let json: serde_json::Value = agent - .get("https://api.github.com/repos/parseablehq/parseable/releases/latest") + .get("https://download.parseable.io/latest-version") .call()? .into_json()?; @@ -178,11 +179,11 @@ pub mod update { .as_str() .and_then(|ver| ver.strip_prefix('v')) .and_then(|ver| semver::Version::parse(ver).ok()) - .ok_or_else(|| anyhow!("Bad parse when parsing verison"))?; + .ok_or_else(|| anyhow!("Failed parsing version"))?; let date = json["published_at"] .as_str() - .ok_or_else(|| anyhow!("Bad parse when parsing published date"))?; + .ok_or_else(|| anyhow!("Failed parsing published date"))?; let date = chrono::DateTime::parse_from_rfc3339(date) .expect("date-time from github is in rfc3339 format") From b1a8aeadb0b39d7e62acb7f5bb30206f32fce916 Mon Sep 17 00:00:00 2001 From: Nitish Tiwari Date: Thu, 8 Dec 2022 12:31:26 +0530 Subject: [PATCH 2/2] Fix fmt --- server/build.rs | 2 +- server/src/banner.rs | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/server/build.rs b/server/build.rs index c81e4384f..041a8ea01 100644 --- a/server/build.rs +++ b/server/build.rs @@ -16,7 +16,7 @@ * */ -use vergen::{vergen, Config, ShaKind,}; +use vergen::{vergen, Config, ShaKind}; fn main() { // Init vergen diff --git a/server/src/banner.rs b/server/src/banner.rs index 739e02e51..5345dca85 100644 --- a/server/src/banner.rs +++ b/server/src/banner.rs @@ -128,15 +128,21 @@ pub mod version { } if build_semver == git_semver { - (ParseableVersion::Version( - semver::Version::parse(build_semver) - .expect("VERGEN_BUILD_SEMVER is always valid semver"), - ), sha_hash.to_string()) + ( + ParseableVersion::Version( + semver::Version::parse(build_semver) + .expect("VERGEN_BUILD_SEMVER is always valid semver"), + ), + sha_hash.to_string(), + ) } else { - ( ParseableVersion::Prerelease( - semver::Prerelease::new(git_semver) - .expect("VERGEN_GIT_SEMVER is always valid semver"), - ), sha_hash.to_string()) + ( + ParseableVersion::Prerelease( + semver::Prerelease::new(git_semver) + .expect("VERGEN_GIT_SEMVER is always valid semver"), + ), + sha_hash.to_string(), + ) } }