ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove old version call site

This commit is contained in:
James Bardin 2020-11-24 16:50:18 -05:00
parent 2eb8278a0f
commit dc9ded8618
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/e2etest/version_test.go
View File

@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/hashicorp/terraform/e2e" "github.com/hashicorp/terraform/e2e"
tfcore "github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/version"
) )
func TestVersion(t *testing.T) { func TestVersion(t *testing.T) {
@ -31,7 +31,7 @@ func TestVersion(t *testing.T) {
t.Errorf("unexpected stderr output:\n%s", stderr) 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) { if !strings.Contains(stdout, wantVersion) {
t.Errorf("output does not contain our current version %q:\n%s", wantVersion, stdout) 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) 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) { if !strings.Contains(stdout, wantVersion) {
t.Errorf("output does not contain our current version %q:\n%s", wantVersion, stdout) t.Errorf("output does not contain our current version %q:\n%s", wantVersion, stdout)
} }

10
terraform/version.go
View File

@ -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()
}