Skip to content

Commit 82ad06f

Browse files
author
Ivan Vlasic
committed
fix prompting stage name
1 parent 6f38c2d commit 82ad06f

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

cli/controller/stage.go

+17-4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ func (s *Stage) New() (bool, error) {
7474
}
7575
}
7676
stage, err := s.chooseCreateStage()
77+
if err == promptui.ErrInterrupt {
78+
return false, nil
79+
}
7780
if err != nil {
7881
return false, log.Wrap(err)
7982
}
@@ -96,18 +99,29 @@ func (s *Stage) New() (bool, error) {
9699

97100
func (s *Stage) chooseCreateStage() (*domain.Stage, error) {
98101
stageName := s.Stage
102+
var err error
99103
if stageName == "" {
100-
stageName, _ = promptStageName()
104+
stageName, err = promptStageName()
105+
if err == promptui.ErrInterrupt {
106+
return nil, nil
107+
}
108+
if err != nil {
109+
return nil, log.Wrap(err)
110+
}
111+
101112
}
102113
for {
103114
stage, err := s.project.NewStage(stageName, s.Node, s.store.ProjectRoot())
104115
var see *domain.StageExistsError
105116
if errors.As(err, &see) {
106117
ui.Info("Stage %s already exists", stageName)
107118
stageName, err = promptStageName()
108-
if err != nil {
119+
if err == promptui.ErrInterrupt {
109120
return nil, nil
110121
}
122+
if err != nil {
123+
return nil, log.Wrap(err)
124+
}
111125
continue
112126
}
113127
if err != nil {
@@ -119,8 +133,7 @@ func (s *Stage) chooseCreateStage() (*domain.Stage, error) {
119133

120134
func promptStageName() (string, error) {
121135
prompt := promptui.Prompt{
122-
Label: "Please specify a new stage name to continue",
123-
Default: domain.DefaultStageName,
136+
Label: "Please specify a new stage name to continue",
124137
}
125138
stage, err := prompt.Run()
126139
return stage, err

0 commit comments

Comments
 (0)