feat: Download default terraform version when minor version mismatches #1775
Conversation
This file contains hidden or 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
kylecarbs
reviewed
May 26, 2022
provisioner/terraform/serve.go
Outdated
Comment on lines
56
to
72
| // If the "coder" binary is in the same directory as | ||
| // the "terraform" binary, "terraform" is returned. | ||
| // | ||
| // We must resolve the absolute path for other processes | ||
| // to execute this properly! | ||
| absoluteBinary, err := filepath.Abs(binaryPath) | ||
| if err != nil { | ||
| return xerrors.Errorf("absolute: %w", err) | ||
| } | ||
| // Checking the installed version of Terraform. | ||
| output, err := exec.Command(absoluteBinary, "version").Output() | ||
| if err != nil { | ||
| return xerrors.Errorf("terraform version: %w", err) | ||
| } | ||
| // The output for `terraform version` is: | ||
| // Terraform v1.2.1 | ||
| // on linux_amd64 | ||
| versionRegex := regexp.MustCompile("Terraform v(.+)\n?.*") | ||
| match := versionRegex.FindStringSubmatch(string(output)) | ||
| if match != nil { | ||
| // match[0] is the entire string. | ||
| // match[1] is the matched substring. | ||
| version := match[1] | ||
| terraformMinorVersion := strings.Join(strings.Split(terraformVersion, versionDelimiter)[:2], versionDelimiter) | ||
| if !strings.HasPrefix(version, terraformMinorVersion) { | ||
| downloadTerraform = true | ||
| } | ||
| } else { | ||
| // Download the required Terraform version when unable to determine the existing one. | ||
| downloadTerraform = true | ||
| } | ||
| if !downloadTerraform { | ||
| options.BinaryPath = absoluteBinary | ||
| } |
There was a problem hiding this comment.
The terraform-exec library already handles most of this for us!
https://github.com/coder/coder/blob/main/provisioner/terraform/provision.go#L63-L70
|
What is the status of this PR? |
@ammario Got stuck in limbo as I moved onto some frontend changes. I am back to addressing the comments on it this week; we should be able to get it in by EOW. |
07c6480 to
91fd183
Compare
91fd183 to
ccddf23
Compare
mafredri
approved these changes
Jun 17, 2022
Comment on lines
93
to
96
|
|
||
| t.Cleanup(func() { | ||
| t.Setenv("PATH", pathVariable) | ||
| }) |
There was a problem hiding this comment.
Suggested change
| t.Cleanup(func() { | |
| t.Setenv("PATH", pathVariable) | |
| }) |
I don't think this is needed? t.Setenv already defines a cleanup function that restores the environment in the earlier step.
There was a problem hiding this comment.
Removed it along with the top level t.Parallel since this test was conflicting with some other tests.
cad1205 to
7964593
Compare
kylecarbs
approved these changes
Jun 21, 2022
provisioner/terraform/serve.go
Outdated
| @@ -41,33 +43,54 @@ type ServeOptions struct { | |||
| Logger slog.Logger | |||
| } | |||
|
|
|||
| func getAbsoluteBinaryPath(ctx context.Context) (string, bool) { | |||
There was a problem hiding this comment.
Following Go idioms, this get prefix could be removed!
ed969f2 to
4580e8c
Compare
4580e8c to
744052f
Compare
744052f to
6b84a73
Compare
Emyrk
approved these changes
Jun 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR downloads the default Terraform version when the minor version of the already installed Terraform is different.
Subtasks
terraform version.Fixes #1743