Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update error messages when working with OpenTofu #4996

Merged
merged 1 commit into from
Oct 10, 2024
Merged

fix: Update error messages when working with OpenTofu #4996

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions server/core/terraform/terraform_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func NewClientWithDefaultVersion(
return nil, fmt.Errorf("%s not found in $PATH. Set --%s or download terraform from https://developer.hashicorp.com/terraform/downloads", distribution.BinName(), defaultVersionFlagName)
}
if err == nil {
localVersion, err = getVersion(localPath)
localVersion, err = getVersion(localPath, distribution.BinName())
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -529,7 +529,7 @@ func ensureVersion(
execPath, err := dist.Downloader().Install(context.Background(), binDir, downloadURL, v)

if err != nil {
return "", errors.Wrapf(err, "error downloading terraform version %s", v.String())
return "", errors.Wrapf(err, "error downloading %s version %s", dist.BinName(), v.String())
}

log.Info("Downloaded %s %s to %s", dist.BinName(), v.String(), execPath)
Expand Down Expand Up @@ -576,15 +576,15 @@ func isAsyncEligibleCommand(cmd string) bool {
return false
}

func getVersion(tfBinary string) (*version.Version, error) {
func getVersion(tfBinary string, binName string) (*version.Version, error) {
versionOutBytes, err := exec.Command(tfBinary, "version").Output() // #nosec
versionOutput := string(versionOutBytes)
if err != nil {
return nil, errors.Wrapf(err, "running terraform version: %s", versionOutput)
return nil, errors.Wrapf(err, "running %s version: %s", binName, versionOutput)
}
match := versionRegex.FindStringSubmatch(versionOutput)
if len(match) <= 1 {
return nil, fmt.Errorf("could not parse terraform version from %s", versionOutput)
return nil, fmt.Errorf("could not parse %s version from %s", binName, versionOutput)
}
return version.NewVersion(match[1])
}
Expand Down
Loading