adyxax/tfstated
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity

chore(tfstated): implement a transaction wrapper

Browse source
This commit is contained in:
Julien Dessaux 2024-11-18 00:10:58 +01:00
parent 25ed1188ed
commit f649f7bbbf
Signed by: adyxax
GPG key ID: F92E51B86E07177E
5 changed files with 119 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkg/database/accounts.go
View file

@ -50,42 +50,31 @@ func (db *DB) LoadAccountByUsername(username string) (*model.Account, error) {
}
func (db *DB) InitAdminAccount() error {
tx, err := db.Begin()
if err != nil {
return err
}
defer func() {
if err != nil {
_ = tx.Rollback()
}
}()
return db.WithTransaction(func(tx *sql.Tx) error {
var hasAdminAccount bool
if err = tx.QueryRowContext(db.ctx, `SELECT EXISTS (SELECT 1 FROM accounts WHERE is_admin);`).Scan(&hasAdminAccount); err != nil {
if err := tx.QueryRowContext(db.ctx, `SELECT EXISTS (SELECT 1 FROM accounts WHERE is_admin);`).Scan(&hasAdminAccount); err != nil {
return fmt.Errorf("failed to select if there is an admin account in the database: %w", err)
}
if hasAdminAccount {
tx.Rollback()
} else {
if !hasAdminAccount {
var password uuid.UUID
if err = password.Generate(uuid.V4); err != nil {
if err := password.Generate(uuid.V4); err != nil {
return fmt.Errorf("failed to generate initial admin password: %w", err)
}
salt := helpers.GenerateSalt()
hash := helpers.HashPassword(password.String(), salt)
if _, err = tx.ExecContext(db.ctx,
if _, err := tx.ExecContext(db.ctx,
`INSERT INTO accounts(username, salt, password_hash, is_admin)
VALUES ("admin", :salt, :hash, TRUE)
ON CONFLICT DO UPDATE SET password_hash = :hash
WHERE username = "admin";`,
sql.Named("salt", salt),
sql.Named("hash", hash),
); err != nil {
); err == nil {
AdvertiseAdminPassword(password.String())
} else {
return fmt.Errorf("failed to set initial admin password: %w", err)
}
err = tx.Commit()
if err == nil {
AdvertiseAdminPassword(password.String())
}
}
return err
return nil
})
}

22
pkg/database/db.go
View file

@ -3,6 +3,7 @@ package database
import (
"context"
"database/sql"
"fmt"
"runtime"
"git.adyxax.org/adyxax/tfstated/pkg/scrypto"
@ -81,10 +82,6 @@ func NewDB(ctx context.Context, url string) (*DB, error) {
return &db, nil
}
func (db *DB) Begin() (*sql.Tx, error) {
return db.writeDB.Begin()
}
func (db *DB) Close() error {
if err := db.readDB.Close(); err != nil {
_ = db.writeDB.Close()
@ -107,3 +104,20 @@ func (db *DB) SetDataEncryptionKey(s string) error {
func (db *DB) SetVersionsHistoryLimit(n int) {
db.versionsHistoryLimit = n
}
func (db *DB) WithTransaction(f func(tx *sql.Tx) error) error {
tx, err := db.writeDB.Begin()
if err != nil {
return err
}
err = f(tx)
if err == nil {
err = tx.Commit()
}
if err != nil {
if err2 := tx.Rollback(); err2 != nil {
panic(fmt.Sprintf("failed to rollback transaction: %+v. Reason for rollback: %+v", err2, err))
}
}
return err
}

39
pkg/database/locks.go
View file

@ -10,45 +10,32 @@ import (
// true if the function locked the state, otherwise returns false and the lock
// parameter is updated to the value of the existing lock
func (db *DB) SetLockOrGetExistingLock(path string, lock any) (bool, error) {
tx, err := db.Begin()
if err != nil {
return false, err
}
defer func() {
if err != nil {
_ = tx.Rollback()
}
}()
ret := false
return ret, db.WithTransaction(func(tx *sql.Tx) error {
var lockData []byte
if err = tx.QueryRowContext(db.ctx, `SELECT lock FROM states WHERE path = ?;`, path).Scan(&lockData); err != nil {
if err := tx.QueryRowContext(db.ctx, `SELECT lock FROM states WHERE path = ?;`, path).Scan(&lockData); err != nil {
if errors.Is(err, sql.ErrNoRows) {
if lockData, err = json.Marshal(lock); err != nil {
return false, err
return err
}
_, err = tx.ExecContext(db.ctx, `INSERT INTO states(path, lock) VALUES (?, json(?))`, path, lockData)
if err != nil {
return false, err
}
err = tx.Commit()
return true, err
ret = true
return err
} else {
return false, err
return err
}
}
if lockData != nil {
_ = tx.Rollback()
err = json.Unmarshal(lockData, lock)
return false, err
return json.Unmarshal(lockData, lock)
}
var err error
if lockData, err = json.Marshal(lock); err != nil {
return false, err
return err
}
_, err = tx.ExecContext(db.ctx, `UPDATE states SET lock = json(?) WHERE path = ?;`, lockData, path)
if err != nil {
return false, err
}
err = tx.Commit()
return true, err
ret = true
return err
})
}
func (db *DB) Unlock(path, lock any) (bool, error) {

20
pkg/database/migrations.go
View file

@ -1,6 +1,7 @@
package database
import (
"database/sql"
"embed"
"io/fs"
@ -28,16 +29,7 @@ func (db *DB) migrate() error {
return err
}
tx, err := db.Begin()
if err != nil {
return err
}
defer func() {
if err != nil {
_ = tx.Rollback()
}
}()
return db.WithTransaction(func(tx *sql.Tx) error {
var version int
if err = tx.QueryRowContext(db.ctx, `SELECT version FROM schema_version;`).Scan(&version); err != nil {
if err.Error() == "no such table: schema_version" {
@ -53,11 +45,7 @@ func (db *DB) migrate() error {
}
version++
}
if _, err = tx.ExecContext(db.ctx, `DELETE FROM schema_version; INSERT INTO schema_version (version) VALUES (?);`, version); err != nil {
_, err = tx.ExecContext(db.ctx, `DELETE FROM schema_version; INSERT INTO schema_version (version) VALUES (?);`, version)
return err
}
if err = tx.Commit(); err != nil {
return err
}
return nil
})
}

29
pkg/database/states.go
View file

@ -48,15 +48,8 @@ func (db *DB) SetState(path string, accountID int, data []byte, lockID string) (
if err != nil {
return false, err
}
tx, err := db.Begin()
if err != nil {
return false, err
}
defer func() {
if err != nil {
_ = tx.Rollback()
}
}()
ret := false
return ret, db.WithTransaction(func(tx *sql.Tx) error {
var (
stateID int64
lockData []byte
@ -66,20 +59,21 @@ func (db *DB) SetState(path string, accountID int, data []byte, lockID string) (
var result sql.Result
result, err = tx.ExecContext(db.ctx, `INSERT INTO states(path) VALUES (?)`, path)
if err != nil {
return false, err
return err
}
stateID, err = result.LastInsertId()
if err != nil {
return false, err
return err
}
} else {
return false, err
return err
}
}
if lockID != "" && slices.Compare([]byte(lockID), lockData) != 0 {
err = fmt.Errorf("failed to update state, lock ID does not match")
return true, err
ret = true
return err
}
_, err = tx.ExecContext(db.ctx,
`INSERT INTO versions(account_id, state_id, data, lock)
@ -90,7 +84,7 @@ func (db *DB) SetState(path string, accountID int, data []byte, lockID string) (
sql.Named("stateID", stateID),
sql.Named("data", encryptedData))
if err != nil {
return false, err
return err
}
_, err = tx.ExecContext(db.ctx,
`DELETE FROM versions
@ -107,9 +101,6 @@ func (db *DB) SetState(path string, accountID int, data []byte, lockID string) (
sql.Named("limit", db.versionsHistoryLimit),
sql.Named("path", path),
)
if err != nil {
return false, err
}
err = tx.Commit()
return false, err
return err
})
}