This commit is contained in:
@@ -72,6 +72,14 @@ func init() {
|
||||
"out-filename"
|
||||
],
|
||||
"properties": {
|
||||
"files": {
|
||||
"description": "File to create before running commands.",
|
||||
"type": "array",
|
||||
"default": null,
|
||||
"items": {
|
||||
"$ref": "#/definitions/direktivFile"
|
||||
}
|
||||
},
|
||||
"in-data": {
|
||||
"description": "json input to convert to spreadsheet",
|
||||
"type": "object"
|
||||
@@ -129,40 +137,16 @@ func init() {
|
||||
"cmds": [
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "ls -la",
|
||||
"exec": "/bin/json2excel -inputJson {{- if eq (deref .Infile) \"\" }} \"input.json\" {{- else }} {{ .Infile }} {{- end }} -worksheetName \"{{ .WorksheetName }}\" -outputFilename '{{ .OutFilename }}'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "pwd",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "/bin/bash -c \"echo '{{ .InData | toJson }}' \u003e /tmp/input.json\"",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "find / -name '*.json'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "/bin/json2excel -inputJson {{- if eq (deref .Infile) \"\" }} \"/tmp/input.json\" {{- else }} {{ .Infile }} {{- end }} -worksheetName \"{{ .WorksheetName }}\" -outputFilename '{{ .OutFilename }}'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "base64 -w 0 /tmp/{{ .OutFilename }}"
|
||||
"exec": "base64 -w 0 {{ .OutFilename }}"
|
||||
}
|
||||
],
|
||||
"output": "{\n \"export-excel\": {{ (index . 5).result | toJson }}\n}\n"
|
||||
"output": "{\n \"export-excel\": {{ (index . 1).result | toJson }}\n}\n"
|
||||
},
|
||||
"x-direktiv-errors": {
|
||||
"io.direktiv.command.error": "Command execution failed",
|
||||
@@ -171,7 +155,7 @@ func init() {
|
||||
},
|
||||
"x-direktiv-examples": [
|
||||
{
|
||||
"content": "- id: export-xlsx\n type: action\n action:\n function: export-xlsx\n input: \n files:\n - name: /tmp/input.json\n data: |\n jq(.input) \n worksheet-name: \"TestSpreadsheet\"\n out-filename: example.xlsx",
|
||||
"content": "- id: export-xlsx\n type: action\n action:\n function: export-xlsx\n input: \n files:\n - name: input.json\n data: |\n jq(.input) \n worksheet-name: \"TestSpreadsheet\"\n out-filename: example.xlsx",
|
||||
"title": "Rely on Direktiv to create input file"
|
||||
},
|
||||
{
|
||||
@@ -316,40 +300,16 @@ func init() {
|
||||
"cmds": [
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "ls -la",
|
||||
"exec": "/bin/json2excel -inputJson {{- if eq (deref .Infile) \"\" }} \"input.json\" {{- else }} {{ .Infile }} {{- end }} -worksheetName \"{{ .WorksheetName }}\" -outputFilename '{{ .OutFilename }}'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "pwd",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "/bin/bash -c \"echo '{{ .InData | toJson }}' \u003e /tmp/input.json\"",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "find / -name '*.json'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "/bin/json2excel -inputJson {{- if eq (deref .Infile) \"\" }} \"/tmp/input.json\" {{- else }} {{ .Infile }} {{- end }} -worksheetName \"{{ .WorksheetName }}\" -outputFilename '{{ .OutFilename }}'",
|
||||
"print": true,
|
||||
"silent": false
|
||||
},
|
||||
{
|
||||
"action": "exec",
|
||||
"exec": "base64 -w 0 /tmp/{{ .OutFilename }}"
|
||||
"exec": "base64 -w 0 {{ .OutFilename }}"
|
||||
}
|
||||
],
|
||||
"output": "{\n \"export-excel\": {{ (index . 5).result | toJson }}\n}\n"
|
||||
"output": "{\n \"export-excel\": {{ (index . 1).result | toJson }}\n}\n"
|
||||
},
|
||||
"x-direktiv-errors": {
|
||||
"io.direktiv.command.error": "Command execution failed",
|
||||
@@ -358,7 +318,7 @@ func init() {
|
||||
},
|
||||
"x-direktiv-examples": [
|
||||
{
|
||||
"content": "- id: export-xlsx\n type: action\n action:\n function: export-xlsx\n input: \n files:\n - name: /tmp/input.json\n data: |\n jq(.input) \n worksheet-name: \"TestSpreadsheet\"\n out-filename: example.xlsx",
|
||||
"content": "- id: export-xlsx\n type: action\n action:\n function: export-xlsx\n input: \n files:\n - name: input.json\n data: |\n jq(.input) \n worksheet-name: \"TestSpreadsheet\"\n out-filename: example.xlsx",
|
||||
"title": "Rely on Direktiv to create input file"
|
||||
},
|
||||
{
|
||||
@@ -436,6 +396,14 @@ func init() {
|
||||
"out-filename"
|
||||
],
|
||||
"properties": {
|
||||
"files": {
|
||||
"description": "File to create before running commands.",
|
||||
"type": "array",
|
||||
"default": [],
|
||||
"items": {
|
||||
"$ref": "#/definitions/direktivFile"
|
||||
}
|
||||
},
|
||||
"in-data": {
|
||||
"description": "json input to convert to spreadsheet",
|
||||
"type": "object"
|
||||
|
@@ -142,132 +142,8 @@ func PostDirektivHandle(params PostParams) middleware.Responder {
|
||||
paramsCollector = append(paramsCollector, ret)
|
||||
accParams.Commands = paramsCollector
|
||||
|
||||
ret, err = runCommand2(ctx, accParams, ri)
|
||||
|
||||
responses = append(responses, ret)
|
||||
|
||||
// if foreach returns an error there is no continue
|
||||
//
|
||||
// default we do not continue
|
||||
cont = convertTemplateToBool("<no value>", accParams, false)
|
||||
// cont = convertTemplateToBool("<no value>", accParams, true)
|
||||
//
|
||||
|
||||
if err != nil && !cont {
|
||||
|
||||
errName := cmdErr
|
||||
|
||||
// if the delete function added the cancel tag
|
||||
ci, ok := sm.Load(*params.DirektivActionID)
|
||||
if ok {
|
||||
cinfo, ok := ci.(*ctxInfo)
|
||||
if ok && cinfo.cancelled {
|
||||
errName = "direktiv.actionCancelled"
|
||||
err = fmt.Errorf("action got cancel request")
|
||||
}
|
||||
}
|
||||
|
||||
return generateError(errName, err)
|
||||
}
|
||||
|
||||
paramsCollector = append(paramsCollector, ret)
|
||||
accParams.Commands = paramsCollector
|
||||
|
||||
ret, err = runCommand3(ctx, accParams, ri)
|
||||
|
||||
responses = append(responses, ret)
|
||||
|
||||
// if foreach returns an error there is no continue
|
||||
//
|
||||
// default we do not continue
|
||||
cont = convertTemplateToBool("<no value>", accParams, false)
|
||||
// cont = convertTemplateToBool("<no value>", accParams, true)
|
||||
//
|
||||
|
||||
if err != nil && !cont {
|
||||
|
||||
errName := cmdErr
|
||||
|
||||
// if the delete function added the cancel tag
|
||||
ci, ok := sm.Load(*params.DirektivActionID)
|
||||
if ok {
|
||||
cinfo, ok := ci.(*ctxInfo)
|
||||
if ok && cinfo.cancelled {
|
||||
errName = "direktiv.actionCancelled"
|
||||
err = fmt.Errorf("action got cancel request")
|
||||
}
|
||||
}
|
||||
|
||||
return generateError(errName, err)
|
||||
}
|
||||
|
||||
paramsCollector = append(paramsCollector, ret)
|
||||
accParams.Commands = paramsCollector
|
||||
|
||||
ret, err = runCommand4(ctx, accParams, ri)
|
||||
|
||||
responses = append(responses, ret)
|
||||
|
||||
// if foreach returns an error there is no continue
|
||||
//
|
||||
// default we do not continue
|
||||
cont = convertTemplateToBool("<no value>", accParams, false)
|
||||
// cont = convertTemplateToBool("<no value>", accParams, true)
|
||||
//
|
||||
|
||||
if err != nil && !cont {
|
||||
|
||||
errName := cmdErr
|
||||
|
||||
// if the delete function added the cancel tag
|
||||
ci, ok := sm.Load(*params.DirektivActionID)
|
||||
if ok {
|
||||
cinfo, ok := ci.(*ctxInfo)
|
||||
if ok && cinfo.cancelled {
|
||||
errName = "direktiv.actionCancelled"
|
||||
err = fmt.Errorf("action got cancel request")
|
||||
}
|
||||
}
|
||||
|
||||
return generateError(errName, err)
|
||||
}
|
||||
|
||||
paramsCollector = append(paramsCollector, ret)
|
||||
accParams.Commands = paramsCollector
|
||||
|
||||
ret, err = runCommand5(ctx, accParams, ri)
|
||||
|
||||
responses = append(responses, ret)
|
||||
|
||||
// if foreach returns an error there is no continue
|
||||
//
|
||||
// default we do not continue
|
||||
cont = convertTemplateToBool("<no value>", accParams, false)
|
||||
// cont = convertTemplateToBool("<no value>", accParams, true)
|
||||
//
|
||||
|
||||
if err != nil && !cont {
|
||||
|
||||
errName := cmdErr
|
||||
|
||||
// if the delete function added the cancel tag
|
||||
ci, ok := sm.Load(*params.DirektivActionID)
|
||||
if ok {
|
||||
cinfo, ok := ci.(*ctxInfo)
|
||||
if ok && cinfo.cancelled {
|
||||
errName = "direktiv.actionCancelled"
|
||||
err = fmt.Errorf("action got cancel request")
|
||||
}
|
||||
}
|
||||
|
||||
return generateError(errName, err)
|
||||
}
|
||||
|
||||
paramsCollector = append(paramsCollector, ret)
|
||||
accParams.Commands = paramsCollector
|
||||
|
||||
s, err := templateString(`{
|
||||
"export-excel": {{ (index . 5).result | toJson }}
|
||||
"export-excel": {{ (index . 1).result | toJson }}
|
||||
}
|
||||
`, responses)
|
||||
if err != nil {
|
||||
@@ -300,7 +176,7 @@ func runCommand0(ctx context.Context,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`ls -la`, at)
|
||||
cmd, err := templateString(`/bin/json2excel -inputJson {{- if eq (deref .Infile) "" }} "input.json" {{- else }} {{ .Infile }} {{- end }} -worksheetName "{{ .WorksheetName }}" -outputFilename '{{ .OutFilename }}'`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
@@ -333,139 +209,7 @@ func runCommand1(ctx context.Context,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`pwd`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
return ir, err
|
||||
}
|
||||
cmd = strings.Replace(cmd, "\n", "", -1)
|
||||
|
||||
silent := convertTemplateToBool("false", at, false)
|
||||
print := convertTemplateToBool("true", at, true)
|
||||
output := ""
|
||||
|
||||
envs := []string{}
|
||||
|
||||
return runCmd(ctx, cmd, envs, output, silent, print, ri)
|
||||
|
||||
}
|
||||
|
||||
// end commands
|
||||
|
||||
// exec
|
||||
func runCommand2(ctx context.Context,
|
||||
params accParams, ri *apps.RequestInfo) (map[string]interface{}, error) {
|
||||
|
||||
ir := make(map[string]interface{})
|
||||
ir[successKey] = false
|
||||
|
||||
at := accParamsTemplate{
|
||||
*params.Body,
|
||||
params.Commands,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`/bin/bash -c "echo '{{ .InData | toJson }}' > /tmp/input.json"`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
return ir, err
|
||||
}
|
||||
cmd = strings.Replace(cmd, "\n", "", -1)
|
||||
|
||||
silent := convertTemplateToBool("false", at, false)
|
||||
print := convertTemplateToBool("true", at, true)
|
||||
output := ""
|
||||
|
||||
envs := []string{}
|
||||
|
||||
return runCmd(ctx, cmd, envs, output, silent, print, ri)
|
||||
|
||||
}
|
||||
|
||||
// end commands
|
||||
|
||||
// exec
|
||||
func runCommand3(ctx context.Context,
|
||||
params accParams, ri *apps.RequestInfo) (map[string]interface{}, error) {
|
||||
|
||||
ir := make(map[string]interface{})
|
||||
ir[successKey] = false
|
||||
|
||||
at := accParamsTemplate{
|
||||
*params.Body,
|
||||
params.Commands,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`find / -name '*.json'`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
return ir, err
|
||||
}
|
||||
cmd = strings.Replace(cmd, "\n", "", -1)
|
||||
|
||||
silent := convertTemplateToBool("false", at, false)
|
||||
print := convertTemplateToBool("true", at, true)
|
||||
output := ""
|
||||
|
||||
envs := []string{}
|
||||
|
||||
return runCmd(ctx, cmd, envs, output, silent, print, ri)
|
||||
|
||||
}
|
||||
|
||||
// end commands
|
||||
|
||||
// exec
|
||||
func runCommand4(ctx context.Context,
|
||||
params accParams, ri *apps.RequestInfo) (map[string]interface{}, error) {
|
||||
|
||||
ir := make(map[string]interface{})
|
||||
ir[successKey] = false
|
||||
|
||||
at := accParamsTemplate{
|
||||
*params.Body,
|
||||
params.Commands,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`/bin/json2excel -inputJson {{- if eq (deref .Infile) "" }} "/tmp/input.json" {{- else }} {{ .Infile }} {{- end }} -worksheetName "{{ .WorksheetName }}" -outputFilename '{{ .OutFilename }}'`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
return ir, err
|
||||
}
|
||||
cmd = strings.Replace(cmd, "\n", "", -1)
|
||||
|
||||
silent := convertTemplateToBool("false", at, false)
|
||||
print := convertTemplateToBool("true", at, true)
|
||||
output := ""
|
||||
|
||||
envs := []string{}
|
||||
|
||||
return runCmd(ctx, cmd, envs, output, silent, print, ri)
|
||||
|
||||
}
|
||||
|
||||
// end commands
|
||||
|
||||
// exec
|
||||
func runCommand5(ctx context.Context,
|
||||
params accParams, ri *apps.RequestInfo) (map[string]interface{}, error) {
|
||||
|
||||
ir := make(map[string]interface{})
|
||||
ir[successKey] = false
|
||||
|
||||
at := accParamsTemplate{
|
||||
*params.Body,
|
||||
params.Commands,
|
||||
params.DirektivDir,
|
||||
}
|
||||
|
||||
cmd, err := templateString(`base64 -w 0 /tmp/{{ .OutFilename }}`, at)
|
||||
cmd, err := templateString(`base64 -w 0 {{ .OutFilename }}`, at)
|
||||
if err != nil {
|
||||
ri.Logger().Infof("error executing command: %v", err)
|
||||
ir[resultKey] = err.Error()
|
||||
|
Reference in New Issue
Block a user