From d5567b479c6b580c02bd90bd587854799811cdbe Mon Sep 17 00:00:00 2001 From: Omar Ismail Date: Mon, 4 Oct 2021 09:57:46 -0400 Subject: [PATCH] Fix terraform version in cloud e2e tests to ignore prerelease. (#29) --- internal/cloud/e2e/main_test.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/cloud/e2e/main_test.go b/internal/cloud/e2e/main_test.go index 414442170e..310032848d 100644 --- a/internal/cloud/e2e/main_test.go +++ b/internal/cloud/e2e/main_test.go @@ -59,10 +59,10 @@ func setTfeClient() { hostname := os.Getenv("TFE_HOSTNAME") token := os.Getenv("TFE_TOKEN") if hostname == "" { - log.Fatalf("hostname cannot be empty") + log.Fatal("hostname cannot be empty") } if token == "" { - log.Fatalf("token cannot be empty") + log.Fatal("token cannot be empty") } tfeHostname = hostname tfeToken = token @@ -138,7 +138,9 @@ func setVersion() { hash := string(out)[0:8] - terraformVersion = fmt.Sprintf("%s-%s", data["terraform_version"].(string), hash) + fullVersion := data["terraform_version"].(string) + version := strings.Split(fullVersion, "-")[0] + terraformVersion = fmt.Sprintf("%s-%s", version, hash) } func ensureVersionExists() {