refactor: moved AskForConfirmation to ory/x/cmdx (#1848)

Co-authored-by: aeneasr <aeneas@ory.sh>
ory · May 9, 2020 · 0bd0b0d · 0bd0b0d
1 parent 8317ac0
commit 0bd0b0d
Show file tree

Hide file tree

Showing 35 changed files with 74 additions and 103 deletions.
diff --git a/.schema/api.swagger.json b/.schema/api.swagger.json
diff --git a/cmd/cli/handler_migrate.go b/cmd/cli/handler_migrate.go
@@ -1,11 +1,9 @@
 package cli
 
 import (
-	"bufio"
 	"context"
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/ory/x/cmdx"
 
@@ -82,7 +80,7 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) {
 	if !flagx.MustGetBool(cmd, "yes") {
 		fmt.Println("")
 		fmt.Println("To skip the next question use flag --yes (at your own risk).")
-		if !askForConfirmation("Do you wish to execute this migration plan?") {
+		if !cmdx.AskForConfirmation("Do you wish to execute this migration plan?", nil, nil) {
 			fmt.Println("Migration aborted.")
 			return
 		}
@@ -95,21 +93,3 @@ func (h *MigrateHandler) MigrateSQL(cmd *cobra.Command, args []string) {
 
 	fmt.Println("Successfully applied migrations!")
 }
-
-func askForConfirmation(s string) bool {
-	reader := bufio.NewReader(os.Stdin)
-
-	for {
-		fmt.Printf("%s [y/n]: ", s)
-
-		response, err := reader.ReadString('\n')
-		cmdx.Must(err, "%s", err)
-
-		response = strings.ToLower(strings.TrimSpace(response))
-		if response == "y" || response == "yes" {
-			return true
-		} else if response == "n" || response == "no" {
-			return false
-		}
-	}
-}
diff --git a/go.mod b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/ory/herodot v0.7.0
 	github.com/ory/sdk/swagutil v0.0.0-20200430101046-db494fac5eb6
 	github.com/ory/viper v1.7.4
-	github.com/ory/x v0.0.116
+	github.com/ory/x v0.0.119
 	github.com/pborman/uuid v1.2.0
 	github.com/phayes/freeport v0.0.0-20171002181615-b8543db493a5
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -909,8 +909,8 @@ github.com/ory/x v0.0.85/go.mod h1:s44V8t3xyjWZREcU+mWlp4h302rTuM4aLXcW+y5FbQ8=
 github.com/ory/x v0.0.88/go.mod h1:wrnJRjIfYXFY/AUiuUlcIUpLBDxFtWc+8x6toAeLZXU=
 github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g=
 github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE=
-github.com/ory/x v0.0.116 h1:gq47UBzFe9l8n4CToLFMAkjNwqTR+oq1JZYxhA0T5dM=
-github.com/ory/x v0.0.116/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw=
+github.com/ory/x v0.0.119 h1:XJiUkZt416m0e15Zx81MfM5S31BK+HCZLn9vhXFfj5g=
+github.com/ory/x v0.0.119/go.mod h1:ImFneVZHXPCeI1EYXLzRylIkOUMQnWT9Xwuasd8QHxw=
 github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=

diff --git a/internal/httpclient/models/accept_consent_request.go b/internal/httpclient/models/accept_consent_request.go
diff --git a/internal/httpclient/models/accept_login_request.go b/internal/httpclient/models/accept_login_request.go
diff --git a/internal/httpclient/models/completed_request.go b/internal/httpclient/models/completed_request.go
diff --git a/internal/httpclient/models/consent_request.go b/internal/httpclient/models/consent_request.go
diff --git a/internal/httpclient/models/consent_request_session.go b/internal/httpclient/models/consent_request_session.go
diff --git a/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go b/internal/httpclient/models/flush_inactive_o_auth2_tokens_request.go
diff --git a/internal/httpclient/models/generic_error.go b/internal/httpclient/models/generic_error.go
diff --git a/internal/httpclient/models/health_not_ready_status.go b/internal/httpclient/models/health_not_ready_status.go
diff --git a/internal/httpclient/models/health_status.go b/internal/httpclient/models/health_status.go
diff --git a/internal/httpclient/models/json_web_key.go b/internal/httpclient/models/json_web_key.go
diff --git a/internal/httpclient/models/json_web_key_set.go b/internal/httpclient/models/json_web_key_set.go
diff --git a/internal/httpclient/models/json_web_key_set_generator_request.go b/internal/httpclient/models/json_web_key_set_generator_request.go
diff --git a/internal/httpclient/models/login_request.go b/internal/httpclient/models/login_request.go
diff --git a/internal/httpclient/models/logout_request.go b/internal/httpclient/models/logout_request.go
diff --git a/internal/httpclient/models/o_auth2_token_introspection.go b/internal/httpclient/models/o_auth2_token_introspection.go
diff --git a/internal/httpclient/models/oauth2_token_response.go b/internal/httpclient/models/oauth2_token_response.go
diff --git a/internal/httpclient/models/open_id_connect_context.go b/internal/httpclient/models/open_id_connect_context.go
diff --git a/internal/httpclient/models/plugin_config.go b/internal/httpclient/models/plugin_config.go
diff --git a/internal/httpclient/models/plugin_config_args.go b/internal/httpclient/models/plugin_config_args.go
diff --git a/internal/httpclient/models/plugin_config_linux_swagger.go b/internal/httpclient/models/plugin_config_linux_swagger.go
diff --git a/internal/httpclient/models/plugin_config_network.go b/internal/httpclient/models/plugin_config_network.go
diff --git a/internal/httpclient/models/plugin_config_user.go b/internal/httpclient/models/plugin_config_user.go
diff --git a/internal/httpclient/models/plugin_env.go b/internal/httpclient/models/plugin_env.go
diff --git a/internal/httpclient/models/plugin_interface_type.go b/internal/httpclient/models/plugin_interface_type.go
diff --git a/internal/httpclient/models/plugin_settings.go b/internal/httpclient/models/plugin_settings.go
diff --git a/internal/httpclient/models/previous_consent_session.go b/internal/httpclient/models/previous_consent_session.go
diff --git a/internal/httpclient/models/reject_request.go b/internal/httpclient/models/reject_request.go
diff --git a/internal/httpclient/models/userinfo_response.go b/internal/httpclient/models/userinfo_response.go
diff --git a/internal/httpclient/models/version.go b/internal/httpclient/models/version.go
diff --git a/internal/httpclient/models/volume_usage_data.go b/internal/httpclient/models/volume_usage_data.go
diff --git a/internal/httpclient/models/well_known.go b/internal/httpclient/models/well_known.go