-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix version parsing, include provider versions
- Loading branch information
Showing
5 changed files
with
198 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package tfexec | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "fmt" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/hashicorp/go-version" | ||
| ) | ||
|
|
||
| func (tf *Terraform) version(ctx context.Context) (*version.Version, map[string]*version.Version, error) { | ||
| versionCmd := tf.buildTerraformCmd(ctx, "version") | ||
| var errBuf strings.Builder | ||
| var outBuf bytes.Buffer | ||
| versionCmd.Stderr = &errBuf | ||
| versionCmd.Stdout = &outBuf | ||
|
|
||
| err := versionCmd.Run() | ||
| if err != nil { | ||
| fmt.Println(errBuf.String()) | ||
| return nil, nil, fmt.Errorf("unable to run version command: %w, %s", err, errBuf.String()) | ||
| } | ||
|
|
||
| v, pv, err := parseVersionOutput(outBuf.String()) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("unable to parse version: %w", err) | ||
| } | ||
|
|
||
| return v, pv, nil | ||
| } | ||
|
|
||
| var ( | ||
| simpleVersionRe = `v?(?P<version>[0-9]+(?:\.[0-9]+)*(?:-[A-Za-z0-9\.]+)?)` | ||
|
|
||
| versionOutputRe = regexp.MustCompile(`^Terraform ` + simpleVersionRe) | ||
| providerVersionOutputRe = regexp.MustCompile(`(\n\+ provider[\. ](?P<name>\S+) ` + simpleVersionRe + `)`) | ||
| ) | ||
|
|
||
| // TODO: maybe add JSON output to the version command to simplify all of this? | ||
| func parseVersionOutput(stdout string) (*version.Version, map[string]*version.Version, error) { | ||
| stdout = strings.TrimSpace(stdout) | ||
|
|
||
| submatches := versionOutputRe.FindStringSubmatch(stdout) | ||
| if len(submatches) != 2 { | ||
| return nil, nil, fmt.Errorf("unexpected number of version matches %d for %s", len(submatches), stdout) | ||
| } | ||
| v, err := version.NewVersion(submatches[1]) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("unable to parse version %q: %w", submatches[1], err) | ||
| } | ||
|
|
||
| allSubmatches := providerVersionOutputRe.FindAllStringSubmatch(stdout, -1) | ||
| provV := map[string]*version.Version{} | ||
|
|
||
| for _, submatches := range allSubmatches { | ||
| if len(submatches) != 4 { | ||
| return nil, nil, fmt.Errorf("unexpected number of providerion version matches %d for %s", len(submatches), stdout) | ||
| } | ||
|
|
||
| v, err := version.NewVersion(submatches[3]) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("unable to parse provider version %q: %w", submatches[3], err) | ||
| } | ||
|
|
||
| provV[submatches[2]] = v | ||
| } | ||
|
|
||
| return v, provV, err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| package tfexec | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/go-version" | ||
| ) | ||
|
|
||
| func TestParseVersionOutput(t *testing.T) { | ||
| var mustVer = func(s string) *version.Version { | ||
| v, err := version.NewVersion(s) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| return v | ||
| } | ||
|
|
||
| for i, c := range []struct { | ||
| expectedV *version.Version | ||
| expectedProviders map[string]*version.Version | ||
|
|
||
| stdout string | ||
| }{ | ||
| // 0.13 tests | ||
| { | ||
| mustVer("0.13.0-dev"), nil, ` | ||
| Terraform v0.13.0-dev`, | ||
| }, | ||
| { | ||
| mustVer("0.13.0-dev"), map[string]*version.Version{ | ||
| "registry.terraform.io/hashicorp/null": mustVer("2.1.2"), | ||
| "registry.terraform.io/paultyng/null": mustVer("0.1.0"), | ||
| }, ` | ||
| Terraform v0.13.0-dev | ||
| + provider registry.terraform.io/hashicorp/null v2.1.2 | ||
| + provider registry.terraform.io/paultyng/null v0.1.0`, | ||
| }, | ||
| { | ||
| mustVer("0.13.0-dev"), nil, ` | ||
| Terraform v0.13.0-dev | ||
| Your version of Terraform is out of date! The latest version | ||
| is 0.13.1. You can update by downloading from https://www.terraform.io/downloads.html`, | ||
| }, | ||
| { | ||
| mustVer("0.13.0-dev"), map[string]*version.Version{ | ||
| "registry.terraform.io/hashicorp/null": mustVer("2.1.2"), | ||
| "registry.terraform.io/paultyng/null": mustVer("0.1.0"), | ||
| }, ` | ||
| Terraform v0.13.0-dev | ||
| + provider registry.terraform.io/hashicorp/null v2.1.2 | ||
| + provider registry.terraform.io/paultyng/null v0.1.0 | ||
| Your version of Terraform is out of date! The latest version | ||
| is 0.13.1. You can update by downloading from https://www.terraform.io/downloads.html`, | ||
| }, | ||
|
|
||
| // 0.12 tests | ||
| { | ||
| mustVer("0.12.26"), nil, ` | ||
| Terraform v0.12.26 | ||
| `, | ||
| }, | ||
| { | ||
| mustVer("0.12.26"), map[string]*version.Version{ | ||
| "null": mustVer("2.1.2"), | ||
| }, ` | ||
| Terraform v0.12.26 | ||
| + provider.null v2.1.2 | ||
| `, | ||
| }, | ||
| { | ||
| mustVer("0.12.18"), nil, ` | ||
| Terraform v0.12.18 | ||
| Your version of Terraform is out of date! The latest version | ||
| is 0.12.26. You can update by downloading from https://www.terraform.io/downloads.html | ||
| `, | ||
| }, | ||
| { | ||
| mustVer("0.12.18"), map[string]*version.Version{ | ||
| "null": mustVer("2.1.2"), | ||
| }, ` | ||
| Terraform v0.12.18 | ||
| + provider.null v2.1.2 | ||
| Your version of Terraform is out of date! The latest version | ||
| is 0.12.26. You can update by downloading from https://www.terraform.io/downloads.html | ||
| `, | ||
| }, | ||
| } { | ||
| t.Run(fmt.Sprintf("%d %s", i, c.expectedV), func(t *testing.T) { | ||
| actualV, actualProv, err := parseVersionOutput(c.stdout) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| if !c.expectedV.Equal(actualV) { | ||
| t.Fatalf("expected %s, got %s", c.expectedV, actualV) | ||
| } | ||
|
|
||
| for k, v := range c.expectedProviders { | ||
| if actual := actualProv[k]; actual == nil || !v.Equal(actual) { | ||
| t.Fatalf("expected %s for %s, got %s", v, k, actual) | ||
| } | ||
| } | ||
|
|
||
| if len(c.expectedProviders) != len(actualProv) { | ||
| t.Fatalf("expected %d providers, got %d", len(c.expectedProviders), len(actualProv)) | ||
| } | ||
| }) | ||
| } | ||
| } |