address review feedback on compositions interactive

- search: reject a positional query or --hits-per-page/--page/--filters when
  --interactive is set, instead of silently ignoring them
- drop the redundant nil-Prompter fallback in upsert, rules upsert, search, and
  sorting-strategy (factory.New always sets it; Builder errors on nil anyway)

Author: ben-kalmus

pkg/cmd/compositions/rules/upsert/upsert.go

@@ -85,11 +85,7 @@ func buildRule(opts *UpsertOptions) (algoliaComposition.CompositionRule, error)
 
 	if opts.Interactive {
 		rule.ObjectID = opts.ObjectID
-		prompter := opts.Prompter
-		if prompter == nil {
-			prompter = interactive.NewSurveyPrompter(opts.IO)
-		}
-		if err := (&interactive.Builder{Prompter: prompter}).Build(&rule); err != nil {
+		if err := (&interactive.Builder{Prompter: opts.Prompter}).Build(&rule); err != nil {
 			return rule, fmt.Errorf("building rule: %w", err)
 		}
 		return rule, nil

pkg/cmd/compositions/search/search.go

@@ -68,6 +68,9 @@ func NewSearchCmd(f *cmdutil.Factory) *cobra.Command {
 				if !opts.IO.CanPrompt() {
 					return cmdutil.FlagErrorf("`--interactive` requires a terminal")
 				}
+				if len(args) > 1 || cmd.Flags().Changed("hits-per-page") || cmd.Flags().Changed("page") || cmd.Flags().Changed("filters") {
+					return cmdutil.FlagErrorf("`--interactive` builds the whole request; omit the query argument and the --hits-per-page/--page/--filters flags")
+				}
 				return runSearchCmd(opts)
 			}
 
@@ -99,11 +102,7 @@ func NewSearchCmd(f *cmdutil.Factory) *cobra.Command {
 func buildRequestBody(opts *SearchOptions) (*algoliaComposition.RequestBody, error) {
 	if opts.Interactive {
 		var body algoliaComposition.RequestBody
-		prompter := opts.Prompter
-		if prompter == nil {
-			prompter = interactive.NewSurveyPrompter(opts.IO)
-		}
-		if err := (&interactive.Builder{Prompter: prompter}).Build(&body); err != nil {
+		if err := (&interactive.Builder{Prompter: opts.Prompter}).Build(&body); err != nil {
 			return nil, fmt.Errorf("building search request: %w", err)
 		}
 		return &body, nil

pkg/cmd/compositions/search/search_test.go

@@ -89,3 +89,16 @@ func TestSearchComposition_InteractiveNoTTY(t *testing.T) {
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "requires a terminal")
 }
+
+func TestSearchComposition_InteractiveRejectsQueryAndFlags(t *testing.T) {
+	// --interactive builds the whole request; a positional query or the flags
+	// would be silently ignored, so they are rejected.
+	for _, cli := range []string{`my-comp "shirt" --interactive`, "my-comp --interactive --hits-per-page 5"} {
+		r := &httpmock.Registry{}
+		f, out := test.NewFactory(true, r, nil, "")
+		cmd := compsearch.NewSearchCmd(f)
+		_, err := test.Execute(cmd, cli, out)
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "builds the whole request")
+	}
+}

pkg/cmd/compositions/sortingstrategy/sortingstrategy.go

@@ -90,11 +90,7 @@ func buildStrategy(opts *Options) (map[string]string, error) {
 		var doc struct {
 			SortingStrategy map[string]string `json:"sortingStrategy"`
 		}
-		prompter := opts.Prompter
-		if prompter == nil {
-			prompter = interactive.NewSurveyPrompter(opts.IO)
-		}
-		if err := (&interactive.Builder{Prompter: prompter}).Build(&doc); err != nil {
+		if err := (&interactive.Builder{Prompter: opts.Prompter}).Build(&doc); err != nil {
 			return nil, fmt.Errorf("building sorting strategy: %w", err)
 		}
 		return doc.SortingStrategy, nil

pkg/cmd/compositions/upsert/upsert.go

@@ -83,11 +83,7 @@ func buildComposition(opts *UpsertOptions) (algoliaComposition.Composition, erro
 
 	if opts.Interactive {
 		comp.ObjectID = opts.CompositionID
-		prompter := opts.Prompter
-		if prompter == nil {
-			prompter = interactive.NewSurveyPrompter(opts.IO)
-		}
-		builder := &interactive.Builder{Prompter: prompter}
+		builder := &interactive.Builder{Prompter: opts.Prompter}
 		if err := builder.Build(&comp); err != nil {
 			return comp, fmt.Errorf("building composition: %w", err)
 		}