feat(cli): adds command to reset admin password

closes #5479

pkg/cmd/grafana-cli/commands/commands.go

@@ -90,10 +90,10 @@ var pluginCommands = []cli.Command{
 	},
 }
 
-var userCommands = []cli.Command{
+var adminCommands = []cli.Command{
 	{
-		Name:   "reset-admin",
-		Usage:  "reset-admin <new password>",
+		Name:   "reset-admin-password",
+		Usage:  "reset-admin-password <new password>",
 		Action: runDbCommand(resetPasswordCommand),
 	},
 }
@@ -105,8 +105,8 @@ var Commands = []cli.Command{
 		Subcommands: pluginCommands,
 	},
 	{
-		Name:        "user",
-		Usage:       "",
-		Subcommands: userCommands,
+		Name:        "admin",
+		Usage:       "Grafana admin commands",
+		Subcommands: adminCommands,
 	},
 }

pkg/cmd/grafana-cli/commands/reset_password_command.go

@@ -15,8 +15,9 @@ const AdminUserId = 1
 func resetPasswordCommand(c CommandLine) error {
 	newPassword := c.Args().First()
 
-	if len(newPassword) < 4 {
-		return fmt.Errorf("New password too short")
+	password := models.Password(newPassword)
+	if password.IsWeak() {
+		return fmt.Errorf("New password is too short")
 	}
 
 	userQuery := models.GetUserByIdQuery{Id: AdminUserId}
@@ -36,6 +37,7 @@ func resetPasswordCommand(c CommandLine) error {
 		return fmt.Errorf("Failed to update user password")
 	}
 
+	logger.Infof("\n")
 	logger.Infof("Admin password changed successfully %s", color.GreenString("✔"))
 
 	return nil