mirror of
https://github.com/lovelaze/nebula-sync.git
synced 2025-11-05 18:29:19 +01:00
Rename manual sync to selective sync
This commit is contained in:
committed by
lovelaze
parent
c4213cbd2b
commit
2f6104f710
@@ -11,7 +11,7 @@ This project is not a part of the [official Pi-hole project](https://github.com/
|
||||
|
||||
## Features
|
||||
- **Full sync**: Use Pi-hole Teleporter for full synchronization.
|
||||
- **Manual sync**: Selective feature synchronization.
|
||||
- **Selective sync**: Selective feature synchronization.
|
||||
- **Cron schedule**: Run on chron schedule.
|
||||
|
||||
## Installation
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ func (suite *testSuite) Test_FullSync_SSL() {
|
||||
require.NoError(suite.T(), err)
|
||||
}
|
||||
|
||||
func (suite *testSuite) Test_ManualSync() {
|
||||
func (suite *testSuite) Test_SelectiveSync() {
|
||||
suite.T().Setenv("PRIMARY", suite.ph1.EnvString(false))
|
||||
suite.T().Setenv("REPLICAS", suite.ph2.EnvString(false))
|
||||
suite.T().Setenv("FULL_SYNC", "false")
|
||||
|
||||
@@ -66,12 +66,12 @@ func (_c *Target_FullSync_Call) RunAndReturn(run func(*config.Sync) error) *Targ
|
||||
return _c
|
||||
}
|
||||
|
||||
// ManualSync provides a mock function with given fields: _a0
|
||||
func (_m *Target) ManualSync(_a0 *config.Sync) error {
|
||||
// SelectiveSync provides a mock function with given fields: _a0
|
||||
func (_m *Target) SelectiveSync(_a0 *config.Sync) error {
|
||||
ret := _m.Called(_a0)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for ManualSync")
|
||||
panic("no return value specified for SelectiveSync")
|
||||
}
|
||||
|
||||
var r0 error
|
||||
@@ -84,30 +84,30 @@ func (_m *Target) ManualSync(_a0 *config.Sync) error {
|
||||
return r0
|
||||
}
|
||||
|
||||
// Target_ManualSync_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ManualSync'
|
||||
type Target_ManualSync_Call struct {
|
||||
// Target_SelectiveSync_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SelectiveSync'
|
||||
type Target_SelectiveSync_Call struct {
|
||||
*mock.Call
|
||||
}
|
||||
|
||||
// ManualSync is a helper method to define mock.On call
|
||||
// SelectiveSync is a helper method to define mock.On call
|
||||
// - _a0 *config.Sync
|
||||
func (_e *Target_Expecter) ManualSync(_a0 interface{}) *Target_ManualSync_Call {
|
||||
return &Target_ManualSync_Call{Call: _e.mock.On("ManualSync", _a0)}
|
||||
func (_e *Target_Expecter) SelectiveSync(_a0 interface{}) *Target_SelectiveSync_Call {
|
||||
return &Target_SelectiveSync_Call{Call: _e.mock.On("SelectiveSync", _a0)}
|
||||
}
|
||||
|
||||
func (_c *Target_ManualSync_Call) Run(run func(_a0 *config.Sync)) *Target_ManualSync_Call {
|
||||
func (_c *Target_SelectiveSync_Call) Run(run func(_a0 *config.Sync)) *Target_SelectiveSync_Call {
|
||||
_c.Call.Run(func(args mock.Arguments) {
|
||||
run(args[0].(*config.Sync))
|
||||
})
|
||||
return _c
|
||||
}
|
||||
|
||||
func (_c *Target_ManualSync_Call) Return(_a0 error) *Target_ManualSync_Call {
|
||||
func (_c *Target_SelectiveSync_Call) Return(_a0 error) *Target_SelectiveSync_Call {
|
||||
_c.Call.Return(_a0)
|
||||
return _c
|
||||
}
|
||||
|
||||
func (_c *Target_ManualSync_Call) RunAndReturn(run func(*config.Sync) error) *Target_ManualSync_Call {
|
||||
func (_c *Target_SelectiveSync_Call) RunAndReturn(run func(*config.Sync) error) *Target_SelectiveSync_Call {
|
||||
_c.Call.Return(run)
|
||||
return _c
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ func (service *Service) doSync(t sync.Target) (err error) {
|
||||
if service.conf.Sync.FullSync {
|
||||
err = t.FullSync(service.conf.Sync)
|
||||
} else {
|
||||
err = t.ManualSync(service.conf.Sync)
|
||||
err = t.SelectiveSync(service.conf.Sync)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
|
||||
@@ -32,7 +32,7 @@ func TestRun_full(t *testing.T) {
|
||||
target.AssertCalled(t, "FullSync", conf.Sync)
|
||||
}
|
||||
|
||||
func TestRun_manual(t *testing.T) {
|
||||
func TestRun_selective(t *testing.T) {
|
||||
conf := config.Config{
|
||||
Primary: model.PiHole{},
|
||||
Replicas: []model.PiHole{},
|
||||
@@ -43,7 +43,7 @@ func TestRun_manual(t *testing.T) {
|
||||
}
|
||||
|
||||
target := syncmock.NewTarget(t)
|
||||
target.On("ManualSync", conf.Sync).Return(nil)
|
||||
target.On("SelectiveSync", conf.Sync).Return(nil)
|
||||
|
||||
service := Service{
|
||||
target: target,
|
||||
@@ -53,5 +53,5 @@ func TestRun_manual(t *testing.T) {
|
||||
err := service.Run()
|
||||
require.NoError(t, err)
|
||||
|
||||
target.AssertCalled(t, "ManualSync", conf.Sync)
|
||||
target.AssertCalled(t, "SelectiveSync", conf.Sync)
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
func (target *target) ManualSync(syncConf *config.Sync) error {
|
||||
func (target *target) SelectiveSync(syncConf *config.Sync) error {
|
||||
log.Info().Str("mode", "selective").Int("replicas", len(target.Replicas)).Msg("Running sync")
|
||||
|
||||
if err := target.authenticate(); err != nil {
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestTarget_ManualSync(t *testing.T) {
|
||||
func TestTarget_SelectiveSync(t *testing.T) {
|
||||
primary := piholemock.NewClient(t)
|
||||
replica := piholemock.NewClient(t)
|
||||
|
||||
@@ -56,6 +56,6 @@ func TestTarget_ManualSync(t *testing.T) {
|
||||
primary.EXPECT().DeleteSession().Once().Return(nil)
|
||||
replica.EXPECT().DeleteSession().Once().Return(nil)
|
||||
|
||||
err := target.ManualSync(&settings)
|
||||
err := target.SelectiveSync(&settings)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
type Target interface {
|
||||
FullSync(sync *config.Sync) error
|
||||
ManualSync(sync *config.Sync) error
|
||||
SelectiveSync(sync *config.Sync) error
|
||||
}
|
||||
|
||||
type target struct {
|
||||
|
||||
Reference in New Issue
Block a user