Skip to content

valid the bootstraps before passing to NewBootstrapSingleCmd #45

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

Merged
merged 8 commits into from
Aug 30, 2021
Merged

valid the bootstraps before passing to NewBootstrapSingleCmd #45

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abf855b
Pull upstream changes 2021/06 (#39)
valerena Jun 25, 2021
08cc122
Merge branch 'develop' of https://github.com/aws/aws-lambda-runtime-i…
wchengru Aug 30, 2021
e45a909
valid the bootstraps before passing to NewBootstrapSingleCmd
wchengru Aug 30, 2021
3d552fe
refactor the code to better asign the default value
wchengru Aug 30, 2021
f1a1485
reformat indents
wchengru Aug 30, 2021
7328a69
use function to detect is file exist
wchengru Aug 30, 2021
f33b43c
minor fix
wchengru Aug 30, 2021
7337cd9
fix a logical error
wchengru Aug 30, 2021
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: 20 additions & 2 deletions cmd/aws-lambda-rie/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,34 @@ func getCLIArgs() (options, []string) {
return opts, args
}

func isBootstrapFileExist(filePath string) bool {
file, err := os.Stat(filePath)
return !os.IsNotExist(err) && !file.IsDir()
}

func getBootstrap(args []string, opts options) (*rapidcore.Bootstrap, string) {
var bootstrapLookupCmd []string
var handler string
currentWorkingDir := "/var/task" // default value

if len(args) <= 1 {
// set default value to /var/task/bootstrap, but switch to the other options if it doesn't exist
bootstrapLookupCmd = []string{
fmt.Sprintf("%s/bootstrap", currentWorkingDir),
optBootstrap,
runtimeBootstrap,
}

if !isBootstrapFileExist(bootstrapLookupCmd[0]) {
var bootstrapCmdCandidates = []string{
optBootstrap,
runtimeBootstrap,
}

for i, bootstrapCandidate := range bootstrapCmdCandidates {
if isBootstrapFileExist(bootstrapCandidate) {
bootstrapLookupCmd = []string{bootstrapCmdCandidates[i]}
break
}
}
}

// handler is used later to set an env var for Lambda Image support
Expand Down