Compare commits

..

17 Commits

Author SHA1 Message Date
Christoph Haas
97896b7a9e Merge branch 'master' into mikrotik_integration
# Conflicts:
#	internal/app/wireguard/wireguard_interfaces.go
2025-08-10 14:33:13 +02:00
Christoph Haas
593bb983fb improve configuration defaults handling 2025-08-10 14:12:24 +02:00
Christoph Haas
0037938f9e update docs 2025-08-10 14:12:12 +02:00
Christoph Haas
f5e29e2cd3 ensure that deleted peers are restored once the interface is re-enabled 2025-08-09 16:37:09 +02:00
Christoph Haas
5dee6d051d do not delete disabled mikrotik peers on app restart 2025-08-09 16:25:38 +02:00
Christoph Haas
a9f5190ab4 Merge branch 'refs/heads/master' into mikrotik_integration
# Conflicts:
#	internal/app/wireguard/wireguard_peers.go
2025-08-09 16:09:39 +02:00
Christoph Haas
e10b4abec4 speed up mikrotik interactions 2025-08-09 15:21:17 +02:00
Christoph Haas
08373fa675 fix peer creation/update on mikrotik, add loading spinner to frontend for long running actions 2025-08-08 22:23:35 +02:00
Christoph Haas
ed7761a918 Merge branch 'master' into mikrotik_integration
# Conflicts:
#	internal/app/api/v0/handlers/endpoint_config.go
#	internal/app/api/v0/model/models.go
#	internal/app/wireguard/statistics.go
#	internal/app/wireguard/wireguard_interfaces.go
2025-07-29 22:16:00 +02:00
Christoph Haas
f086ba2605 wip: basic CRUD for peer (#426) 2025-06-06 22:21:47 +02:00
Christoph Haas
0724505ea1 wip: basic CRUD for interfaces (#426) 2025-06-01 11:40:05 +02:00
Christoph Haas
c612b5bbb1 wip: ping handler per backend (#426) 2025-06-01 09:50:46 +02:00
Christoph Haas
ea6da4114f wip: create different backend handlers (#426) 2025-05-31 22:15:09 +02:00
Christoph Haas
e934232e0b wip: implement mikrotik rest api client (#426) 2025-05-31 17:17:08 +02:00
Christoph Haas
d5ce889e4f visualize invalid backend selections (#426) 2025-05-31 10:01:47 +02:00
Christoph Haas
15d035ec10 wip: create different backend handlers (#426) 2025-05-30 23:19:48 +02:00
Christoph Haas
33dcc80078 prepare frontend for different WireGuard backends (#426) 2025-05-18 19:49:59 +02:00
3 changed files with 8 additions and 51 deletions

View File

@@ -66,6 +66,10 @@ 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

View File

@@ -47,18 +47,11 @@ 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", latestVersion)
return fmt.Errorf("unsupported old version, update to database version %s first: %w", latestVersion, err)
}
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)
}
@@ -77,36 +70,6 @@ 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"`
@@ -160,7 +123,7 @@ func migrateV1Users(oldDb, newDb *gorm.DB) error {
LinkedPeerCount: 0,
}
if err := newDb.Create(&newUser).Error; err != nil {
if err := newDb.Save(&newUser).Error; err != nil {
return fmt.Errorf("failed to migrate user %s: %w", oldUser.Email, err)
}
@@ -254,8 +217,7 @@ func migrateV1Interfaces(oldDb, newDb *gorm.DB) error {
PeerDefPostDown: "",
}
// Create new interface with associations
if err := newDb.Create(&newInterface).Error; err != nil {
if err := newDb.Save(&newInterface).Error; err != nil {
return fmt.Errorf("failed to migrate device %s: %w", oldDevice.DeviceName, err)
}
@@ -400,7 +362,7 @@ func migrateV1Peers(oldDb, newDb *gorm.DB) error {
},
}
if err := newDb.Create(&newPeer).Error; err != nil {
if err := newDb.Save(&newPeer).Error; err != nil {
return fmt.Errorf("failed to migrate peer %s (%s): %w", oldPeer.Identifier, oldPeer.PublicKey, err)
}

View File

@@ -225,15 +225,6 @@ 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 {