Skip to content

Move confirmation prompt to Print package #201

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

Merged
DiogoFerrao merged 3 commits into from
Apr 8, 2024
Merged

Move confirmation prompt to Print package #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44bb5fe
Move confirmation prompt to Print package
DiogoFerrao Apr 8, 2024
101ddde
Update confirmationPrompt signature, use p.Cmd
DiogoFerrao Apr 8, 2024
f4ed59d
remove p.OutOrStdout, use cmd instead
DiogoFerrao Apr 8, 2024
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
3 changes: 1 addition & 2 deletions internal/cmd/argus/instance/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/argus/instance/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/argus/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/record-set/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/record-set/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/record-set/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/zone/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/zone/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/dns/zone/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/logme/credentials/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/logme/credentials/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/logme/instance/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/logme/instance/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/logme/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mariadb/credentials/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mariadb/credentials/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mariadb/instance/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mariadb/instance/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mariadb/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mongodbflex/instance/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mongodbflex/instance/delete/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mongodbflex/instance/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
3 changes: 1 addition & 2 deletions internal/cmd/mongodbflex/user/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
}
Expand Down
Loading