Skip to content

Permit use of shell aliases #327

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Permit use of shell aliases #327

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1bab3
fix: permit shell alias
kevineor May 3, 2024
2910061
fix: add explicit end of options
kevineor May 6, 2024
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
22 changes: 21 additions & 1 deletion internal/provider/data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"encoding/json"
"errors"
"fmt"
"os"
"os/exec"
"runtime"
"strings"
Expand Down Expand Up @@ -178,6 +179,25 @@ func (n *externalDataSource) Read(ctx context.Context, req datasource.ReadReques
err = nil
}

executableString := filteredProgram

if runtime.GOOS != "windows" && errors.Is(err, exec.ErrNotFound) {
// Add other shells here as need arises, the only requirement being it must provide "standard"
// behavior for the -i and -c options
shells := []string{"bash", "fish", "zsh", "ksh", "ash", "sh", "dash"}

sh := os.Getenv("SHELL")
for _, s := range shells {
if strings.HasSuffix(sh, "/"+s) {
executableString = []string{sh, "-i", "-c", "--"}
args := strings.Join(filteredProgram, " ")
executableString = append(executableString, args)
err = nil
break
}
}
}

if err != nil {
resp.Diagnostics.AddAttributeError(
path.Root("program"),
Expand All @@ -202,7 +222,7 @@ The program must also be executable according to the platform where Terraform is

workingDir := config.WorkingDir.ValueString()

cmd := exec.CommandContext(ctx, filteredProgram[0], filteredProgram[1:]...)
cmd := exec.CommandContext(ctx, executableString[0], executableString[1:]...)

// This is a workaround to preserve pre-existing behaviour prior to the upgrade to Go 1.19.
// Reference: https://github.com/hashicorp/terraform-provider-external/pull/192
Expand Down