mirror of
https://github.com/h44z/wg-portal.git
synced 2025-10-06 16:36:18 +00:00
Compare commits
4 Commits
mikrotik_i
...
fix_hooks_
Author | SHA1 | Date | |
---|---|---|---|
|
5d190988f3 | ||
|
9884d8c002 | ||
|
b099e8abfa | ||
|
112f6bfb77 |
4
.github/workflows/docker-publish.yml
vendored
4
.github/workflows/docker-publish.yml
vendored
@@ -66,10 +66,6 @@ jobs:
|
||||
type=semver,pattern={{major}}
|
||||
type=semver,pattern=v{{major}}.{{minor}}
|
||||
type=semver,pattern=v{{major}}
|
||||
# add v{{major}} tag, even for beta or release-canidate releases
|
||||
type=match,pattern=(v\d),group=1,enable=${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
|
||||
# add {{major}} tag, even for beta releases or release-canidate releases
|
||||
type=match,pattern=v(\d),group=1,enable=${{ contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
|
||||
|
||||
- name: Build and push Docker image
|
||||
uses: docker/build-push-action@v6
|
||||
|
@@ -47,11 +47,18 @@ func migrateFromV1(db *gorm.DB, source, typ string) error {
|
||||
}
|
||||
latestVersion := "1.0.9"
|
||||
if lastVersion.Version != latestVersion {
|
||||
return fmt.Errorf("unsupported old version, update to database version %s first: %w", latestVersion, err)
|
||||
return fmt.Errorf("unsupported old version, update to database version %s first", latestVersion)
|
||||
}
|
||||
|
||||
slog.Info("found valid V1 database", "version", lastVersion.Version)
|
||||
|
||||
// validate target database
|
||||
if err := validateTargetDatabase(db); err != nil {
|
||||
return fmt.Errorf("target database validation failed: %w", err)
|
||||
}
|
||||
|
||||
slog.Info("found valid target database, starting migration...")
|
||||
|
||||
if err := migrateV1Users(oldDb, db); err != nil {
|
||||
return fmt.Errorf("user migration failed: %w", err)
|
||||
}
|
||||
@@ -70,6 +77,36 @@ func migrateFromV1(db *gorm.DB, source, typ string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// validateTargetDatabase checks if the target database is empty and ready for migration.
|
||||
func validateTargetDatabase(db *gorm.DB) error {
|
||||
var count int64
|
||||
err := db.Model(&domain.User{}).Count(&count).Error
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to check user table: %w", err)
|
||||
}
|
||||
if count > 0 {
|
||||
return fmt.Errorf("target database contains %d users, please use an empty database for migration", count)
|
||||
}
|
||||
|
||||
err = db.Model(&domain.Interface{}).Count(&count).Error
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to check interface table: %w", err)
|
||||
}
|
||||
if count > 0 {
|
||||
return fmt.Errorf("target database contains %d interfaces, please use an empty database for migration", count)
|
||||
}
|
||||
|
||||
err = db.Model(&domain.Peer{}).Count(&count).Error
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to check peer table: %w", err)
|
||||
}
|
||||
if count > 0 {
|
||||
return fmt.Errorf("target database contains %d peers, please use an empty database for migration", count)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func migrateV1Users(oldDb, newDb *gorm.DB) error {
|
||||
type User struct {
|
||||
Email string `gorm:"primaryKey"`
|
||||
@@ -123,7 +160,7 @@ func migrateV1Users(oldDb, newDb *gorm.DB) error {
|
||||
LinkedPeerCount: 0,
|
||||
}
|
||||
|
||||
if err := newDb.Save(&newUser).Error; err != nil {
|
||||
if err := newDb.Create(&newUser).Error; err != nil {
|
||||
return fmt.Errorf("failed to migrate user %s: %w", oldUser.Email, err)
|
||||
}
|
||||
|
||||
@@ -217,7 +254,8 @@ func migrateV1Interfaces(oldDb, newDb *gorm.DB) error {
|
||||
PeerDefPostDown: "",
|
||||
}
|
||||
|
||||
if err := newDb.Save(&newInterface).Error; err != nil {
|
||||
// Create new interface with associations
|
||||
if err := newDb.Create(&newInterface).Error; err != nil {
|
||||
return fmt.Errorf("failed to migrate device %s: %w", oldDevice.DeviceName, err)
|
||||
}
|
||||
|
||||
@@ -362,7 +400,7 @@ func migrateV1Peers(oldDb, newDb *gorm.DB) error {
|
||||
},
|
||||
}
|
||||
|
||||
if err := newDb.Save(&newPeer).Error; err != nil {
|
||||
if err := newDb.Create(&newPeer).Error; err != nil {
|
||||
return fmt.Errorf("failed to migrate peer %s (%s): %w", oldPeer.Identifier, oldPeer.PublicKey, err)
|
||||
}
|
||||
|
||||
|
@@ -225,6 +225,15 @@ func (m Manager) RestoreInterfaceState(
|
||||
if err != nil && !iface.IsDisabled() {
|
||||
slog.Debug("creating missing interface", "interface", iface.Identifier)
|
||||
|
||||
// temporarily disable interface in database so that the current state is reflected correctly
|
||||
_ = m.db.SaveInterface(ctx, iface.Identifier,
|
||||
func(in *domain.Interface) (*domain.Interface, error) {
|
||||
now := time.Now()
|
||||
in.Disabled = &now // set
|
||||
in.DisabledReason = domain.DisabledReasonInterfaceMissing
|
||||
return in, nil
|
||||
})
|
||||
|
||||
// try to create a new interface
|
||||
_, err = m.saveInterface(ctx, &iface)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user