fix: use context-aware db calls in cmd/user
This commit is contained in:
@@ -3,6 +3,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
@@ -36,6 +37,8 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func run(dbConn *sql.DB, args []string) int {
|
func run(dbConn *sql.DB, args []string) int {
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
cmd, err := parseArgs(args)
|
cmd, err := parseArgs(args)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Warn("cli_usage", "cmd/user", "invalid arguments", map[string]any{"argc": len(args)}, err)
|
observability.Warn("cli_usage", "cmd/user", "invalid arguments", map[string]any{"argc": len(args)}, err)
|
||||||
@@ -45,13 +48,13 @@ func run(dbConn *sql.DB, args []string) int {
|
|||||||
|
|
||||||
switch cmd.kind {
|
switch cmd.kind {
|
||||||
case commandUpdateAvatar:
|
case commandUpdateAvatar:
|
||||||
updateAvatars(dbConn)
|
updateAvatars(ctx, dbConn)
|
||||||
return 0
|
return 0
|
||||||
case commandRunFixes:
|
case commandRunFixes:
|
||||||
runFixes(dbConn)
|
runFixes(ctx, dbConn)
|
||||||
return 0
|
return 0
|
||||||
case commandCreateOrUpdateUser:
|
case commandCreateOrUpdateUser:
|
||||||
if err := createOrUpdateUser(dbConn, cmd.username, cmd.password); err != nil {
|
if err := createOrUpdateUser(ctx, dbConn, cmd.username, cmd.password); err != nil {
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
return 0
|
return 0
|
||||||
@@ -100,8 +103,8 @@ func usage() string {
|
|||||||
return "Usage: go run cmd/user/main.go <username> <password>\n go run cmd/user/main.go update-avatar\n go run cmd/user/main.go run-fixes"
|
return "Usage: go run cmd/user/main.go <username> <password>\n go run cmd/user/main.go update-avatar\n go run cmd/user/main.go run-fixes"
|
||||||
}
|
}
|
||||||
|
|
||||||
func createOrUpdateUser(dbConn *sql.DB, username string, password string) error {
|
func createOrUpdateUser(ctx context.Context, dbConn *sql.DB, username string, password string) error {
|
||||||
existingID, err := lookupUserID(dbConn, username)
|
existingID, err := lookupUserID(ctx, dbConn, username)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_user_lookup_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
observability.Error("cli_user_lookup_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
||||||
return err
|
return err
|
||||||
@@ -112,23 +115,23 @@ func createOrUpdateUser(dbConn *sql.DB, username string, password string) error
|
|||||||
fmt.Println("Operation cancelled.")
|
fmt.Println("Operation cancelled.")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if err := updateUserPassword(dbConn, existingID, username, password); err != nil {
|
if err := updateUserPassword(ctx, dbConn, existingID, username, password); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Printf("Password for '%s' updated successfully!\n", username)
|
fmt.Printf("Password for '%s' updated successfully!\n", username)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := createUser(dbConn, username, password); err != nil {
|
if err := createUser(ctx, dbConn, username, password); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Printf("User '%s' was created successfully!\n", username)
|
fmt.Printf("User '%s' was created successfully!\n", username)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func lookupUserID(dbConn *sql.DB, username string) (string, error) {
|
func lookupUserID(ctx context.Context, dbConn *sql.DB, username string) (string, error) {
|
||||||
var id string
|
var id string
|
||||||
err := dbConn.QueryRow("SELECT id FROM user WHERE username = ?", username).Scan(&id)
|
err := dbConn.QueryRowContext(ctx, "SELECT id FROM user WHERE username = ?", username).Scan(&id)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return id, nil
|
return id, nil
|
||||||
}
|
}
|
||||||
@@ -146,14 +149,14 @@ func promptConfirmOverwrite(username string) bool {
|
|||||||
return response == "y" || response == "yes"
|
return response == "y" || response == "yes"
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateUserPassword(dbConn *sql.DB, userID string, username string, password string) error {
|
func updateUserPassword(ctx context.Context, dbConn *sql.DB, userID string, username string, password string) error {
|
||||||
hash, err := bcrypt.GenerateFromPassword([]byte(password), 12)
|
hash, err := bcrypt.GenerateFromPassword([]byte(password), 12)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_password_hash_failed", "cmd/user", "", nil, err)
|
observability.Error("cli_password_hash_failed", "cmd/user", "", nil, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = dbConn.Exec("UPDATE user SET password_hash = ? WHERE id = ?", string(hash), userID)
|
_, err = dbConn.ExecContext(ctx, "UPDATE user SET password_hash = ? WHERE id = ?", string(hash), userID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_user_password_update_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
observability.Error("cli_user_password_update_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
||||||
return err
|
return err
|
||||||
@@ -161,7 +164,7 @@ func updateUserPassword(dbConn *sql.DB, userID string, username string, password
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func createUser(dbConn *sql.DB, username string, password string) error {
|
func createUser(ctx context.Context, dbConn *sql.DB, username string, password string) error {
|
||||||
hash, err := bcrypt.GenerateFromPassword([]byte(password), 12)
|
hash, err := bcrypt.GenerateFromPassword([]byte(password), 12)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_password_hash_failed", "cmd/user", "", nil, err)
|
observability.Error("cli_password_hash_failed", "cmd/user", "", nil, err)
|
||||||
@@ -170,7 +173,8 @@ func createUser(dbConn *sql.DB, username string, password string) error {
|
|||||||
|
|
||||||
id := uuid.New().String()
|
id := uuid.New().String()
|
||||||
avatarURL := internal.DefaultAvatarURL(username)
|
avatarURL := internal.DefaultAvatarURL(username)
|
||||||
_, err = dbConn.Exec(
|
_, err = dbConn.ExecContext(
|
||||||
|
ctx,
|
||||||
"INSERT INTO user (id, username, password_hash, avatar_url) VALUES (?, ?, ?, ?)",
|
"INSERT INTO user (id, username, password_hash, avatar_url) VALUES (?, ?, ?, ?)",
|
||||||
id,
|
id,
|
||||||
username,
|
username,
|
||||||
@@ -184,8 +188,8 @@ func createUser(dbConn *sql.DB, username string, password string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateAvatars(dbConn *sql.DB) {
|
func updateAvatars(ctx context.Context, dbConn *sql.DB) {
|
||||||
rows, err := dbConn.Query("SELECT id, username FROM user")
|
rows, err := dbConn.QueryContext(ctx, "SELECT id, username FROM user")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_users_list_failed", "cmd/user", "", nil, err)
|
observability.Error("cli_users_list_failed", "cmd/user", "", nil, err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@@ -201,7 +205,7 @@ func updateAvatars(dbConn *sql.DB) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
avatarURL := internal.DefaultAvatarURL(username)
|
avatarURL := internal.DefaultAvatarURL(username)
|
||||||
_, err := dbConn.Exec("UPDATE user SET avatar_url = ? WHERE id = ?", avatarURL, id)
|
_, err := dbConn.ExecContext(ctx, "UPDATE user SET avatar_url = ? WHERE id = ?", avatarURL, id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_user_avatar_update_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
observability.Error("cli_user_avatar_update_failed", "cmd/user", "", map[string]any{"username": username}, err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@@ -217,13 +221,13 @@ func updateAvatars(dbConn *sql.DB) {
|
|||||||
fmt.Printf("Updated avatars for %d user(s)\n", count)
|
fmt.Printf("Updated avatars for %d user(s)\n", count)
|
||||||
}
|
}
|
||||||
|
|
||||||
func runFixes(dbConn *sql.DB) {
|
func runFixes(ctx context.Context, dbConn *sql.DB) {
|
||||||
if err := database.RunMigrationsAndFixes(dbConn); err != nil {
|
if err := database.RunMigrationsAndFixes(dbConn); err != nil {
|
||||||
observability.Error("cli_run_migrations_and_fixes_failed", "cmd/user", "", nil, err)
|
observability.Error("cli_run_migrations_and_fixes_failed", "cmd/user", "", nil, err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
rows, err := dbConn.Query("SELECT id, applied_at FROM data_fixes ORDER BY id ASC")
|
rows, err := dbConn.QueryContext(ctx, "SELECT id, applied_at FROM data_fixes ORDER BY id ASC")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
observability.Error("cli_data_fixes_list_failed", "cmd/user", "", nil, err)
|
observability.Error("cli_data_fixes_list_failed", "cmd/user", "", nil, err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|||||||
Reference in New Issue
Block a user