2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
73 lines
1.5 KiB
Go
73 lines
1.5 KiB
Go
package database
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"embed"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
|
|
migrate "github.com/rubenv/sql-migrate"
|
|
"upper.io/db.v3/lib/sqlbuilder"
|
|
"upper.io/db.v3/sqlite"
|
|
)
|
|
|
|
//go:embed migrations/*.sql
|
|
var efs embed.FS
|
|
|
|
func readAsset(path string) ([]byte, error) {
|
|
filep, err := efs.Open(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return iox.ReadAllContext(context.Background(), filep)
|
|
}
|
|
|
|
func readAssetDir(path string) ([]string, error) {
|
|
var out []string
|
|
lst, err := efs.ReadDir(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
for _, e := range lst {
|
|
out = append(out, e.Name())
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// RunMigrations runs the database migrations
|
|
func RunMigrations(db *sql.DB) error {
|
|
log.Debugf("running migrations")
|
|
migrations := &migrate.AssetMigrationSource{
|
|
Asset: readAsset,
|
|
AssetDir: readAssetDir,
|
|
Dir: "migrations",
|
|
}
|
|
n, err := migrate.Exec(db, "sqlite3", migrations, migrate.Up)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.Debugf("performed %d migrations", n)
|
|
return nil
|
|
}
|
|
|
|
// Connect to the database
|
|
func Connect(path string) (db sqlbuilder.Database, err error) {
|
|
settings := sqlite.ConnectionURL{
|
|
Database: path,
|
|
Options: map[string]string{"_foreign_keys": "1"},
|
|
}
|
|
sess, err := sqlite.Open(settings)
|
|
if err != nil {
|
|
log.WithError(err).Error("failed to open the DB")
|
|
return nil, err
|
|
}
|
|
|
|
err = RunMigrations(sess.Driver().(*sql.DB))
|
|
if err != nil {
|
|
log.WithError(err).Error("failed to run DB migration")
|
|
return nil, err
|
|
}
|
|
return sess, err
|
|
}
|