feat: support no-prompt and ensure required are set

It's now possible to have a "no-prompt" option. Especially if not
required, that means the user can configure with a local
.docker/runx.yaml file for instance without to be prompt if not.

Signed-off-by: Yves Brissaud <[email protected]>

Author: eunomie

internal/commands/root/root.go

@@ -166,19 +166,16 @@ func NewCmd(dockerCli command.Cli, isPlugin bool) *cobra.Command {
 }
 
 func getValuesLocal(src, action string) map[string]string {
-	opts := make(map[string]string)
-	if ask {
-		return opts
-	}
+	localOpts := make(map[string]string)
 
 	lc := runkit.GetLocalConfig()
 	img, ok := lc.Images[src]
 	if !ok {
-		return opts
+		return localOpts
 	}
 	act, ok := img.Actions[action]
 	if !ok {
-		return opts
+		return localOpts
 	}
 	return act.Opts
 }
@@ -190,13 +187,17 @@ func run(ctx context.Context, out io.Writer, src string, rk *runkit.RunKit, acti
 		return err
 	}
 
-	localOpts := getValuesLocal(src, action)
+	localOpts := map[string]string{}
+
+	if !ask {
+		localOpts = getValuesLocal(src, action)
 
-	for _, opt := range opts {
-		if key, value, ok := strings.Cut(opt, "="); ok {
-			localOpts[key] = value
-		} else {
-			return fmt.Errorf("invalid option value %s", opt)
+		for _, opt := range opts {
+			if key, value, ok := strings.Cut(opt, "="); ok {
+				localOpts[key] = value
+			} else {
+				return fmt.Errorf("invalid option value %s", opt)
+			}
 		}
 	}
 

internal/prompt/prompt.go

@@ -63,6 +63,9 @@ func Ask(action *runkit.Action, opts map[string]string) (map[string]string, erro
 		if _, ok := opts[opt.Name]; ok {
 			continue
 		}
+		if opt.NoPrompt {
+			continue
+		}
 		opt := opt
 		if len(opt.Values) == 0 {
 			fields = append(fields,

runkit/run.go

@@ -132,6 +132,12 @@ func (r *Runnable) compute() error {
 }
 
 func (r *Runnable) SetOptionValues(opts map[string]string) error {
+	for _, opt := range r.Action.Options {
+		if opt.Required && opts[opt.Name] == "" {
+			return fmt.Errorf("option %q is required", opt.Name)
+		}
+	}
+
 	r.data.Opts = opts
 
 	if err := r.compute(); err != nil {

runkit/types.go

@@ -30,6 +30,7 @@ type (
 	Opt struct {
 		Name        string   `yaml:"name" json:"name"`
 		Description string   `yaml:"desc" json:"desc,omitempty"`
+		NoPrompt    bool     `yaml:"no-prompt,omitempty" json:"no_prompt,omitempty"`
 		Prompt      string   `yaml:"prompt,omitempty" json:"prompt,omitempty"`
 		Required    bool     `yaml:"required,omitempty" json:"required,omitempty"`
 		Values      []string `yaml:"values,omitempty" json:"values,omitempty"`