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

Jump to bottom

use full paths when calling exec command #2437

Merged
merged 2 commits into from
Jun 13, 2023
Merged

use full paths when calling exec command #2437

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4953cc3
use full paths when calling exec command
rubys Jun 13, 2023
f1882ce
fix copy/paste errors: h/t @kzys
rubys Jun 13, 2023
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
29 changes: 27 additions & 2 deletions scanner/nodeFramework.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"log"
"os"
"os/exec"
"path/filepath"
"regexp"
"strconv"
"strings"
Expand Down Expand Up @@ -46,8 +47,20 @@ func configureNodeFramework(sourceDir string, config *ScannerConfig) (*SourceInf
}
}

// ensure node is in $PATH
node, err := exec.LookPath("node")
if err != nil && !errors.Is(err, exec.ErrDot) {
return nil, nil
}

// resolve to absolute path, see: https://tip.golang.org/doc/go1.19#os-exec-path
node, err = filepath.Abs(node)
if err != nil {
return nil, nil
}

// ensure node version is at least 16.0.0
out, err := exec.Command("node", "-v").Output()
out, err := exec.Command(node, "-v").Output()
if err != nil {
return nil, nil
} else {
Expand Down Expand Up @@ -154,7 +167,19 @@ func NodeFrameworkCallback(appName string, srcInfo *SourceInfo, options map[stri

// run the package if we haven't already
if args[0] != "npx" {
cmd := exec.Command("npx", "dockerfile")
// find npx in PATH
npx, err := exec.LookPath("npx")
if err != nil && !errors.Is(err, exec.ErrDot) {
return fmt.Errorf("failure finding npx executable in PATH")
}

// resolve to absolute path, see: https://tip.golang.org/doc/go1.19#os-exec-path
npx, err = filepath.Abs(npx)
if err != nil {
return fmt.Errorf("failure finding npx executable in PATH")
}

cmd := exec.Command(npx, "dockerfile")
cmd.Stdin = nil
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand Down
65 changes: 55 additions & 10 deletions scanner/rails.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"log"
"os"
"os/exec"
"path/filepath"
"regexp"
"strconv"
"strings"
Expand All @@ -13,6 +14,7 @@ import (
)

var healthcheck_channel = make(chan string)
var bundle, ruby string

func configureRails(sourceDir string, config *ScannerConfig) (*SourceInfo, error) {
// `bundle init` will create a file with a commented out rails gem,
Expand All @@ -26,14 +28,39 @@ func configureRails(sourceDir string, config *ScannerConfig) (*SourceInfo, error
return nil, nil
}

// find absolute pat to bundle, ruby executables
// see: https://tip.golang.org/doc/go1.19#os-exec-path
var err error
bundle, err = exec.LookPath("bundle")
if err != nil {
if errors.Is(err, exec.ErrDot) {
bundle, err = filepath.Abs(bundle)
}

if err != nil {
return nil, errors.Wrap(err, "failure finding bundle executable")
}
}

ruby, err = exec.LookPath("ruby")
if err != nil {
if errors.Is(err, exec.ErrDot) {
bundle, err = filepath.Abs(ruby)
rubys marked this conversation as resolved.
Show resolved Hide resolved
}

if err != nil {
return nil, errors.Wrap(err, "failure finding ruby executable")
}
}

// verify that the bundle will install before proceeding
args := []string{"install"}

if checksPass(sourceDir, fileExists("Gemfile.lock")) {
args = append(args, "--quiet")
}

cmd := exec.Command("bundle", args...)
cmd := exec.Command(bundle, args...)
cmd.Stdin = nil
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand Down Expand Up @@ -71,9 +98,21 @@ func configureRails(sourceDir string, config *ScannerConfig) (*SourceInfo, error
},
}
} else {
// find absolute path to rake executable
rake, err := exec.LookPath("rake")
if err != nil {
if errors.Is(err, exec.ErrDot) {
bundle, err = filepath.Abs(ruby)
rubys marked this conversation as resolved.
Show resolved Hide resolved
}

if err != nil {
return nil, errors.Wrap(err, "failure finding rake executable")
}
}

// support Rails 4 through 5.1 applications, or ones that started out
// there and never were fully upgraded.
out, err := exec.Command("rake", "secret").Output()
out, err := exec.Command(rake, "secret").Output()

if err == nil {
s.Secrets = []Secret{
Expand All @@ -98,7 +137,13 @@ Once ready: run 'fly deploy' to deploy your Rails app.

// fetch healthcheck route in a separate thread
go func() {
out, err := exec.Command("ruby", "./bin/rails", "runner",
ruby, err := exec.LookPath("ruby")
if err != nil {
healthcheck_channel <- ""
return
}

out, err := exec.Command(ruby, "./bin/rails", "runner",
"puts Rails.application.routes.url_helpers.rails_health_check_path").Output()

if err == nil {
Expand All @@ -117,7 +162,7 @@ func RailsCallback(appName string, srcInfo *SourceInfo, options map[string]bool)
if err != nil {
panic(err)
} else if !strings.Contains(string(gemfile), "dockerfile-rails") {
cmd := exec.Command("bundle", "add", "dockerfile-rails",
cmd := exec.Command(bundle, "add", "dockerfile-rails",
"--optimistic", "--group", "development", "--skip-install")
cmd.Stdin = nil
cmd.Stdout = os.Stdout
Expand All @@ -127,7 +172,7 @@ func RailsCallback(appName string, srcInfo *SourceInfo, options map[string]bool)
return errors.Wrap(err, "Failed to add dockerfile-rails gem, exiting")
}

cmd = exec.Command("bundle", "install", "--quiet")
cmd = exec.Command(bundle, "install", "--quiet")
cmd.Stdin = nil
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand All @@ -138,9 +183,9 @@ func RailsCallback(appName string, srcInfo *SourceInfo, options map[string]bool)
}

// ensure Gemfile.lock includes the x86_64-linux platform
if out, err := exec.Command("bundle", "platform").Output(); err == nil {
if out, err := exec.Command(bundle, "platform").Output(); err == nil {
if !strings.Contains(string(out), "x86_64-linux") {
cmd := exec.Command("bundle", "lock", "--add-platform", "x86_64-linux")
cmd := exec.Command(bundle, "lock", "--add-platform", "x86_64-linux")
if err := cmd.Run(); err != nil {
return errors.Wrap(err, "Failed to add x86_64-linux platform, exiting")
}
Expand Down Expand Up @@ -178,7 +223,7 @@ func RailsCallback(appName string, srcInfo *SourceInfo, options map[string]bool)
args = append(args, "--redis")
}

cmd := exec.Command("ruby", args...)
cmd := exec.Command(ruby, args...)
cmd.Stdin = nil
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand All @@ -188,14 +233,14 @@ func RailsCallback(appName string, srcInfo *SourceInfo, options map[string]bool)
}
} else {
if options["postgresql"] && !strings.Contains(string(gemfile), "pg") {
cmd := exec.Command("bundle", "add", "pg")
cmd := exec.Command(bundle, "add", "pg")
if err := cmd.Run(); err != nil {
return errors.Wrap(err, "Failed to install pg gem")
}
}

if options["redis"] && !strings.Contains(string(gemfile), "redis") {
cmd := exec.Command("bundle", "add", "redis")
cmd := exec.Command(bundle, "add", "redis")
if err := cmd.Run(); err != nil {
return errors.Wrap(err, "Failed to install redis gem")
}
Expand Down