diff --git a/server/api/api.go b/server/api/api.go index 24a5683..0b8df80 100644 --- a/server/api/api.go +++ b/server/api/api.go @@ -1,6 +1,7 @@ package api import ( + "context" "net/http" "git.dubyatp.xyz/dubyatp/scannerbot/server/db" @@ -8,8 +9,9 @@ import ( ) func Start() { - db.InitScyllaDB() - defer db.CloseScyllaDB() + ctx := context.Background() + db.InitPostgres(ctx) + defer db.ClosePostgres() r := chi.NewRouter() diff --git a/server/api/db.go b/server/api/db.go index 50c8069..84a120e 100644 --- a/server/api/db.go +++ b/server/api/db.go @@ -1,24 +1,22 @@ package api import ( + "context" "errors" "fmt" "log/slog" "git.dubyatp.xyz/dubyatp/scannerbot/server/db" - "github.com/gocql/gocql" + "github.com/jackc/pgx/v5" ) func dbGetUser(id string) (*User, error) { - query := `SELECT id, name, password FROM users WHERE id = ?` + query := `SELECT id, name, password FROM users WHERE id = $1` var user User - var gid gocql.UUID - err := db.Session.Query(query, id).Scan(&gid, &user.Name, &user.Password) - user.ID = [16]byte(gid) - - if err == gocql.ErrNotFound { + err := db.Pool.QueryRow(context.Background(), query, id).Scan(&user.ID, &user.Name, &user.Password) + if errors.Is(err, pgx.ErrNoRows) { slog.Debug("db: user not found", "userid", id) - return nil, errors.New("User not found") + return nil, errors.New("user not found") } else if err != nil { slog.Error("db: failed to query user", "error", err) return nil, fmt.Errorf("failed to query user") @@ -29,15 +27,12 @@ func dbGetUser(id string) (*User, error) { } func dbGetUserByName(username string) (*User, error) { - query := `SELECT id, name, password FROM users WHERE name = ?` + query := `SELECT id, name, password FROM users WHERE name = $1` var user User - var gid gocql.UUID - err := db.Session.Query(query, username).Scan(&gid, &user.Name, &user.Password) - user.ID = [16]byte(gid) - - if err == gocql.ErrNotFound { + err := db.Pool.QueryRow(context.Background(), query, username).Scan(&user.ID, &user.Name, &user.Password) + if errors.Is(err, pgx.ErrNoRows) { slog.Debug("db: user not found", "username", username) - return nil, errors.New("User not found") + return nil, errors.New("user not found") } else if err != nil { slog.Error("db: failed to query user", "error", err) return nil, fmt.Errorf("failed to query user") @@ -49,21 +44,24 @@ func dbGetUserByName(username string) (*User, error) { func dbGetAllUsers() ([]*User, error) { query := `SELECT id, name, password FROM users` - iter := db.Session.Query(query).Iter() - defer iter.Close() + rows, err := db.Pool.Query(context.Background(), query) + if err != nil { + slog.Error("db: failed to query users", "error", err) + return nil, fmt.Errorf("failed to query users") + } + defer rows.Close() var users []*User - for { + for rows.Next() { user := &User{} - var gid gocql.UUID - if !iter.Scan(&gid, &user.Name, &user.Password) { - break + if err := rows.Scan(&user.ID, &user.Name, &user.Password); err != nil { + slog.Error("db: failed to scan user", "error", err) + return nil, fmt.Errorf("failed to scan user") } - user.ID = [16]byte(gid) users = append(users, user) } - if err := iter.Close(); err != nil { - slog.Error("db: failed to iterate users", "error", err) + if err := rows.Err(); err != nil { + slog.Error("db: row iteration error", "error", err) return nil, fmt.Errorf("failed to iterate users") } if len(users) == 0 { @@ -76,8 +74,8 @@ func dbGetAllUsers() ([]*User, error) { } func dbAddUser(user *User) error { - query := `INSERT INTO users (id, name, password) VALUES (?, ?, ?)` - err := db.Session.Query(query, gocql.UUID(user.ID), user.Name, user.Password).Exec() + query := `INSERT INTO users (id, name, password) VALUES ($1, $2, $3)` + _, err := db.Pool.Exec(context.Background(), query, user.ID, user.Name, user.Password) if err != nil { slog.Error("db: failed to add user", "error", err, "userid", user.ID, "username", user.Name) return fmt.Errorf("failed to add user") diff --git a/server/db/postgres.go b/server/db/postgres.go new file mode 100644 index 0000000..10d8ba8 --- /dev/null +++ b/server/db/postgres.go @@ -0,0 +1,27 @@ +package db + +import ( + "context" + "log/slog" + "os" + + "github.com/jackc/pgx/v5/pgxpool" +) + +var Pool *pgxpool.Pool + +func InitPostgres(ctx context.Context) { + pool, err := pgxpool.New(ctx, os.Getenv("DATABASE_URL")) + if err != nil { + slog.Error("Failed to connect to Postgres", "error", err) + os.Exit(1) + } + Pool = pool + slog.Info("Connected to Postgres") +} + +func ClosePostgres() { + if Pool != nil { + Pool.Close() + } +} diff --git a/server/db/scylla.go b/server/db/scylla.go deleted file mode 100644 index c07bb78..0000000 --- a/server/db/scylla.go +++ /dev/null @@ -1,31 +0,0 @@ -package db - -import ( - "log/slog" - "os" - - "github.com/gocql/gocql" -) - -var Session *gocql.Session - -func InitScyllaDB() { - cluster := gocql.NewCluster(os.Getenv("SCYLLA_CLUSTER")) - cluster.Keyspace = os.Getenv("SCYLLA_KEYSPACE") - - cluster.Consistency = gocql.Quorum - - session, err := cluster.CreateSession() - if err != nil { - slog.Error("Failed to connect to ScyllaDB", "error", err) - os.Exit(1) - } - Session = session - slog.Info("Connected to ScyllaDB") -} - -func CloseScyllaDB() { - if Session != nil { - Session.Close() - } -} diff --git a/server/go.mod b/server/go.mod index 86a7b50..7dfb16f 100644 --- a/server/go.mod +++ b/server/go.mod @@ -2,15 +2,26 @@ module git.dubyatp.xyz/dubyatp/scannerbot/server go 1.26.3 +require ( + github.com/go-chi/chi/v5 v5.2.5 + github.com/go-chi/render v1.0.3 + github.com/gocql/gocql v1.7.0 + github.com/google/uuid v1.6.0 + github.com/jackc/pgx/v5 v5.9.2 + github.com/joho/godotenv v1.5.1 + golang.org/x/crypto v0.51.0 +) + require ( github.com/ajg/form v1.5.1 // indirect - github.com/go-chi/chi/v5 v5.2.5 // indirect - github.com/go-chi/render v1.0.3 // indirect - github.com/gocql/gocql v1.7.0 // indirect github.com/golang/snappy v0.0.3 // indirect - github.com/google/uuid v1.6.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect - github.com/joho/godotenv v1.5.1 // indirect - golang.org/x/crypto v0.51.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/rogpeppe/go-internal v1.6.1 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/text v0.37.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect ) diff --git a/server/go.sum b/server/go.sum index 8473323..e97f764 100644 --- a/server/go.sum +++ b/server/go.sum @@ -1,8 +1,13 @@ github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= +github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug= github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0= github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4= @@ -15,15 +20,43 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw= +github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI= golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= +golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/server/main.go b/server/main.go index ef745c8..801f78d 100644 --- a/server/main.go +++ b/server/main.go @@ -9,7 +9,7 @@ import ( ) var REQUIRED_ENVS = [...]string{ - "SCYLLA_CLUSTER", "SCYLLA_KEYSPACE", + "DATABASE_URL", } func checkEnvVars(keys []string) (bool, []string) {