chore(bors): merge pull request #130

130: feat(call-home): use version_info crate to generate git version r=niladrih a=niladrih This ports the changes from #125 for release/2.0 branch Co-authored-by: Niladri Halder <[email protected]>
openebs · Mar 10, 2023 · f673649 · f673649
2 parents e582d1b + 701b0d4
commit f673649
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/call-home/Cargo.toml b/call-home/Cargo.toml
@@ -31,4 +31,5 @@ reqwest-retry = "0.1.5"
 chrono = "0.4.22"
 rand = "0.8.5"
 mktemp = "0.4.1"
-humantime = "2.1.0"
+humantime = "2.1.0"
+utils = { path = "../dependencies/control-plane/utils/utils-lib" }
diff --git a/call-home/src/common/constants.rs b/call-home/src/common/constants.rs
@@ -2,6 +2,7 @@ use std::{
     env,
     path::{Path, PathBuf},
 };
+use utils::version_info;
 
 /// PRODUCT is the name of the project for which this call-home component is deployed.
 pub(crate) const PRODUCT: &str = "Mayastor";
@@ -63,5 +64,11 @@ pub(crate) fn call_home_frequency() -> std::time::Duration {
         .unwrap()
 }
 
-/// Release version
-pub(crate) const RELEASE_VERSION: &str = "2.0.1";
+/// Returns the git tag version (if tag is found) or simply returns the commit hash (12 characters).
+pub(crate) fn release_version() -> String {
+    let version_info = version_info!();
+    match version_info.version_tag {
+        Some(tag) => tag,
+        None => version_info.commit_hash,
+    }
+}
diff --git a/call-home/src/main.rs b/call-home/src/main.rs
@@ -18,9 +18,10 @@ use tokio::time::sleep;
 use tracing::{error, info};
 use tracing_subscriber::EnvFilter;
 use url::Url;
+use utils::{package_description, version_info_str};
 
 #[derive(Parser)]
-#[clap(author, version, about)]
+#[clap(name = package_description!(), version = version_info_str!())]
 struct CliArgs {
     /// An URL endpoint to the control plane's rest endpoint.
     #[clap(short, long, default_value = "http://mayastor-api-rest:8081")]
@@ -50,7 +51,7 @@ async fn main() {
 
 async fn run() -> anyhow::Result<()> {
     let args = CliArgs::args();
-    let version = RELEASE_VERSION.to_string();
+    let version = release_version();
     let endpoint = args.endpoint;
     let namespace = digest(args.namespace);
 

diff --git a/call-home/src/transmitter/client.rs b/call-home/src/transmitter/client.rs
@@ -40,7 +40,7 @@ impl Receiver {
             .client
             .post(&self.url)
             .header("CAStor-Cluster-Id", &self.cluster_id)
-            .header("CAStor-Version", RELEASE_VERSION)
+            .header("CAStor-Version", release_version())
             .header("CAStor-Report-Type", "health_report")
             .header("CAStor-Product", PRODUCT)
             .header("CAStor-Time", Utc::now().to_string())