diff --git a/internal/cmd/argus/instance/create/create.go b/internal/cmd/argus/instance/create/create.go index 962a206e9..dbe08afd4 100644 --- a/internal/cmd/argus/instance/create/create.go +++ b/internal/cmd/argus/instance/create/create.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -70,7 +69,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create an Argus instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/argus/instance/delete/delete.go b/internal/cmd/argus/instance/delete/delete.go index a1022540e..f9df05bcd 100644 --- a/internal/cmd/argus/instance/delete/delete.go +++ b/internal/cmd/argus/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/argus/instance/update/update.go b/internal/cmd/argus/instance/update/update.go index f1a9fa7bc..bfc2530db 100644 --- a/internal/cmd/argus/instance/update/update.go +++ b/internal/cmd/argus/instance/update/update.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -76,7 +75,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/record-set/create/create.go b/internal/cmd/dns/record-set/create/create.go index 6a7389791..eed001cbb 100644 --- a/internal/cmd/dns/record-set/create/create.go +++ b/internal/cmd/dns/record-set/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -73,7 +72,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a record set for zone %s?", zoneLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/record-set/delete/delete.go b/internal/cmd/dns/record-set/delete/delete.go index 29217a3a6..31876fadb 100644 --- a/internal/cmd/dns/record-set/delete/delete.go +++ b/internal/cmd/dns/record-set/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -69,7 +68,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete record set %s of zone %s? (This cannot be undone)", recordSetLabel, zoneLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/record-set/update/update.go b/internal/cmd/dns/record-set/update/update.go index 8f50c75df..b0d60d8a1 100644 --- a/internal/cmd/dns/record-set/update/update.go +++ b/internal/cmd/dns/record-set/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -77,7 +76,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update record set %s of zone %s?", recordSetLabel, zoneLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/zone/create/create.go b/internal/cmd/dns/zone/create/create.go index 6b27fe166..f85dfedb4 100644 --- a/internal/cmd/dns/zone/create/create.go +++ b/internal/cmd/dns/zone/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -87,7 +86,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a zone for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/zone/delete/delete.go b/internal/cmd/dns/zone/delete/delete.go index e12a7e547..31da4d9af 100644 --- a/internal/cmd/dns/zone/delete/delete.go +++ b/internal/cmd/dns/zone/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -59,7 +58,7 @@ func NewCmd(p *print.Printer) *cobra.Command { } if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete zone %s? (This cannot be undone)", zoneLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/dns/zone/update/update.go b/internal/cmd/dns/zone/update/update.go index 447254d33..1e25d2d48 100644 --- a/internal/cmd/dns/zone/update/update.go +++ b/internal/cmd/dns/zone/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -82,7 +81,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update zone %s?", zoneLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/logme/credentials/create/create.go b/internal/cmd/logme/credentials/create/create.go index b34269aad..3d381151a 100644 --- a/internal/cmd/logme/credentials/create/create.go +++ b/internal/cmd/logme/credentials/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -63,7 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/logme/credentials/delete/delete.go b/internal/cmd/logme/credentials/delete/delete.go index c108b9c7c..d6e603a67 100644 --- a/internal/cmd/logme/credentials/delete/delete.go +++ b/internal/cmd/logme/credentials/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -67,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %s of instance %q? (This cannot be undone)", credentialsLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/logme/instance/create/create.go b/internal/cmd/logme/instance/create/create.go index 9ef071aa2..e7bf0e6b9 100644 --- a/internal/cmd/logme/instance/create/create.go +++ b/internal/cmd/logme/instance/create/create.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -93,7 +92,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a LogMe instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/logme/instance/delete/delete.go b/internal/cmd/logme/instance/delete/delete.go index 697eb18fb..1b1d5b63d 100644 --- a/internal/cmd/logme/instance/delete/delete.go +++ b/internal/cmd/logme/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/logme/instance/update/update.go b/internal/cmd/logme/instance/update/update.go index eac0c1cef..2d95d156c 100644 --- a/internal/cmd/logme/instance/update/update.go +++ b/internal/cmd/logme/instance/update/update.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -91,7 +90,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mariadb/credentials/create/create.go b/internal/cmd/mariadb/credentials/create/create.go index f24c2576d..1d6c3b4ba 100644 --- a/internal/cmd/mariadb/credentials/create/create.go +++ b/internal/cmd/mariadb/credentials/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -63,7 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mariadb/credentials/delete/delete.go b/internal/cmd/mariadb/credentials/delete/delete.go index 028626e99..e9a755828 100644 --- a/internal/cmd/mariadb/credentials/delete/delete.go +++ b/internal/cmd/mariadb/credentials/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -67,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %s of instance %q? (This cannot be undone)", credentialsLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mariadb/instance/create/create.go b/internal/cmd/mariadb/instance/create/create.go index a3491d093..a3ea1911d 100644 --- a/internal/cmd/mariadb/instance/create/create.go +++ b/internal/cmd/mariadb/instance/create/create.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -93,7 +92,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a MariaDB instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mariadb/instance/delete/delete.go b/internal/cmd/mariadb/instance/delete/delete.go index 8b99f690c..e79e2406d 100644 --- a/internal/cmd/mariadb/instance/delete/delete.go +++ b/internal/cmd/mariadb/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mariadb/instance/update/update.go b/internal/cmd/mariadb/instance/update/update.go index 12d80c7c3..604a158fb 100644 --- a/internal/cmd/mariadb/instance/update/update.go +++ b/internal/cmd/mariadb/instance/update/update.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -91,7 +90,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/instance/create/create.go b/internal/cmd/mongodbflex/instance/create/create.go index a51b6a105..33ff74181 100644 --- a/internal/cmd/mongodbflex/instance/create/create.go +++ b/internal/cmd/mongodbflex/instance/create/create.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -94,7 +93,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a MongoDB Flex instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/instance/delete/delete.go b/internal/cmd/mongodbflex/instance/delete/delete.go index 9246f15b3..eb5366f6a 100644 --- a/internal/cmd/mongodbflex/instance/delete/delete.go +++ b/internal/cmd/mongodbflex/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/instance/update/update.go b/internal/cmd/mongodbflex/instance/update/update.go index 3a5059ce7..dabed1975 100644 --- a/internal/cmd/mongodbflex/instance/update/update.go +++ b/internal/cmd/mongodbflex/instance/update/update.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -88,7 +87,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/user/create/create.go b/internal/cmd/mongodbflex/user/create/create.go index b29dfddaf..8e934eee1 100644 --- a/internal/cmd/mongodbflex/user/create/create.go +++ b/internal/cmd/mongodbflex/user/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -77,7 +76,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a user for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/user/delete/delete.go b/internal/cmd/mongodbflex/user/delete/delete.go index a610ef710..820c5b233 100644 --- a/internal/cmd/mongodbflex/user/delete/delete.go +++ b/internal/cmd/mongodbflex/user/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete user %q of instance %q? (This cannot be undone)", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/user/reset-password/reset_password.go b/internal/cmd/mongodbflex/user/reset-password/reset_password.go index 58bb83ea9..a2942db06 100644 --- a/internal/cmd/mongodbflex/user/reset-password/reset_password.go +++ b/internal/cmd/mongodbflex/user/reset-password/reset_password.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to reset the password of user %q of instance %q? (This cannot be undone)", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/mongodbflex/user/update/update.go b/internal/cmd/mongodbflex/user/update/update.go index a0653373d..dd3cf9fc9 100644 --- a/internal/cmd/mongodbflex/user/update/update.go +++ b/internal/cmd/mongodbflex/user/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -72,7 +71,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update user %q of instance %q?", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/bucket/create/create.go b/internal/cmd/object-storage/bucket/create/create.go index fe44d9a45..92674a1de 100644 --- a/internal/cmd/object-storage/bucket/create/create.go +++ b/internal/cmd/object-storage/bucket/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -53,7 +52,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create bucket %q? (This cannot be undone)", model.BucketName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/bucket/delete/delete.go b/internal/cmd/object-storage/bucket/delete/delete.go index 8068776cf..c8ce892a4 100644 --- a/internal/cmd/object-storage/bucket/delete/delete.go +++ b/internal/cmd/object-storage/bucket/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -53,7 +52,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete bucket %q? (This cannot be undone)", model.BucketName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/credentials-group/create/create.go b/internal/cmd/object-storage/credentials-group/create/create.go index 4925a545c..4e51e03c3 100644 --- a/internal/cmd/object-storage/credentials-group/create/create.go +++ b/internal/cmd/object-storage/credentials-group/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -53,7 +52,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a credentials group with name %q?", model.CredentialsGroupName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/credentials-group/delete/delete.go b/internal/cmd/object-storage/credentials-group/delete/delete.go index 4e4afa81e..4d2257981 100644 --- a/internal/cmd/object-storage/credentials-group/delete/delete.go +++ b/internal/cmd/object-storage/credentials-group/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -58,7 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials group %q? (This cannot be undone)", credentialsGroupLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/credentials/create/create.go b/internal/cmd/object-storage/credentials/create/create.go index 6445880b3..56f8180fa 100644 --- a/internal/cmd/object-storage/credentials/create/create.go +++ b/internal/cmd/object-storage/credentials/create/create.go @@ -9,7 +9,6 @@ import ( "github.com/spf13/cobra" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -66,7 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials in group %q?", credentialsGroupLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/credentials/delete/delete.go b/internal/cmd/object-storage/credentials/delete/delete.go index 1bfdcc122..3ddc4e651 100644 --- a/internal/cmd/object-storage/credentials/delete/delete.go +++ b/internal/cmd/object-storage/credentials/delete/delete.go @@ -6,7 +6,6 @@ import ( "github.com/spf13/cobra" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -64,7 +63,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %q of credentials group %q? (This cannot be undone)", credentialsLabel, credentialsGroupLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/disable/disable.go b/internal/cmd/object-storage/disable/disable.go index e257d57ae..9705717b6 100644 --- a/internal/cmd/object-storage/disable/disable.go +++ b/internal/cmd/object-storage/disable/disable.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -52,7 +51,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to disable Object Storage for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/object-storage/enable/enable.go b/internal/cmd/object-storage/enable/enable.go index 609d5e591..8b21ec133 100644 --- a/internal/cmd/object-storage/enable/enable.go +++ b/internal/cmd/object-storage/enable/enable.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -52,7 +51,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to enable Object Storage for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/opensearch/credentials/create/create.go b/internal/cmd/opensearch/credentials/create/create.go index 62978f298..6cbcc0d63 100644 --- a/internal/cmd/opensearch/credentials/create/create.go +++ b/internal/cmd/opensearch/credentials/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -63,7 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/opensearch/credentials/delete/delete.go b/internal/cmd/opensearch/credentials/delete/delete.go index f27e1ea5a..b3f40ddb4 100644 --- a/internal/cmd/opensearch/credentials/delete/delete.go +++ b/internal/cmd/opensearch/credentials/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -67,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %s of instance %q? (This cannot be undone)", credentialsLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/opensearch/instance/create/create.go b/internal/cmd/opensearch/instance/create/create.go index 4a9507e77..c36cbaa0d 100644 --- a/internal/cmd/opensearch/instance/create/create.go +++ b/internal/cmd/opensearch/instance/create/create.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -93,7 +92,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create an OpenSearch instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/opensearch/instance/delete/delete.go b/internal/cmd/opensearch/instance/delete/delete.go index d786ae041..3f3041f6d 100644 --- a/internal/cmd/opensearch/instance/delete/delete.go +++ b/internal/cmd/opensearch/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/opensearch/instance/update/update.go b/internal/cmd/opensearch/instance/update/update.go index fba6b527d..b25e76d3d 100644 --- a/internal/cmd/opensearch/instance/update/update.go +++ b/internal/cmd/opensearch/instance/update/update.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -91,7 +90,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/organization/member/add/add.go b/internal/cmd/organization/member/add/add.go index daae1d15a..18dad5b52 100644 --- a/internal/cmd/organization/member/add/add.go +++ b/internal/cmd/organization/member/add/add.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to add the %s role to %s on organization with ID %q?", *model.Role, model.Subject, *model.OrganizationId) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/organization/member/remove/remove.go b/internal/cmd/organization/member/remove/remove.go index 884137c91..fec254feb 100644 --- a/internal/cmd/organization/member/remove/remove.go +++ b/internal/cmd/organization/member/remove/remove.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -72,7 +71,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if model.Force { prompt = fmt.Sprintf("%s This will also remove other roles of the subject that would stop the removal of the requested role", prompt) } - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/instance/clone/clone.go b/internal/cmd/postgresflex/instance/clone/clone.go index d064cc27a..c8d6ae543 100644 --- a/internal/cmd/postgresflex/instance/clone/clone.go +++ b/internal/cmd/postgresflex/instance/clone/clone.go @@ -6,7 +6,6 @@ import ( "time" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -79,7 +78,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to clone instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/instance/create/create.go b/internal/cmd/postgresflex/instance/create/create.go index 43a00d002..b10bd2684 100644 --- a/internal/cmd/postgresflex/instance/create/create.go +++ b/internal/cmd/postgresflex/instance/create/create.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -94,7 +93,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a PostgreSQL Flex instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/instance/delete/delete.go b/internal/cmd/postgresflex/instance/delete/delete.go index 95f856479..492f88839 100644 --- a/internal/cmd/postgresflex/instance/delete/delete.go +++ b/internal/cmd/postgresflex/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/instance/update/update.go b/internal/cmd/postgresflex/instance/update/update.go index 7075c9dfe..7b8d61fe9 100644 --- a/internal/cmd/postgresflex/instance/update/update.go +++ b/internal/cmd/postgresflex/instance/update/update.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -88,7 +87,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q? (This may cause downtime)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/user/create/create.go b/internal/cmd/postgresflex/user/create/create.go index 05cdabe47..f767edc18 100644 --- a/internal/cmd/postgresflex/user/create/create.go +++ b/internal/cmd/postgresflex/user/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -75,7 +74,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a user for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/user/delete/delete.go b/internal/cmd/postgresflex/user/delete/delete.go index 83af974cf..22da6c947 100644 --- a/internal/cmd/postgresflex/user/delete/delete.go +++ b/internal/cmd/postgresflex/user/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete user %q of instance %q? (This cannot be undone)", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/user/reset-password/reset_password.go b/internal/cmd/postgresflex/user/reset-password/reset_password.go index 48cba14be..2846288cc 100644 --- a/internal/cmd/postgresflex/user/reset-password/reset_password.go +++ b/internal/cmd/postgresflex/user/reset-password/reset_password.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -70,7 +69,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to reset the password of user %q of instance %q? (This cannot be undone)", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/postgresflex/user/update/update.go b/internal/cmd/postgresflex/user/update/update.go index 9d2f7454c..d00378ce2 100644 --- a/internal/cmd/postgresflex/user/update/update.go +++ b/internal/cmd/postgresflex/user/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -69,7 +68,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update user %q of instance %q?", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/project/create/create.go b/internal/cmd/project/create/create.go index 004ed8cc7..ef47161f8 100644 --- a/internal/cmd/project/create/create.go +++ b/internal/cmd/project/create/create.go @@ -7,7 +7,6 @@ import ( "github.com/stackitcloud/stackit-cli/internal/pkg/args" "github.com/stackitcloud/stackit-cli/internal/pkg/auth" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -66,7 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a project under the parent with ID %q?", *model.ParentId) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/project/delete/delete.go b/internal/cmd/project/delete/delete.go index 957b180aa..333389bc8 100644 --- a/internal/cmd/project/delete/delete.go +++ b/internal/cmd/project/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -55,7 +54,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete the project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/project/member/add/add.go b/internal/cmd/project/member/add/add.go index 2272cc498..6d56baffb 100644 --- a/internal/cmd/project/member/add/add.go +++ b/internal/cmd/project/member/add/add.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to add the role %q to %s on project %q?", *model.Role, model.Subject, projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/project/member/remove/remove.go b/internal/cmd/project/member/remove/remove.go index b52eadce2..fa2e6711e 100644 --- a/internal/cmd/project/member/remove/remove.go +++ b/internal/cmd/project/member/remove/remove.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -77,7 +76,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if model.Force { prompt = fmt.Sprintf("%s This will also remove other roles of the subject that would stop the removal of the requested role", prompt) } - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/project/update/update.go b/internal/cmd/project/update/update.go index b14db39df..19d3acff5 100644 --- a/internal/cmd/project/update/update.go +++ b/internal/cmd/project/update/update.go @@ -6,7 +6,6 @@ import ( "regexp" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -74,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/rabbitmq/credentials/create/create.go b/internal/cmd/rabbitmq/credentials/create/create.go index 65659edc6..d96993d8f 100644 --- a/internal/cmd/rabbitmq/credentials/create/create.go +++ b/internal/cmd/rabbitmq/credentials/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -63,7 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/rabbitmq/credentials/delete/delete.go b/internal/cmd/rabbitmq/credentials/delete/delete.go index 4b004b0f5..dec132d43 100644 --- a/internal/cmd/rabbitmq/credentials/delete/delete.go +++ b/internal/cmd/rabbitmq/credentials/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -67,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %s of instance %q? (This cannot be undone)", credentialsLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/rabbitmq/instance/create/create.go b/internal/cmd/rabbitmq/instance/create/create.go index 40b0515ed..1bb68a43a 100644 --- a/internal/cmd/rabbitmq/instance/create/create.go +++ b/internal/cmd/rabbitmq/instance/create/create.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -93,7 +92,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create an RabbitMQ instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/rabbitmq/instance/delete/delete.go b/internal/cmd/rabbitmq/instance/delete/delete.go index 80acccb82..f193bde32 100644 --- a/internal/cmd/rabbitmq/instance/delete/delete.go +++ b/internal/cmd/rabbitmq/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/rabbitmq/instance/update/update.go b/internal/cmd/rabbitmq/instance/update/update.go index a61a518c5..557918fc8 100644 --- a/internal/cmd/rabbitmq/instance/update/update.go +++ b/internal/cmd/rabbitmq/instance/update/update.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -91,7 +90,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/redis/credentials/create/create.go b/internal/cmd/redis/credentials/create/create.go index febdf2f8e..7f44b2038 100644 --- a/internal/cmd/redis/credentials/create/create.go +++ b/internal/cmd/redis/credentials/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -63,7 +62,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create credentials for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/redis/credentials/delete/delete.go b/internal/cmd/redis/credentials/delete/delete.go index d8e3de670..f11a994e8 100644 --- a/internal/cmd/redis/credentials/delete/delete.go +++ b/internal/cmd/redis/credentials/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -67,7 +66,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete credentials %s of instance %q? (This cannot be undone)", credentialsLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/redis/instance/create/create.go b/internal/cmd/redis/instance/create/create.go index 40cc8232c..ff939993e 100644 --- a/internal/cmd/redis/instance/create/create.go +++ b/internal/cmd/redis/instance/create/create.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -93,7 +92,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a Redis instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/redis/instance/delete/delete.go b/internal/cmd/redis/instance/delete/delete.go index 224a04275..1044e8e02 100644 --- a/internal/cmd/redis/instance/delete/delete.go +++ b/internal/cmd/redis/instance/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/redis/instance/update/update.go b/internal/cmd/redis/instance/update/update.go index c2f79261e..bac2813fb 100644 --- a/internal/cmd/redis/instance/update/update.go +++ b/internal/cmd/redis/instance/update/update.go @@ -7,7 +7,6 @@ import ( "strings" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -91,7 +90,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/instance/create/create.go b/internal/cmd/secrets-manager/instance/create/create.go index 33f173d93..7f2ccd543 100644 --- a/internal/cmd/secrets-manager/instance/create/create.go +++ b/internal/cmd/secrets-manager/instance/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -66,7 +65,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a Secrets Manager instance for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/instance/delete/delete.go b/internal/cmd/secrets-manager/instance/delete/delete.go index 479e9d646..2df5b132c 100644 --- a/internal/cmd/secrets-manager/instance/delete/delete.go +++ b/internal/cmd/secrets-manager/instance/delete/delete.go @@ -6,7 +6,6 @@ import ( "github.com/spf13/cobra" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -57,7 +56,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete instance %q? (This cannot be undone)", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/instance/update/update.go b/internal/cmd/secrets-manager/instance/update/update.go index cee06b5b1..c1cc535ea 100644 --- a/internal/cmd/secrets-manager/instance/update/update.go +++ b/internal/cmd/secrets-manager/instance/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" cliErr "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -64,7 +63,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/user/create/create.go b/internal/cmd/secrets-manager/user/create/create.go index 33dadfea2..1ca5e2579 100644 --- a/internal/cmd/secrets-manager/user/create/create.go +++ b/internal/cmd/secrets-manager/user/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a user for instance %q?", instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/user/delete/delete.go b/internal/cmd/secrets-manager/user/delete/delete.go index 2ebb49ab2..f8a754ed6 100644 --- a/internal/cmd/secrets-manager/user/delete/delete.go +++ b/internal/cmd/secrets-manager/user/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete user %s of instance %q? (This cannot be undone)", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/secrets-manager/user/update/update.go b/internal/cmd/secrets-manager/user/update/update.go index 2151194f2..fb8dc6951 100644 --- a/internal/cmd/secrets-manager/user/update/update.go +++ b/internal/cmd/secrets-manager/user/update/update.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -75,7 +74,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update user %s of instance %q?", userLabel, instanceLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/create/create.go b/internal/cmd/service-account/create/create.go index 336b6b5c9..5f8843f64 100644 --- a/internal/cmd/service-account/create/create.go +++ b/internal/cmd/service-account/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -58,7 +57,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a service account for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/delete/delete.go b/internal/cmd/service-account/delete/delete.go index 39d34cb97..718e16b8c 100644 --- a/internal/cmd/service-account/delete/delete.go +++ b/internal/cmd/service-account/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -51,7 +50,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete service account %s? (This cannot be undone)", model.Email) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/key/create/create.go b/internal/cmd/service-account/key/create/create.go index 3ae088943..dbcce7bf4 100644 --- a/internal/cmd/service-account/key/create/create.go +++ b/internal/cmd/service-account/key/create/create.go @@ -7,7 +7,6 @@ import ( "time" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -74,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command { validUntilInfo = fmt.Sprintf("The key will be valid for %d days", *model.ExpiresInDays) } prompt := fmt.Sprintf("Are you sure you want to create a key for service account %s? %s", model.ServiceAccountEmail, validUntilInfo) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/key/delete/delete.go b/internal/cmd/service-account/key/delete/delete.go index 8aa4ce525..81e4f424f 100644 --- a/internal/cmd/service-account/key/delete/delete.go +++ b/internal/cmd/service-account/key/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -57,7 +56,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete the key %s from service account %s?", model.KeyId, model.ServiceAccountEmail) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/key/update/update.go b/internal/cmd/service-account/key/update/update.go index 2d44080f9..3b14a7613 100644 --- a/internal/cmd/service-account/key/update/update.go +++ b/internal/cmd/service-account/key/update/update.go @@ -7,7 +7,6 @@ import ( "time" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -74,7 +73,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update the key with ID %q?", model.KeyId) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/token/create/create.go b/internal/cmd/service-account/token/create/create.go index 26c3ca5ba..6b726d2ef 100644 --- a/internal/cmd/service-account/token/create/create.go +++ b/internal/cmd/service-account/token/create/create.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -64,7 +63,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create an access token for service account %s?", model.ServiceAccountEmail) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/service-account/token/revoke/revoke.go b/internal/cmd/service-account/token/revoke/revoke.go index 73cf64f78..8dad19a68 100644 --- a/internal/cmd/service-account/token/revoke/revoke.go +++ b/internal/cmd/service-account/token/revoke/revoke.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -60,7 +59,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to revoke the access token with ID %q?", model.TokenId) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/cluster/create/create.go b/internal/cmd/ske/cluster/create/create.go index 1d30718c4..4b8ce7059 100644 --- a/internal/cmd/ske/cluster/create/create.go +++ b/internal/cmd/ske/cluster/create/create.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -80,7 +79,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to create a cluster for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/cluster/delete/delete.go b/internal/cmd/ske/cluster/delete/delete.go index 94e3dd44f..fbdade38b 100644 --- a/internal/cmd/ske/cluster/delete/delete.go +++ b/internal/cmd/ske/cluster/delete/delete.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -53,7 +52,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to delete cluster %q? (This cannot be undone)", model.ClusterName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/cluster/update/update.go b/internal/cmd/ske/cluster/update/update.go index bc71db85e..74b3c73a8 100644 --- a/internal/cmd/ske/cluster/update/update.go +++ b/internal/cmd/ske/cluster/update/update.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/flags" @@ -71,7 +70,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to update cluster %q?", model.ClusterName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/credentials/rotate/rotate.go b/internal/cmd/ske/credentials/rotate/rotate.go index 74800fb30..7e03ef73f 100644 --- a/internal/cmd/ske/credentials/rotate/rotate.go +++ b/internal/cmd/ske/credentials/rotate/rotate.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -53,7 +52,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to rotate credentials for SKE cluster %q? (The old credentials will be invalid after this operation)", model.ClusterName) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/disable/disable.go b/internal/cmd/ske/disable/disable.go index edf0a4593..a34651a7b 100644 --- a/internal/cmd/ske/disable/disable.go +++ b/internal/cmd/ske/disable/disable.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -54,7 +53,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to disable SKE for project %q? (This will delete all associated clusters)", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/cmd/ske/enable/enable.go b/internal/cmd/ske/enable/enable.go index c2af18075..f399267d7 100644 --- a/internal/cmd/ske/enable/enable.go +++ b/internal/cmd/ske/enable/enable.go @@ -5,7 +5,6 @@ import ( "fmt" "github.com/stackitcloud/stackit-cli/internal/pkg/args" - "github.com/stackitcloud/stackit-cli/internal/pkg/confirm" "github.com/stackitcloud/stackit-cli/internal/pkg/errors" "github.com/stackitcloud/stackit-cli/internal/pkg/examples" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -54,7 +53,7 @@ func NewCmd(p *print.Printer) *cobra.Command { if !model.AssumeYes { prompt := fmt.Sprintf("Are you sure you want to enable SKE for project %q?", projectLabel) - err = confirm.PromptForConfirmation(cmd, prompt) + err = p.PromptForConfirmation(prompt) if err != nil { return err } diff --git a/internal/pkg/confirm/confirm.go b/internal/pkg/confirm/confirm.go deleted file mode 100644 index 99a2f2f96..000000000 --- a/internal/pkg/confirm/confirm.go +++ /dev/null @@ -1,36 +0,0 @@ -package confirm - -import ( - "bufio" - "errors" - "fmt" - "strings" - - "github.com/spf13/cobra" -) - -var errAborted = errors.New("operation aborted") - -// Prompts the user for confirmation. -// -// Returns nil only if the user (explicitly) answers positive. -// Returns ErrAborted if the user answers negative. -func PromptForConfirmation(cmd *cobra.Command, prompt string) error { - question := fmt.Sprintf("%s [y/N] ", prompt) - reader := bufio.NewReader(cmd.InOrStdin()) - for i := 0; i < 3; i++ { - cmd.Print(question) - answer, err := reader.ReadString('\n') - if err != nil { - continue - } - answer = strings.ToLower(strings.TrimSpace(answer)) - if answer == "y" || answer == "yes" { - return nil - } - if answer == "" || answer == "n" || answer == "no" { - return errAborted - } - } - return fmt.Errorf("max number of wrong inputs") -} diff --git a/internal/pkg/confirm/confirm_test.go b/internal/pkg/confirm/confirm_test.go deleted file mode 100644 index 84f792952..000000000 --- a/internal/pkg/confirm/confirm_test.go +++ /dev/null @@ -1,165 +0,0 @@ -package confirm - -import ( - "bytes" - "errors" - "io" - "testing" - - "github.com/spf13/cobra" -) - -func TestPromptForConfirmation(t *testing.T) { - tests := []struct { - description string - input string - isValid bool - isAborted bool - }{ - // Note: Some of these inputs have normal spaces, others have tabs - { - description: "yes - simple 1", - input: "y\n", - isValid: true, - }, - { - description: "yes - simple 2", - input: " Y \r\n", - isValid: true, - }, - { - description: "yes - simple 3", - input: " yes\n", - isValid: true, - }, - { - description: "yes - simple 4", - input: "YES\n", - isValid: true, - }, - { - description: "yes - retries 1", - input: "yrs\nyes\n", - isValid: true, - }, - { - description: "yes - retries 2", - input: "foo\nbar \n y\n", - isValid: true, - }, - { - description: "yes - retries 3", - input: "foo\r\nbar \nY \n", - isValid: true, - }, - { - description: "no - simple 1", - input: "n\n", - isValid: false, - isAborted: true, - }, - { - description: "no - simple 2", - input: " N \r\n", - isValid: false, - isAborted: true, - }, - { - description: "no - simple 3", - input: "no\n", - isValid: false, - isAborted: true, - }, - { - description: "no - simple 4", - input: " \n", - isValid: false, - isAborted: true, - }, - { - description: "no - simple 5", - input: " \r\n", - isValid: false, - isAborted: true, - }, - { - description: "no - retries 1", - input: "ni\n no \n", - isValid: false, - isAborted: true, - }, - { - description: "no - retries 2", - input: "foo\nbar\nn\n", - isValid: false, - isAborted: true, - }, - { - description: "no - retries 3", - input: "foo\r\nbar\nN\n", - isValid: false, - isAborted: true, - }, - { - description: "no - retries 4", - input: "m\n \n", - isValid: false, - isAborted: true, - }, - { - description: "no - retries 5", - input: "m\r\n \r\n", - isValid: false, - isAborted: true, - }, - { - description: "max retries 1", - input: "foo\nbar\nbaz\n", - isValid: false, - }, - { - description: "max retries 2", - input: "foo\r\nbar\r\nbaz\r\n", - isValid: false, - }, - { - description: "max retries 3", - input: "foo\nbar\nbaz\ny\n", - isValid: false, - }, - { - description: "no input", - input: "", - isValid: false, - }, - } - - for _, tt := range tests { - t.Run(tt.description, func(t *testing.T) { - buffer := &bytes.Buffer{} - _, err := buffer.WriteString(tt.input) - if err != nil { - t.Fatalf("failed to initialize mock input: %v", err) - } - - cmd := &cobra.Command{} - cmd.SetOut(io.Discard) // Suppresses console prints - cmd.SetIn(buffer) - - err = PromptForConfirmation(cmd, "") - - if tt.isValid && err != nil { - t.Errorf("should not have failed: %v", err) - } - if !tt.isValid && err == nil { - t.Errorf("should have failed") - } - if tt.isAborted && !errors.Is(err, errAborted) { - t.Errorf("should have returned aborted error, instead returned: %v", err) - } - if !tt.isAborted && errors.Is(err, errAborted) { - t.Errorf("should not have returned aborted error") - } - }) - } -} diff --git a/internal/pkg/pager/pager.go b/internal/pkg/pager/pager.go index 297dbe9f9..b3b89104c 100644 --- a/internal/pkg/pager/pager.go +++ b/internal/pkg/pager/pager.go @@ -12,7 +12,7 @@ import ( func Display(p *print.Printer, content string) error { lessCmd := exec.Command("less", "-F", "-S", "-w") lessCmd.Stdin = strings.NewReader(content) - lessCmd.Stdout = p.OutOrStdout() + lessCmd.Stdout = p.Cmd.OutOrStdout() err := lessCmd.Run() if err != nil { diff --git a/internal/pkg/print/print.go b/internal/pkg/print/print.go index ced7f8b5d..4a6a1a13c 100644 --- a/internal/pkg/print/print.go +++ b/internal/pkg/print/print.go @@ -1,9 +1,12 @@ package print import ( - "io" + "bufio" + "errors" + "fmt" "log/slog" "os" + "strings" "github.com/spf13/cobra" ) @@ -17,6 +20,8 @@ const ( ErrorLevel Level = "error" ) +var errAborted = errors.New("operation aborted") + type Printer struct { Cmd *cobra.Command Verbosity Level @@ -81,7 +86,26 @@ func (p *Printer) Error(msg string) { p.Cmd.PrintErrln(p.Cmd.ErrPrefix(), msg) } -// Returns the printer's command defined output -func (p *Printer) OutOrStdout() io.Writer { - return p.Cmd.OutOrStdout() +// Prompts the user for confirmation. +// +// Returns nil only if the user (explicitly) answers positive. +// Returns ErrAborted if the user answers negative. +func (p *Printer) PromptForConfirmation(prompt string) error { + question := fmt.Sprintf("%s [y/N] ", prompt) + reader := bufio.NewReader(p.Cmd.InOrStdin()) + for i := 0; i < 3; i++ { + p.Cmd.PrintErr(question) + answer, err := reader.ReadString('\n') + if err != nil { + continue + } + answer = strings.ToLower(strings.TrimSpace(answer)) + if answer == "y" || answer == "yes" { + return nil + } + if answer == "" || answer == "n" || answer == "no" { + return errAborted + } + } + return fmt.Errorf("max number of wrong inputs") } diff --git a/internal/pkg/print/print_test.go b/internal/pkg/print/print_test.go index 48555b817..e094f9f8c 100644 --- a/internal/pkg/print/print_test.go +++ b/internal/pkg/print/print_test.go @@ -2,10 +2,10 @@ package print import ( "bytes" + "errors" "fmt" "io" "log/slog" - "os" "testing" "github.com/spf13/cobra" @@ -396,38 +396,184 @@ func TestError(t *testing.T) { } } -func TestOutOrStdout(t *testing.T) { +func TestPromptForConfirmation(t *testing.T) { tests := []struct { description string - writer io.Writer + input string + verbosity Level + isValid bool + isAborted bool }{ + // Note: Some of these inputs have normal spaces, others have tabs + { + description: "yes - simple 1", + input: "y\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - simple 2", + input: " Y \r\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - simple 3", + input: " yes\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - simple 4", + input: "YES\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - retries 1", + input: "yrs\nyes\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - retries 2", + input: "foo\nbar \n y\n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "yes - retries 3", + input: "foo\r\nbar \nY \n", + verbosity: DebugLevel, + isValid: true, + }, + { + description: "no - simple 1", + input: "n\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "no - simple 2", + input: " N \r\n", + isValid: false, + verbosity: DebugLevel, + isAborted: true, + }, + { + description: "no - simple 3", + input: "no\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "no - simple 4", + input: " \n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, { - description: "os stdout", - writer: os.Stdout, + description: "no - simple 5", + input: " \r\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, }, { - description: "os stderr", - writer: os.Stderr, + description: "no - retries 1", + input: "ni\n no \n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, }, { - description: "custom bytes buffer", - writer: &bytes.Buffer{}, + description: "no - retries 2", + input: "foo\nbar\nn\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "no - retries 3", + input: "foo\r\nbar\nN\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "no - retries 4", + input: "m\n \n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "no - retries 5", + input: "m\r\n \r\n", + verbosity: DebugLevel, + isValid: false, + isAborted: true, + }, + { + description: "max retries 1", + input: "foo\nbar\nbaz\n", + verbosity: DebugLevel, + isValid: false, + }, + { + description: "max retries 2", + input: "foo\r\nbar\r\nbaz\r\n", + verbosity: DebugLevel, + isValid: false, + }, + { + description: "max retries 3", + input: "foo\nbar\nbaz\ny\n", + verbosity: DebugLevel, + isValid: false, + }, + { + description: "no input", + input: "", + verbosity: DebugLevel, + isValid: false, }, } + for _, tt := range tests { t.Run(tt.description, func(t *testing.T) { + buffer := &bytes.Buffer{} + _, err := buffer.WriteString(tt.input) + if err != nil { + t.Fatalf("failed to initialize mock input: %v", err) + } + cmd := &cobra.Command{} - cmd.SetOutput(tt.writer) + cmd.SetOut(io.Discard) // Suppresses console prints + cmd.SetErr(io.Discard) + cmd.SetIn(buffer) + p := &Printer{ Cmd: cmd, - Verbosity: DebugLevel, + Verbosity: tt.verbosity, } - got := p.OutOrStdout() + err = p.PromptForConfirmation("") - expected := tt.writer - if got != expected { - t.Errorf("unexpected output: got %v, want %v", got, expected) + if tt.isValid && err != nil { + t.Errorf("should not have failed: %v", err) + } + if !tt.isValid && err == nil { + t.Errorf("should have failed") + } + if tt.isAborted && !errors.Is(err, errAborted) { + t.Errorf("should have returned aborted error, instead returned: %v", err) + } + if !tt.isAborted && errors.Is(err, errAborted) { + t.Errorf("should not have returned aborted error") } }) }