summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris <chris@spoon.nz>2021-05-16 03:36:59 +0100
committerGitHub <noreply@github.com>2021-05-15 22:36:59 -0400
commitae6c69b13bfc86ba50e3dc11ff927727f55d712f (patch)
tree9de0e051a20bbbd9f7cde2bd122ce53c238275c9
parentd0a32b1194ec777b2d1cc838a3d9960cd1298e10 (diff)
fix: remove trailing whitespace from Terraform version (#2726)
-rw-r--r--src/modules/terraform.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/modules/terraform.rs b/src/modules/terraform.rs
index 006c234f3..564d173c4 100644
--- a/src/modules/terraform.rs
+++ b/src/modules/terraform.rs
@@ -94,8 +94,7 @@ fn get_terraform_version(version: &str) -> Option<String> {
.trim_start_matches("Terraform ")
.trim()
.trim_start_matches('v')
- .to_owned()
- + " ",
+ .to_owned(),
)
}
@@ -110,7 +109,7 @@ mod tests {
#[test]
fn test_get_terraform_version_release() {
let input = "Terraform v0.12.14";
- assert_eq!(get_terraform_version(input), Some("0.12.14 ".to_string()));
+ assert_eq!(get_terraform_version(input), Some("0.12.14".to_string()));
}
#[test]
@@ -118,7 +117,7 @@ mod tests {
let input = "Terraform v0.12.14-rc1";
assert_eq!(
get_terraform_version(input),
- Some("0.12.14-rc1 ".to_string())
+ Some("0.12.14-rc1".to_string())
);
}
@@ -127,7 +126,7 @@ mod tests {
let input = "Terraform v0.12.14-dev (cca89f74)";
assert_eq!(
get_terraform_version(input),
- Some("0.12.14-dev (cca89f74) ".to_string())
+ Some("0.12.14-dev (cca89f74)".to_string())
);
}
@@ -139,7 +138,7 @@ Your version of Terraform is out of date! The latest version
is 0.12.14. You can update by downloading from www.terraform.io/downloads.html
";
- assert_eq!(get_terraform_version(input), Some("0.12.13 ".to_string()));
+ assert_eq!(get_terraform_version(input), Some("0.12.13".to_string()));
}
#[test]
@@ -152,7 +151,7 @@ is 0.12.14. You can update by downloading from www.terraform.io/downloads.html
.path(dir.path())
.config(toml::toml! {
[terraform]
- format = "via [$symbol$version$workspace]($style) "
+ format = "via [$symbol$version $workspace]($style) "
})
.collect();
@@ -177,7 +176,7 @@ is 0.12.14. You can update by downloading from www.terraform.io/downloads.html
.path(dir.path())
.config(toml::toml! {
[terraform]
- format = "via [$symbol$version$workspace]($style) "
+ format = "via [$symbol$version $workspace]($style) "
})
.collect();