From dc9ded8618d0a299838c78944dcb5b6f3eee1f06 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 24 Nov 2020 16:50:18 -0500 Subject: [PATCH] remove old version call site --- command/e2etest/version_test.go | 6 +++--- terraform/version.go | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 terraform/version.go diff --git a/command/e2etest/version_test.go b/command/e2etest/version_test.go index 261877290..1f19ecf64 100644 --- a/command/e2etest/version_test.go +++ b/command/e2etest/version_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/hashicorp/terraform/e2e" - tfcore "github.com/hashicorp/terraform/terraform" + "github.com/hashicorp/terraform/version" ) func TestVersion(t *testing.T) { @@ -31,7 +31,7 @@ func TestVersion(t *testing.T) { t.Errorf("unexpected stderr output:\n%s", stderr) } - wantVersion := fmt.Sprintf("Terraform v%s", tfcore.VersionString()) + wantVersion := fmt.Sprintf("Terraform v%s", version.String()) if !strings.Contains(stdout, wantVersion) { t.Errorf("output does not contain our current version %q:\n%s", wantVersion, stdout) } @@ -63,7 +63,7 @@ func TestVersionWithProvider(t *testing.T) { t.Errorf("unexpected stderr output:\n%s", stderr) } - wantVersion := fmt.Sprintf("Terraform v%s", tfcore.VersionString()) + wantVersion := fmt.Sprintf("Terraform v%s", version.String()) if !strings.Contains(stdout, wantVersion) { t.Errorf("output does not contain our current version %q:\n%s", wantVersion, stdout) } diff --git a/terraform/version.go b/terraform/version.go deleted file mode 100644 index 0caeca0ad..000000000 --- a/terraform/version.go +++ /dev/null @@ -1,10 +0,0 @@ -package terraform - -import ( - "github.com/hashicorp/terraform/version" -) - -// Deprecated: Providers should use schema.Provider.TerraformVersion instead -func VersionString() string { - return version.String() -}