Skip to content

terminal: preserve quickstart errors and detect interrupts robustly #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lofimichael wants to merge 5 commits into
base: master
Choose a base branch
from
Open

terminal: preserve quickstart errors and detect interrupts robustly #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbe35ae
Fix terminal quickstart errors
lofimichael Mar 20, 2026
340f930
Merge branch 'master' into lofimichael/stripe-cli-rules
lofimichael Mar 20, 2026
5d18f0c
Merge branch 'master' into lofimichael/stripe-cli-rules
lofimichael Mar 21, 2026
9d4630f
Merge branch 'master' into lofimichael/stripe-cli-rules
lofimichael Mar 23, 2026
bf65a48
Merge branch 'master' into lofimichael/stripe-cli-rules
tomer-stripe May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions pkg/cmd/resource/terminal_quickstart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package resource

import (
"fmt"

"github.com/spf13/cobra"

"github.com/stripe/stripe-cli/pkg/config"
Expand Down Expand Up @@ -40,26 +38,26 @@ func (cc *QuickstartCmd) runQuickstartCmd(cmd *cobra.Command, args []string) err
key, err := cc.cfg.Profile.GetAPIKey(false)

if err != nil {
return fmt.Errorf("%s", err.Error())
return err
}

err = validators.APIKeyNotRestricted(key)

if err != nil {
return fmt.Errorf("%s", err.Error())
return err
}

readers := terminal.ReaderNames()
reader, err := terminal.ReaderTypeSelectPrompt(readers)

if err != nil {
return fmt.Errorf("%s", err.Error())
return err
}

if reader == terminal.ReaderList["verifone-p400"].Name {
err = terminal.QuickstartP400(cmd.Context(), cc.cfg)
if err != nil {
return fmt.Errorf("%s", err.Error())
return err
}
}

Expand Down
19 changes: 10 additions & 9 deletions pkg/terminal/quickstart_p400.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package terminal

import (
"context"
"errors"
"fmt"
"os"
"time"
Expand All @@ -20,11 +21,11 @@ func QuickstartP400(ctx context.Context, cfg *config.Config) error {
tsCtx, err := p400.RegisterAndActivateReader(ctx, tsCtx)

if err != nil {
if err.Error() == promptui.ErrInterrupt.Error() {
if errors.Is(err, promptui.ErrInterrupt) {
os.Exit(1)
} else {
return fmt.Errorf("%s", err.Error())
}

return err
}

fmt.Println("Got it!")
Expand All @@ -33,22 +34,22 @@ func QuickstartP400(ctx context.Context, cfg *config.Config) error {

if err != nil {
p400.ClearReaderDisplay(tsCtx)
if err.Error() == promptui.ErrInterrupt.Error() {
if errors.Is(err, promptui.ErrInterrupt) {
os.Exit(1)
} else {
return fmt.Errorf("%s", err.Error())
}

return err
}

tsCtx, err = p400.CompleteTestPayment(ctx, tsCtx)

if err != nil {
p400.ClearReaderDisplay(tsCtx)
if err.Error() == promptui.ErrInterrupt.Error() {
if errors.Is(err, promptui.ErrInterrupt) {
os.Exit(1)
} else {
return fmt.Errorf("%s", err.Error())
}

return err
}

p400.SummarizeQuickstartCompletion(tsCtx)
Expand Down
Loading