Merge branch 'sat-ic-admin-version-newline-trim' into 'main'

fix(cli): Ensure ic-admin version string does not have a newline See merge request dfinity-lab/core/release!781
dfinity · Jul 5, 2023 · 193b45a · 193b45a
2 parents f194640 + 1d8291c
commit 193b45a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/rs/cli/src/ic_admin.rs b/rs/cli/src/ic_admin.rs
@@ -721,7 +721,10 @@ impl Cli {
 
 /// Returns a path to downloaded ic-admin binary
 async fn download_ic_admin(version: Option<String>) -> Result<String> {
-    let version = version.unwrap_or_else(|| defaults::DEFAULT_IC_ADMIN_VERSION.to_string());
+    let version = version
+        .unwrap_or_else(|| defaults::DEFAULT_IC_ADMIN_VERSION.to_string())
+        .trim()
+        .to_string();
     let home_dir = dirs::home_dir()
         .and_then(|d| d.to_str().map(|s| s.to_string()))
         .ok_or_else(|| anyhow::format_err!("Cannot find home directory"))?;

diff --git a/rs/ic-canisters/src/governance.rs b/rs/ic-canisters/src/governance.rs
@@ -25,6 +25,7 @@ pub async fn governance_canister_version(nns_url: Url) -> Result<GovernanceCanis
             )
             .await?,
     )?
+    .trim()
     .to_string();
 
     Ok(GovernanceCanisterVersion {