CLI Copy Edits (#1380)

* refer to deploying and configuring projects instead of services

* capitalize Heroku

* logging heroku API calls

* avoid mentioning heroku cli in help text

for flow that only occurs when the cli is not installed

* typo fix

Co-authored-by: Lio李歐 <[email protected]>

* link to heroku migration docs for next steps

---------

Co-authored-by: Lio李歐 <[email protected]>

Author: jordanstephens

src/cmd/cli/command/commands.go

@@ -500,9 +500,9 @@ func afterGenerate(ctx context.Context, result setup.SetupResult) {
 	}
 
 	if len(envInstructions) > 0 {
-		printDefangHint("Check the files in your favorite editor.\nTo configure the service, do "+cd, envInstructions...)
+		printDefangHint("Check the files in your favorite editor.\nTo configure this project, run "+cd, envInstructions...)
 	} else {
-		printDefangHint("Check the files in your favorite editor.\nTo deploy the service, do "+cd, "compose up")
+		printDefangHint("Check the files in your favorite editor.\nTo deploy this project, run "+cd, "compose up")
 	}
 }
 

src/pkg/migrate/heroku.go

@@ -28,14 +28,37 @@ type HerokuApplicationInfo struct {
 
 func collectHerokuApplicationInfo(ctx context.Context, client HerokuClientInterface, appName string) (HerokuApplicationInfo, error) {
 	var applicationInfo HerokuApplicationInfo
+
+	term.Info("Identifying deployed dynos")
 	dynos, err := client.ListDynos(ctx, appName)
 	if err != nil {
 		return HerokuApplicationInfo{}, fmt.Errorf("failed to list dynos: %w", err)
 	}
-	applicationInfo.Dynos = dynos
 
+	applicationInfo.Dynos = dynos
 	term.Debugf("Dynos for the selected application: %+v\n", dynos)
 
+	dynoSizes := make(map[string]HerokuDynoSize)
+	for _, dyno := range dynos {
+		dynoSize, err := client.GetDynoSize(ctx, dyno.Size)
+		if err != nil {
+			return HerokuApplicationInfo{}, fmt.Errorf("failed to get dyno size for dyno %s: %w", dyno.Name, err)
+		}
+		dynoSizes[dyno.Name] = dynoSize
+	}
+
+	applicationInfo.DynoSizes = dynoSizes
+	term.Debugf("Dyno sizes for the selected application: %+v\n", dynoSizes)
+
+	releaseTasks, err := client.GetReleaseTasks(ctx, appName)
+	if err != nil {
+		return HerokuApplicationInfo{}, fmt.Errorf("failed to get Heroku release tasks: %w", err)
+	}
+
+	applicationInfo.ReleaseTasks = releaseTasks
+	term.Debugf("Release tasks for the selected application: %+v\n", releaseTasks)
+
+	term.Info("Identifying configured addons")
 	addons, err := client.ListAddons(ctx, appName)
 	if err != nil {
 		return HerokuApplicationInfo{}, fmt.Errorf("failed to list Heroku addons: %w", err)
@@ -54,39 +77,21 @@ func collectHerokuApplicationInfo(ctx context.Context, client HerokuClientInterf
 	}
 
 	term.Debugf("Postgres info for the selected application: %+v\n", applicationInfo.PGInfo)
-	dynoSizes := make(map[string]HerokuDynoSize)
-
-	// for each dyno, get the dyno size,
-	for _, dyno := range dynos {
-		dynoSize, err := client.GetDynoSize(ctx, dyno.Size)
-		if err != nil {
-			return HerokuApplicationInfo{}, fmt.Errorf("failed to get dyno size for dyno %s: %w", dyno.Name, err)
-		}
-		dynoSizes[dyno.Name] = dynoSize
-	}
-
-	applicationInfo.DynoSizes = dynoSizes
 
 	configVars, err := client.ListConfigVars(ctx, appName)
 	if err != nil {
 		return HerokuApplicationInfo{}, fmt.Errorf("failed to list Heroku config vars: %w", err)
 	}
 	applicationInfo.ConfigVars = configVars
 
-	releaseTasks, err := client.GetReleaseTasks(ctx, appName)
-	if err != nil {
-		return HerokuApplicationInfo{}, fmt.Errorf("failed to get Heroku release tasks: %w", err)
-	}
-	applicationInfo.ReleaseTasks = releaseTasks
-
 	return applicationInfo, nil
 }
 
 func selectSourceApplication(surveyor surveyor.Surveyor, appNames []string) (string, error) {
 	var selectedApp string
 	for {
 		err := surveyor.AskOne(&survey.Select{
-			Message: "Select the Heroku application to use as a source:",
+			Message: "Select the Heroku application you would like to migrate:",
 			Options: appNames, // This should be a list of app names, but for simplicity, we use the whole string
 		}, &selectedApp)
 		if err != nil {
@@ -383,7 +388,7 @@ func getHerokuAuthToken() (string, error) {
 	for {
 		err := survey.AskOne(&survey.Password{
 			Message: "Please paste a Heroku auth token, so Defang can collect information about your applications",
-			Help:    "Run `heroku authorizations:create --expires-in=300` or visit https://dashboard.heroku.com/account/applications/authorizations/new",
+			Help:    "Visit https://dashboard.heroku.com/account/applications/authorizations/new",
 		}, &token)
 		if err != nil {
 			return "", fmt.Errorf("failed to prompt for Heroku token: %w", err)

src/pkg/setup/setup.go

@@ -36,7 +36,7 @@ func (s *SetupClient) Start(ctx context.Context) (SetupResult, error) {
 		Options: []string{
 			"Generate with AI",
 			"Clone a sample",
-			"Migrate from heroku",
+			"Migrate from Heroku",
 		},
 	}, &response)
 	if err != nil {
@@ -48,7 +48,7 @@ func (s *SetupClient) Start(ctx context.Context) (SetupResult, error) {
 		return s.AIGenerate(ctx)
 	case "Clone a sample":
 		return s.CloneSample(ctx, "")
-	case "Migrate from heroku":
+	case "Migrate from Heroku":
 		return s.MigrateFromHeroku(ctx)
 	}
 
@@ -243,6 +243,9 @@ func (s *SetupClient) MigrateFromHeroku(ctx context.Context) (SetupResult, error
 	}
 
 	term.Info("Compose file written to", composeFilePath)
+	term.Info("Your application is now ready to deploy with Defang.")
+	term.Info("For next steps, visit https://docs.defang.io/docs/tutorials/migrate-from-heroku")
+
 	return SetupResult{Folder: "."}, nil
 }