extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-04-02 02:26:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

disable auto migration (#866)

Browse Source
This commit is contained in:
Michael Quigley 2025-02-12 11:08:17 -05:00
parent 93dd468b29
commit 8e6fb9fe60
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/zrok/adminMigrate.go
View File

@ -33,7 +33,12 @@ func (cmd *adminMigrate) run(_ *cobra.Command, args []string) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
logrus.Info(cf.Dump(inCfg, cf.DefaultOptions())) logrus.Info(cf.Dump(inCfg, cf.DefaultOptions()))
// override the 'disable_auto_migration' setting... the user is requesting a migration here.
inCfg.Store.DisableAutoMigration = false
if _, err := store.Open(inCfg.Store); err != nil { if _, err := store.Open(inCfg.Store); err != nil {
panic(err) panic(err)
} }

21
controller/store/frontend.go
View File

@ -42,39 +42,44 @@ func (str *Store) CreateGlobalFrontend(f *Frontend, tx *sqlx.Tx) (int, error) {
} }
func (str *Store) GetFrontend(id int, tx *sqlx.Tx) (*Frontend, error) { func (str *Store) GetFrontend(id int, tx *sqlx.Tx) (*Frontend, error) {
utrx := tx.Unsafe()
i := &Frontend{} i := &Frontend{}
if err := tx.QueryRowx("select * from frontends where id = $1", id).StructScan(i); err != nil { if err := utrx.QueryRowx("select * from frontends where id = $1", id).StructScan(i); err != nil {
return nil, errors.Wrap(err, "error selecting frontend by id") return nil, errors.Wrap(err, "error selecting frontend by id")
} }
return i, nil return i, nil
} }
func (str *Store) FindFrontendWithToken(token string, tx *sqlx.Tx) (*Frontend, error) { func (str *Store) FindFrontendWithToken(token string, tx *sqlx.Tx) (*Frontend, error) {
utrx := tx.Unsafe()
i := &Frontend{} i := &Frontend{}
if err := tx.QueryRowx("select frontends.* from frontends where token = $1 and not deleted", token).StructScan(i); err != nil { if err := utrx.QueryRowx("select frontends.* from frontends where token = $1 and not deleted", token).StructScan(i); err != nil {
return nil, errors.Wrap(err, "error selecting frontend by name") return nil, errors.Wrap(err, "error selecting frontend by name")
} }
return i, nil return i, nil
} }
func (str *Store) FindFrontendWithZId(zId string, tx *sqlx.Tx) (*Frontend, error) { func (str *Store) FindFrontendWithZId(zId string, tx *sqlx.Tx) (*Frontend, error) {
utrx := tx.Unsafe()
i := &Frontend{} i := &Frontend{}
if err := tx.QueryRowx("select frontends.* from frontends where z_id = $1 and not deleted", zId).StructScan(i); err != nil { if err := utrx.QueryRowx("select frontends.* from frontends where z_id = $1 and not deleted", zId).StructScan(i); err != nil {
return nil, errors.Wrap(err, "error selecting frontend by ziti id") return nil, errors.Wrap(err, "error selecting frontend by ziti id")
} }
return i, nil return i, nil
} }
func (str *Store) FindFrontendPubliclyNamed(publicName string, tx *sqlx.Tx) (*Frontend, error) { func (str *Store) FindFrontendPubliclyNamed(publicName string, tx *sqlx.Tx) (*Frontend, error) {
utrx := tx.Unsafe()
i := &Frontend{} i := &Frontend{}
if err := tx.QueryRowx("select frontends.* from frontends where public_name = $1 and not deleted", publicName).StructScan(i); err != nil { if err := utrx.QueryRowx("select frontends.* from frontends where public_name = $1 and not deleted", publicName).StructScan(i); err != nil {
return nil, errors.Wrap(err, "error selecting frontend by public_name") return nil, errors.Wrap(err, "error selecting frontend by public_name")
} }
return i, nil return i, nil
} }
func (str *Store) FindFrontendsForEnvironment(envId int, tx *sqlx.Tx) ([]*Frontend, error) { func (str *Store) FindFrontendsForEnvironment(envId int, tx *sqlx.Tx) ([]*Frontend, error) {
rows, err := tx.Queryx("select frontends.* from frontends where environment_id = $1 and not deleted", envId) utrx := tx.Unsafe()
rows, err := utrx.Queryx("select frontends.* from frontends where environment_id = $1 and not deleted", envId)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error selecting frontends by environment_id") return nil, errors.Wrap(err, "error selecting frontends by environment_id")
} }
@ -90,7 +95,8 @@ func (str *Store) FindFrontendsForEnvironment(envId int, tx *sqlx.Tx) ([]*Fronte
} }
func (str *Store) FindPublicFrontends(tx *sqlx.Tx) ([]*Frontend, error) { func (str *Store) FindPublicFrontends(tx *sqlx.Tx) ([]*Frontend, error) {
rows, err := tx.Queryx("select frontends.* from frontends where environment_id is null and reserved = true and not deleted") utrx := tx.Unsafe()
rows, err := utrx.Queryx("select frontends.* from frontends where environment_id is null and reserved = true and not deleted")
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error selecting public frontends") return nil, errors.Wrap(err, "error selecting public frontends")
} }
@ -106,7 +112,8 @@ func (str *Store) FindPublicFrontends(tx *sqlx.Tx) ([]*Frontend, error) {
} }
func (str *Store) FindFrontendsForPrivateShare(shrId int, tx *sqlx.Tx) ([]*Frontend, error) { func (str *Store) FindFrontendsForPrivateShare(shrId int, tx *sqlx.Tx) ([]*Frontend, error) {
rows, err := tx.Queryx("select frontends.* from frontends where private_share_id = $1 and not deleted", shrId) utrx := tx.Unsafe()
rows, err := utrx.Queryx("select frontends.* from frontends where private_share_id = $1 and not deleted", shrId)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "error selecting frontends by private_share_id") return nil, errors.Wrap(err, "error selecting frontends by private_share_id")
} }

3
controller/store/store.go
View File

@ -25,6 +25,7 @@ type Config struct {
Path string `cf:"+secret"` Path string `cf:"+secret"`
Type string Type string
EnableLocking bool EnableLocking bool
DisableAutoMigration bool
} }
type Store struct { type Store struct {
@ -57,9 +58,11 @@ func Open(cfg *Config) (*Store, error) {
dbx.MapperFunc(strcase.ToSnake) dbx.MapperFunc(strcase.ToSnake)
store := &Store{cfg: cfg, db: dbx} store := &Store{cfg: cfg, db: dbx}
if !cfg.DisableAutoMigration {
if err := store.migrate(cfg); err != nil { if err := store.migrate(cfg); err != nil {
return nil, errors.Wrapf(err, "error migrating database '%v'", cfg.Path) return nil, errors.Wrapf(err, "error migrating database '%v'", cfg.Path)
} }
}
return store, nil return store, nil
} }