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

Add parameter-file support #966

Merged
merged 4 commits into from
Aug 24, 2018
Merged

Add parameter-file support #966

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4fcab6b
Add parameter-file support
vosmith Aug 23, 2018
83bb8e6
Use YAML/JSON as format for parameter files
vosmith Aug 23, 2018
f6ca9c4
Fix for shadowing the values during parameter file parsing
vosmith Aug 23, 2018
89c3b66
Changed unmarshalling for parameter files to map[string]interface{} i…
vosmith Aug 23, 2018
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
47 changes: 46 additions & 1 deletion cmd/argo/commands/submit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type submitFlags struct {
instanceID string // --instanceid
entrypoint string // --entrypoint
parameters []string // --parameter
parameterFile string // --parameter-file
output string // --output
wait bool // --wait
strict bool // --strict
Expand All @@ -48,6 +49,7 @@ func NewSubmitCommand() *cobra.Command {
command.Flags().StringVar(&submitArgs.generateName, "generate-name", "", "override metadata.generateName")
command.Flags().StringVar(&submitArgs.entrypoint, "entrypoint", "", "override entrypoint")
command.Flags().StringArrayVarP(&submitArgs.parameters, "parameter", "p", []string{}, "pass an input parameter")
command.Flags().StringVarP(&submitArgs.parameterFile, "parameter-file", "f", "", "pass a file containing all input parameters")
command.Flags().StringVarP(&submitArgs.output, "output", "o", "", "Output format. One of: name|json|yaml|wide")
command.Flags().BoolVarP(&submitArgs.wait, "wait", "w", false, "wait for the workflow to complete")
command.Flags().BoolVar(&submitArgs.strict, "strict", true, "perform strict workflow validation")
Expand Down Expand Up @@ -140,7 +142,7 @@ func submitWorkflow(wf *wfv1.Workflow, submitArgs *submitFlags) (string, error)
labels[common.LabelKeyControllerInstanceID] = submitArgs.instanceID
wf.SetLabels(labels)
}
if len(submitArgs.parameters) > 0 {
if len(submitArgs.parameters) > 0 || submitArgs.parameterFile != "" {
newParams := make([]wfv1.Parameter, 0)
passedParams := make(map[string]bool)
for _, paramStr := range submitArgs.parameters {
Expand All @@ -155,6 +157,49 @@ func submitWorkflow(wf *wfv1.Workflow, submitArgs *submitFlags) (string, error)
newParams = append(newParams, param)
passedParams[param.Name] = true
}

// Add parameters from a parameter-file, if one was provided
if submitArgs.parameterFile != "" {
var body []byte
var err error
if cmdutil.IsURL(submitArgs.parameterFile) {
response, err := http.Get(submitArgs.parameterFile)
if err != nil {
log.Fatal(err)
}
body, err = ioutil.ReadAll(response.Body)
_ = response.Body.Close()
if err != nil {
log.Fatal(err)
}
} else {
body, err = ioutil.ReadFile(submitArgs.parameterFile)
if err != nil {
log.Fatal(err)
}
}
for i, line := range strings.Split(string(body), "\n") {
// Ignore comments
fileParam := strings.TrimSpace(strings.Split(line, "#")[0])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would break lines like CASE_NUMBER="#12345"

if fileParam != "" {
parts := strings.SplitN(fileParam, "=", 2)
if len(parts) == 1 {
log.Fatalf("%s:%d > Expected parameter of the form: NAME=VALUE. Received: %s", submitArgs.parameterFile, i+1, fileParam)
}
param := wfv1.Parameter{
Name: parts[0],
Value: &parts[1],
}
if _, ok := passedParams[param.Name]; ok {
// this parameter was overridden via command line
continue
}
newParams = append(newParams, param)
passedParams[param.Name] = true
}
}
}

for _, param := range wf.Spec.Arguments.Parameters {
if _, ok := passedParams[param.Name]; ok {
// this parameter was overridden via command line
Expand Down