Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builder: Allow command with arguments via custom build options (#2453)

Browse Source 
* allow buildcmd command to process arguments
* Add unit tests for builder with different scenarios

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Shubham Bansal
2022-06-13 19:26:05 +05:30
committed by GitHub
co-authored by Sanket Sudake
parent a2b6f95656
commit fe8f53375e
2 changed files with 197 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/builder/builder.go
+26 -19
View File
@@ -38,8 +38,8 @@ import (
const (
// supported environment variables
envSrcPkg = "SRC_PKG"
envDeployPkg = "DEPLOY_PKG"
envSrcPkg string = "SRC_PKG"
envDeployPkg string = "DEPLOY_PKG"
)
type (
@@ -114,16 +114,27 @@ func (builder *Builder) Handler(w http.ResponseWriter, r *http.Request) {
}
builder.logger.Info("builder received request", zap.Any("request", req))
builder.logger.Info("starting build")
builder.logger.Debug("starting build")
srcPkgPath := filepath.Join(builder.sharedVolumePath, req.SrcPkgFilename)
deployPkgFilename := fmt.Sprintf("%v-%v", req.SrcPkgFilename, strings.ToLower(uniuri.NewLen(6)))
deployPkgFilename := fmt.Sprintf("%s-%s", req.SrcPkgFilename, strings.ToLower(uniuri.NewLen(6)))
deployPkgPath := filepath.Join(builder.sharedVolumePath, deployPkgFilename)
var buildArgs []string
buildCmd := req.BuildCommand
if len(buildCmd) == 0 {
// use default build command
buildCmd = "/build"
} else {
// split executable command and arguments
args := strings.Split(buildCmd, " ")
buildCmd = args[0] // get the executable command, executable command will always be on Zero index
// get all the arguments
for i := 1; i < len(args); i++ {
buildArgs = append(buildArgs, args[i])
}
}
buildLogs, err := builder.build(buildCmd, srcPkgPath, deployPkgPath)
buildLogs, err := builder.build(buildCmd, buildArgs, srcPkgPath, deployPkgPath)
if err != nil {
e := "error building source package"
builder.logger.Error(e, zap.Error(err))
@@ -146,7 +157,7 @@ func (builder *Builder) reply(w http.ResponseWriter, pkgFilename string, buildLo
rBody, err := json.Marshal(resp)
if err != nil {
e := errors.Wrap(err, "error encoding response body")
rBody = []byte(fmt.Sprintf(`{"buildLogs": "%v"}`, e.Error()))
rBody = []byte(fmt.Sprintf(`{"buildLogs": "%s"}`, e.Error()))
statusCode = http.StatusInternalServerError
}
@@ -163,8 +174,8 @@ func (builder *Builder) reply(w http.ResponseWriter, pkgFilename string, buildLo
}
}
func (builder *Builder) build(command string, srcPkgPath string, deployPkgPath string) (string, error) {
cmd := exec.Command(command)
func (builder *Builder) build(command string, args []string, srcPkgPath string, deployPkgPath string) (string, error) {
cmd := exec.Command(command, args...)
fi, err := os.Stat(srcPkgPath)
if err != nil {
@@ -178,8 +189,8 @@ func (builder *Builder) build(command string, srcPkgPath string, deployPkgPath s
// set env variables for build command
cmd.Env = append(os.Environ(),
fmt.Sprintf("%v=%v", envSrcPkg, srcPkgPath),
fmt.Sprintf("%v=%v", envDeployPkg, deployPkgPath),
fmt.Sprintf("%s=%s", envSrcPkg, srcPkgPath),
fmt.Sprintf("%s=%s", envDeployPkg, deployPkgPath),
)
stdout, err := cmd.StdoutPipe()
@@ -192,12 +203,8 @@ func (builder *Builder) build(command string, srcPkgPath string, deployPkgPath s
return "", errors.Wrap(err, "error creating stderr pipe for cmd")
}
var buildLogs string
fmt.Printf("\n=== Build Logs ===")
// Init logs
fmt.Printf("command=%v\n", command)
fmt.Printf("env=%v\n", cmd.Env)
builder.logger.Info("building source package", zap.String("command", command), zap.Strings("args", args), zap.Strings("env", cmd.Env))
out := io.MultiReader(stdout, stderr)
scanner := bufio.NewScanner(out)
@@ -206,12 +213,14 @@ func (builder *Builder) build(command string, srcPkgPath string, deployPkgPath s
if err != nil {
return "", errors.Wrap(err, "error starting cmd")
}
fmt.Printf("========= START =========\n")
defer fmt.Printf("========= END ===========\n")
var buildLogs string
// Runtime logs
for scanner.Scan() {
output := scanner.Text()
fmt.Println(output)
buildLogs += fmt.Sprintf("%v\n", output)
buildLogs += fmt.Sprintf("%s\n", output)
}
if err := scanner.Err(); err != nil {
@@ -226,7 +235,5 @@ func (builder *Builder) build(command string, srcPkgPath string, deployPkgPath s
fmt.Println(cmdErr)
return buildLogs, cmdErr
}
fmt.Printf("==================\n")
return buildLogs, nil
}