Merge branch 'main' into ale-set-icon

srtaalej · web-flow · commit 27ba074a8adc · 2026-04-07T13:06:59.000-04:00
diff --git a/cmd/feedback/feedback.go b/cmd/feedback/feedback.go
@@ -68,9 +68,8 @@ const (
 
 // Supported survey names
 const (
-	SlackCLIFeedback                = "slack-cli"
-	SlackPlatformFeedback           = "slack-platform"
-	SlackPlatformFeedbackDeprecated = "platform-improvements" // DEPRECATED(semver:major)
+	SlackCLIFeedback      = "slack-cli"
+	SlackPlatformFeedback = "slack-platform"
 )
 
 type SurveyConfigInterface interface {
@@ -241,12 +240,6 @@ func runFeedbackCommand(ctx context.Context, clients *shared.ClientFactory, cmd
 		return nil
 	}
 
-	// DEPRECATED(semver:major): Support the deprecated survey name for backwards compatibility
-	if surveyNameFlag == SlackPlatformFeedbackDeprecated {
-		surveyNameFlag = SlackPlatformFeedback
-		clients.IO.PrintWarning(ctx, "DEPRECATED: The '--name %s' flag is deprecated; use '--name %s' instead", SlackPlatformFeedbackDeprecated, SlackPlatformFeedback)
-	}
-
 	surveyNames, surveyPromptOptions := initSurveyOpts(ctx, clients, SurveyStore)
 
 	if _, ok := SurveyStore[surveyNameFlag]; !ok && surveyNameFlag != "" {
diff --git a/cmd/feedback/feedback_test.go b/cmd/feedback/feedback_test.go
@@ -263,17 +263,6 @@ func TestShowSurveyMessages(t *testing.T) {
 
 func Test_Feedback_FeedbackCommand(t *testing.T) {
 	testutil.TableTestCommand(t, testutil.CommandTests{
-		// DEPRECATED(semver:major): Support the deprecated survey name for backwards compatibility
-		"supports deprecated --name platform-improvements": {
-			CmdArgs: []string{"--name", "platform-improvements"},
-			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
-				setupFeedbackCommandMocks(t, ctx, cm, cf)
-			},
-			ExpectedOutputs: []string{
-				"feedback@slack.com",
-				"https://docs.slack.dev/developer-support",
-			},
-		},
 		"supports --name slack-cli": {
 			CmdArgs: []string{"--name", "slack-cli"},
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
diff --git a/cmd/project/create_samples.go b/cmd/project/create_samples.go
@@ -43,7 +43,6 @@ func promptSampleSelection(ctx context.Context, clients *shared.ClientFactory, s
 		iostreams.SelectPromptConfig{
 			Flags: []*pflag.Flag{
 				clients.Config.Flags.Lookup("language"),
-				clients.Config.Flags.Lookup("template"), // Skip filtering with a template
 			},
 			Required: false,
 		},
@@ -69,25 +68,19 @@ func promptSampleSelection(ctx context.Context, clients *shared.ClientFactory, s
 		selectOptions[i] = r.Name
 	}
 
-	var selectedTemplate string
 	selection, err = clients.IO.SelectPrompt(ctx, "Select a sample to build upon:", selectOptions, iostreams.SelectPromptConfig{
 		Description: func(value string, index int) string {
 			return sortedRepos[index].Description
 		},
-		Flag:     clients.Config.Flags.Lookup("template"),
 		Help:     fmt.Sprintf("Guided tutorials can be found at %s", style.LinkText("https://docs.slack.dev/samples")),
 		PageSize: 4, // Supports standard terminal height (24 rows)
 		Required: true,
 		Template: embedPromptSamplesTmpl,
 	})
 	if err != nil {
 		return "", err
-	} else if selection.Flag {
-		selectedTemplate = selection.Option
-	} else if selection.Prompt {
-		selectedTemplate = sortedRepos[selection.Index].FullName
 	}
-	return selectedTemplate, nil
+	return sortedRepos[selection.Index].FullName, nil
 }
 
 // filterRepos returns a list of samples matching the provided project type
diff --git a/cmd/project/samples.go b/cmd/project/samples.go
@@ -28,8 +28,6 @@ import (
 )
 
 // Flags
-var samplesTemplateURLFlag string
-var samplesGitBranchFlag string
 var samplesListFlag bool
 var samplesLanguageFlag string
 
@@ -56,13 +54,6 @@ func NewSamplesCommand(clients *shared.ClientFactory) *cobra.Command {
 		},
 	}
 
-	// DEPRECATED(semver:major): Prefer the create command when repository details are known
-	cmd.Flags().StringVarP(&samplesGitBranchFlag, "branch", "b", "", "name of git branch to checkout")
-	cmd.Flag("branch").Hidden = true
-	// DEPRECATED(semver:major): Prefer the create command when repository details are known
-	cmd.Flags().StringVarP(&samplesTemplateURLFlag, "template", "t", "", "template URL for your app")
-	cmd.Flag("template").Hidden = true
-
 	cmd.Flags().StringVar(&samplesLanguageFlag, "language", "", "runtime for the app framework\n  ex: \"deno\", \"node\", \"python\"")
 	cmd.Flags().BoolVar(&samplesListFlag, "list", false, "prints samples without interactivity")
 
@@ -73,11 +64,6 @@ func NewSamplesCommand(clients *shared.ClientFactory) *cobra.Command {
 func runSamplesCommand(clients *shared.ClientFactory, cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 
-	// DEPRECATED(semver:major): Prefer the create command when repository details are known
-	if cmd.Flag("branch").Changed || cmd.Flag("template").Changed {
-		clients.IO.PrintWarning(ctx, "DEPRECATED: The `--branch` and `--template` flags are deprecated for the `samples` command; use the `create` command instead")
-	}
-
 	sampler := api.NewHTTPClient(api.HTTPClientOptions{
 		TotalTimeOut: 60 * time.Second,
 	})
@@ -100,16 +86,11 @@ func runSamplesCommand(clients *shared.ClientFactory, cmd *cobra.Command, args [
 	// Instantiate the `create` command to call it using programmatically set flags
 	createCmd := NewCreateCommand(clients)
 
-	// Prepare template and branch flags with selected or provided repo values
+	// Prepare the template flag with the selected repo value
 	if err := createCmd.Flag("template").Value.Set(selectedSample); err != nil {
 		return err
 	}
 	createCmd.Flag("template").Changed = true
-	if err := createCmd.Flag("branch").Value.Set(samplesGitBranchFlag); err != nil {
-		return err
-	}
-	createCmd.Flag("branch").Changed = cmd.Flag("branch").Changed
-
 	// If preferred directory name is passed in as an argument to the `create`
 	// command first, honor that preference and use it to create the project
 	createCmd.SetArgs(args)
diff --git a/cmd/project/samples_test.go b/cmd/project/samples_test.go
@@ -25,10 +25,10 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 func TestSamplesCommand(t *testing.T) {
+	var capturedArgs createPkg.CreateArgs
 	testutil.TableTestCommand(t, testutil.CommandTests{
 		"creates a template from a trusted sample": {
 			CmdArgs: []string{"my-sample-app"},
@@ -72,29 +72,16 @@ func TestSamplesCommand(t *testing.T) {
 						nil,
 					)
 				CreateFunc = func(ctx context.Context, clients *shared.ClientFactory, createArgs createPkg.CreateArgs) (appDirPath string, err error) {
+					capturedArgs = createArgs
 					return createArgs.AppName, nil
 				}
 			},
 			ExpectedOutputs: []string{
 				"cd my-sample-app/",
 			},
 			ExpectedAsserts: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock) {
-				for _, call := range cm.IO.Calls {
-					switch call.Method {
-					case "SelectPrompt":
-						args := call.Arguments
-						opts := args.Get(3).(iostreams.SelectPromptConfig)
-						flag := opts.Flag
-						switch args.String(1) {
-						case "Select a sample to build upon:":
-							require.Equal(t, "template", flag.Name)
-							assert.Equal(t, "", flag.Value.String())
-						case "Select a template to build from:":
-							require.Equal(t, "template", flag.Name)
-							assert.Equal(t, "slack-samples/deno-starter-template", flag.Value.String())
-						}
-					}
-				}
+				assert.Equal(t, "my-sample-app", capturedArgs.AppName)
+				assert.Equal(t, "slack-samples/deno-starter-template", capturedArgs.Template.GetTemplatePath())
 			},
 		},
 		"lists available samples matching a language": {
diff --git a/internal/iostreams/prompts.go b/internal/iostreams/prompts.go
@@ -192,18 +192,30 @@ func errInteractivityFlags(cfg PromptConfig) error {
 // ConfirmPrompt prompts the user for a "yes" or "no" (true or false) value for
 // the message
 func (io *IOStreams) ConfirmPrompt(ctx context.Context, message string, defaultValue bool) (bool, error) {
+	if !io.IsTTY() {
+		return false, errInteractivityFlags(ConfirmPromptConfig{})
+	}
 	return confirmForm(io, ctx, message, defaultValue)
 }
 
 // InputPrompt prompts the user for a string value for the message, which can
 // optionally be made required
 func (io *IOStreams) InputPrompt(ctx context.Context, message string, cfg InputPromptConfig) (string, error) {
+	if !io.IsTTY() {
+		if cfg.IsRequired() {
+			return "", errInteractivityFlags(cfg)
+		}
+		return "", nil
+	}
 	return inputForm(io, ctx, message, cfg)
 }
 
 // MultiSelectPrompt prompts the user to select multiple values in a list and
 // returns the selected values
 func (io *IOStreams) MultiSelectPrompt(ctx context.Context, message string, options []string) ([]string, error) {
+	if !io.IsTTY() {
+		return nil, errInteractivityFlags(MultiSelectPromptConfig{})
+	}
 	return multiSelectForm(io, ctx, message, options)
 }
 
diff --git a/internal/iostreams/prompts_test.go b/internal/iostreams/prompts_test.go
@@ -273,6 +273,97 @@ func TestPasswordPrompt(t *testing.T) {
 	}
 }
 
+func TestConfirmPrompt(t *testing.T) {
+	tests := map[string]struct {
+		expectedError string
+	}{
+		"error if non-TTY": {
+			expectedError: slackerror.ErrPrompt,
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ctx := slackcontext.MockContext(t.Context())
+
+			fsMock := slackdeps.NewFsMock()
+			osMock := slackdeps.NewOsMock()
+			osMock.On("Stdout").Return(&slackdeps.FileMock{FileInfo: &slackdeps.FileInfoNamedPipe{}})
+			cfg := config.NewConfig(fsMock, osMock)
+			io := NewIOStreams(cfg, fsMock, osMock)
+
+			_, err := io.ConfirmPrompt(ctx, "Continue?", false)
+
+			assert.Error(t, err)
+			assert.Equal(t, tc.expectedError, slackerror.ToSlackError(err).Code)
+		})
+	}
+}
+
+func TestInputPrompt(t *testing.T) {
+	tests := map[string]struct {
+		required      bool
+		expectedError string
+		expectedValue string
+	}{
+		"error if non-TTY and required": {
+			required:      true,
+			expectedError: slackerror.ErrPrompt,
+		},
+		"no error if non-TTY and optional": {
+			required:      false,
+			expectedValue: "",
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ctx := slackcontext.MockContext(t.Context())
+
+			fsMock := slackdeps.NewFsMock()
+			osMock := slackdeps.NewOsMock()
+			osMock.On("Stdout").Return(&slackdeps.FileMock{FileInfo: &slackdeps.FileInfoNamedPipe{}})
+			cfg := config.NewConfig(fsMock, osMock)
+			io := NewIOStreams(cfg, fsMock, osMock)
+
+			value, err := io.InputPrompt(ctx, "Enter name", InputPromptConfig{
+				Required: tc.required,
+			})
+
+			if err != nil {
+				assert.Equal(t, tc.expectedError, slackerror.ToSlackError(err).Code)
+			} else {
+				assert.NoError(t, err)
+				assert.Equal(t, tc.expectedValue, value)
+			}
+		})
+	}
+}
+
+func TestMultiSelectPrompt(t *testing.T) {
+	tests := map[string]struct {
+		expectedError string
+	}{
+		"error if non-TTY": {
+			expectedError: slackerror.ErrPrompt,
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			ctx := slackcontext.MockContext(t.Context())
+
+			fsMock := slackdeps.NewFsMock()
+			osMock := slackdeps.NewOsMock()
+			osMock.On("Stdout").Return(&slackdeps.FileMock{FileInfo: &slackdeps.FileInfoNamedPipe{}})
+			cfg := config.NewConfig(fsMock, osMock)
+			io := NewIOStreams(cfg, fsMock, osMock)
+
+			_, err := io.MultiSelectPrompt(ctx, "Pick items", []string{"a", "b"})
+
+			assert.Error(t, err)
+			assert.Equal(t, tc.expectedError, slackerror.ToSlackError(err).Code)
+		})
+	}
+}
+
 func TestSelectPrompt(t *testing.T) {
 	tests := map[string]struct {
 		flagValue     string
