Fix sql user error msg (#240)

tidbcloud · Sep 20, 2024 · d8b7da5 · d8b7da5
1 parent c79e6db
commit d8b7da5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/internal/cli/serverless/sqluser/create.go b/internal/cli/serverless/sqluser/create.go
@@ -200,6 +200,10 @@ func CreateCmd(h *internal.Helper) *cobra.Command {
 				return errors.Trace(err)
 			}
 
+			if util.IsNilOrEmpty(builtinRole) {
+				return errors.New("built-in role must be set")
+			}
+
 			authMethod := util.MYSQLNATIVEPASSWORD
 			autoPrefix := DefaultAutoPrefix
 			params := &iam.ApiCreateSqlUserReq{

diff --git a/internal/cli/serverless/sqluser/update.go b/internal/cli/serverless/sqluser/update.go
@@ -218,6 +218,9 @@ func UpdateCmd(h *internal.Helper) *cobra.Command {
 				if err != nil {
 					return errors.Trace(err)
 				}
+				if util.IsNilOrEmpty(u.BuiltinRole) {
+					return errors.New("built-in role must be set")
+				}
 			}
 
 			if len(addRole) != 0 {
@@ -244,8 +247,9 @@ func UpdateCmd(h *internal.Helper) *cobra.Command {
 					if deleteBuiltinRole == u.BuiltinRole {
 						// it doesn't work yet, because the API doesn't support to delete the builtin role
 						u.BuiltinRole = nil
+						return errors.New("can not delete built-in role")
 					} else {
-						return errors.New(fmt.Sprintf("role %s doesn't exist in the SQL user", *deleteBuiltinRole))
+						return errors.New("can not delete built-in role")
 					}
 				}
 				for _, role := range deleteCustomRoles {