fix: update imports in cmd/

Author: srtaalej

cmd/project/create.go

@@ -17,8 +17,10 @@ package project
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/logger"
@@ -130,7 +132,7 @@ func runCreateCommand(clients *shared.ClientFactory, cmd *cobra.Command, args []
 
 	// Prompt for app name if not provided via flag or argument
 	if appNameArg == "" && clients.IO.IsTTY() {
-		defaultName := create.GenerateRandomAppName()
+		defaultName := generateRandomAppName()
 		cmd.Print(style.Secondary(fmt.Sprintf("  Press Enter to use the generated name: %s", defaultName)), "\n")
 		name, err := clients.IO.InputPrompt(ctx, "Name your app:", iostreams.InputPromptConfig{})
 		if err != nil {
@@ -286,6 +288,15 @@ func printCreateSuccess(ctx context.Context, clients *shared.ClientFactory, appP
 	clients.IO.PrintTrace(ctx, slacktrace.CreateSuccess)
 }
 
+// generateRandomAppName will create a random app name based on two words and a number
+func generateRandomAppName() string {
+	rand.New(rand.NewSource(time.Now().UnixNano()))
+	var firstRandomNum = rand.Intn(len(create.Adjectives))
+	var secondRandomNum = rand.Intn(len(create.Animals))
+	var randomName = fmt.Sprintf("%s-%s-%d", create.Adjectives[firstRandomNum], create.Animals[secondRandomNum], rand.Intn(1000))
+	return randomName
+}
+
 // printAppCreateError stops the creation spinners and displays the returned error message
 func printAppCreateError(clients *shared.ClientFactory, cmd *cobra.Command, err error) {
 	ctx := cmd.Context()

cmd/project/create_test.go

@@ -46,6 +46,7 @@ func TestCreateCommand(t *testing.T) {
 	testutil.TableTestCommand(t, testutil.CommandTests{
 		"creates a bolt application from prompts": {
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				cm.IO.On("IsTTY").Return(true)
 				cm.IO.On("SelectPrompt", mock.Anything, "Select an app:", mock.Anything, mock.Anything).
 					Return(
 						iostreams.SelectPromptResponse{
@@ -82,6 +83,7 @@ func TestCreateCommand(t *testing.T) {
 		"creates a deno application from flags": {
 			CmdArgs: []string{"--template", "slack-samples/deno-starter-template"},
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				cm.IO.On("IsTTY").Return(true)
 				cm.IO.On("SelectPrompt", mock.Anything, "Select an app:", mock.Anything, mock.Anything).
 					Return(
 						iostreams.SelectPromptResponse{
@@ -118,6 +120,7 @@ func TestCreateCommand(t *testing.T) {
 		"creates an agent app using agent argument shortcut": {
 			CmdArgs: []string{"agent"},
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				cm.IO.On("IsTTY").Return(true)
 				// Should skip category prompt and go directly to language selection
 				cm.IO.On("SelectPrompt", mock.Anything, "Select a language:", mock.Anything, mock.Anything).
 					Return(
@@ -344,6 +347,7 @@ func TestCreateCommand(t *testing.T) {
 		},
 		"user accepts default name from prompt": {
 			Setup: func(t *testing.T, ctx context.Context, cm *shared.ClientsMock, cf *shared.ClientFactory) {
+				cm.IO.On("IsTTY").Return(true)
 				cm.IO.On("SelectPrompt", mock.Anything, "Select an app:", mock.Anything, mock.Anything).
 					Return(
 						iostreams.SelectPromptResponse{

internal/iostreams/survey.go

@@ -175,8 +175,7 @@ var InputQuestionTemplate = fmt.Sprintf(`
 
 // InputPromptConfig holds additional config for an Input prompt
 type InputPromptConfig struct {
-	Required bool   // Whether the input must be non-empty
-	Default  string // Default value pre-filled in the prompt
+	Required bool // Whether the input must be non-empty
 }
 
 // GetFlags returns all flags for the Input prompt
@@ -201,7 +200,6 @@ func (io *IOStreams) InputPrompt(ctx context.Context, message string, cfg InputP
 	var input string
 	err := survey.AskOne(&survey.Input{
 		Message: message,
-		Default: cfg.Default,
 	}, &input, SurveyOptions(cfg)...)
 
 	if err != nil {

internal/pkg/create/constants.go

@@ -14,7 +14,7 @@
 
 package create
 
-var adjectives = []string{
+var Adjectives = []string{
 	"admiring",
 	"adoring",
 	"affectionate",
@@ -113,7 +113,7 @@ var adjectives = []string{
 	"zen",
 }
 
-var animals = []string{
+var Animals = []string{
 	"aardvark",
 	"alligator",
 	"alpaca",

internal/pkg/create/create.go

@@ -18,13 +18,11 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"math/rand"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -150,23 +148,15 @@ func Create(ctx context.Context, clients *shared.ClientFactory, log *logger.Logg
 	return appDirPath, nil
 }
 
-// GenerateRandomAppName will create a random app name based on two words and a number
-func GenerateRandomAppName() string {
-	rand.New(rand.NewSource(time.Now().UnixNano()))
-	var firstRandomNum = rand.Intn(len(adjectives))
-	var secondRandomNum = rand.Intn(len(animals))
-	var randomName = fmt.Sprintf("%s-%s-%d", adjectives[firstRandomNum], animals[secondRandomNum], rand.Intn(1000))
-	return randomName
-}
-
 // getAppDirName will validate and return the app's directory name
 func getAppDirName(appName string) (string, error) {
 	if len(appName) <= 0 {
-		return GenerateRandomAppName(), nil
+		return "", fmt.Errorf("app name is required")
 	}
 
 	// trim whitespace
-	appName = strings.ReplaceAll(appName, " ", "")
+	appName = strings.TrimSpace(appName)
+	appName = strings.ReplaceAll(appName, " ", "-")
 
 	// name cannot be a reserved word
 	if goutils.Contains(reserved, appName, false) {

internal/pkg/create/create_test.go

@@ -39,16 +39,30 @@ func TestGetProjectDirectoryName(t *testing.T) {
 	var appName string
 	var err error
 
-	// Test without app name test removed because more than one possible default name
+	// Test with empty name returns an error
+	appName, err = getAppDirName("")
+	assert.Error(t, err, "should return an error for empty name")
+	assert.Equal(t, "", appName)
+
 	// Test with app name
 	appName, err = getAppDirName("my-app")
 	assert.NoError(t, err, "should not return an error")
-	assert.Equal(t, appName, "my-app", "should return 'my-app'")
+	assert.Equal(t, "my-app", appName, "should return 'my-app'")
 
 	// Test with a dot in the app name
 	appName, err = getAppDirName(".my-app")
 	assert.NoError(t, err, "should not return an error")
-	assert.Equal(t, appName, ".my-app", "should return '.my-app'")
+	assert.Equal(t, ".my-app", appName, "should return '.my-app'")
+
+	// Spaces replaced with hyphens
+	appName, err = getAppDirName("my cool app")
+	assert.NoError(t, err)
+	assert.Equal(t, "my-cool-app", appName)
+
+	// Leading/trailing spaces trimmed
+	appName, err = getAppDirName("  my-app  ")
+	assert.NoError(t, err)
+	assert.Equal(t, "my-app", appName)
 }
 
 func TestGetAvailableDirectory(t *testing.T) {