Dhcp server enabled handling (#282 )

* switch to go.uber.org/mock * #281 special handling for dhcpServerEnabled
switch to go.uber.org/mock (#280 )
2024-01-17 19:29:25 +01:00 · 2024-01-16 16:46:13 +01:00 · 2024-01-15 22:06:42 +01:00 · 2024-01-15 22:06:31 +01:00 · 2024-01-15 21:07:56 +01:00 · 2024-01-15 18:24:10 +01:00
20 changed files with 2237 additions and 148 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ tmp
 bin
 config*.yaml
 *.log
+wiki
--- a/84
+++ b/84
@@ -15,8 +15,8 @@ generate: deepcopy-gen
 test: generate lint test-ci

 # Run ci tests
-test-ci: mocks tidy
-	go test ./...  -coverprofile=coverage.out.tmp
+test-ci: mocks tidy ginkgo
+	$(GINKGO) --cover --coverprofile coverage.out.tmp ./...
 	cat coverage.out.tmp | grep -v "_generated.go" > coverage.out
 	go tool cover -func=coverage.out

@@ -41,64 +41,56 @@ $(LOCALBIN):
 	mkdir -p $(LOCALBIN)

 ## Tool Binaries
-SEMVER ?= $(LOCALBIN)/semver
-OAPI_CODEGEN ?= $(LOCALBIN)/oapi-codegen
-MOCKGEN ?= $(LOCALBIN)/mockgen
+DEEPCOPY_GEN ?= $(LOCALBIN)/deepcopy-gen
+GINKGO ?= $(LOCALBIN)/ginkgo
 GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 GORELEASER ?= $(LOCALBIN)/goreleaser
-DEEPCOPY_GEN ?= $(LOCALBIN)/deepcopy-gen
-
-## Tool Versions
-SEMVER_VERSION ?= v1.1.3
-OAPI_CODEGEN_VERSION ?= v2.0.0
-MOCKGEN_VERSION ?= v1.6.0
-GOLANGCI_LINT_VERSION ?= v1.55.2
-GORELEASER_VERSION ?= v1.23.0
-DEEPCOPY_GEN_VERSION ?= v0.29.0
+MOCKGEN ?= $(LOCALBIN)/mockgen
+OAPI_CODEGEN ?= $(LOCALBIN)/oapi-codegen
+SEMVER ?= $(LOCALBIN)/semver

 ## Tool Installer
-.PHONY: semver
-semver: $(SEMVER) ## Download semver locally if necessary.
-$(SEMVER): $(LOCALBIN)
-	test -s $(LOCALBIN)/semver || GOBIN=$(LOCALBIN) go install github.com/bakito/semver@$(SEMVER_VERSION)
-.PHONY: oapi-codegen
-oapi-codegen: $(OAPI_CODEGEN) ## Download oapi-codegen locally if necessary.
-$(OAPI_CODEGEN): $(LOCALBIN)
-	test -s $(LOCALBIN)/oapi-codegen || GOBIN=$(LOCALBIN) go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@$(OAPI_CODEGEN_VERSION)
-.PHONY: mockgen
-mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
-$(MOCKGEN): $(LOCALBIN)
-	test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install github.com/golang/mock/mockgen@$(MOCKGEN_VERSION)
-.PHONY: golangci-lint
-golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
-$(GOLANGCI_LINT): $(LOCALBIN)
-	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
-.PHONY: goreleaser
-goreleaser: $(GORELEASER) ## Download goreleaser locally if necessary.
-$(GORELEASER): $(LOCALBIN)
-	test -s $(LOCALBIN)/goreleaser || GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION)
 .PHONY: deepcopy-gen
 deepcopy-gen: $(DEEPCOPY_GEN) ## Download deepcopy-gen locally if necessary.
 $(DEEPCOPY_GEN): $(LOCALBIN)
-	test -s $(LOCALBIN)/deepcopy-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/deepcopy-gen@$(DEEPCOPY_GEN_VERSION)
+	test -s $(LOCALBIN)/deepcopy-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/deepcopy-gen
+.PHONY: ginkgo
+ginkgo: $(GINKGO) ## Download ginkgo locally if necessary.
+$(GINKGO): $(LOCALBIN)
+	test -s $(LOCALBIN)/ginkgo || GOBIN=$(LOCALBIN) go install github.com/onsi/ginkgo/v2/ginkgo
+.PHONY: golangci-lint
+golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
+$(GOLANGCI_LINT): $(LOCALBIN)
+	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint
+.PHONY: goreleaser
+goreleaser: $(GORELEASER) ## Download goreleaser locally if necessary.
+$(GORELEASER): $(LOCALBIN)
+	test -s $(LOCALBIN)/goreleaser || GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser
+.PHONY: mockgen
+mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
+$(MOCKGEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/mockgen || GOBIN=$(LOCALBIN) go install go.uber.org/mock/mockgen
+.PHONY: oapi-codegen
+oapi-codegen: $(OAPI_CODEGEN) ## Download oapi-codegen locally if necessary.
+$(OAPI_CODEGEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/oapi-codegen || GOBIN=$(LOCALBIN) go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen
+.PHONY: semver
+semver: $(SEMVER) ## Download semver locally if necessary.
+$(SEMVER): $(LOCALBIN)
+	test -s $(LOCALBIN)/semver || GOBIN=$(LOCALBIN) go install github.com/bakito/semver

 ## Update Tools
 .PHONY: update-toolbox-tools
 update-toolbox-tools:
 	@rm -f \
-		$(LOCALBIN)/semver \
-		$(LOCALBIN)/oapi-codegen \
-		$(LOCALBIN)/mockgen \
+		$(LOCALBIN)/deepcopy-gen \
+		$(LOCALBIN)/ginkgo \
 		$(LOCALBIN)/golangci-lint \
 		$(LOCALBIN)/goreleaser \
-		$(LOCALBIN)/deepcopy-gen
-	toolbox makefile -f $(LOCALDIR)/Makefile \
-		github.com/bakito/semver \
-		github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen \
-		github.com/golang/mock/mockgen \
-		github.com/golangci/golangci-lint/cmd/golangci-lint \
-		github.com/goreleaser/goreleaser \
-		k8s.io/code-generator/cmd/deepcopy-gen@github.com/kubernetes/code-generator
+		$(LOCALBIN)/mockgen \
+		$(LOCALBIN)/oapi-codegen \
+		$(LOCALBIN)/semver
+	toolbox makefile -f $(LOCALDIR)/Makefile
 ## toolbox - end

 start-replica:
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 [![Go](https://github.com/bakito/adguardhome-sync/actions/workflows/go.yml/badge.svg)](https://github.com/bakito/adguardhome-sync/actions/workflows/go.yml)
+[![e2e tests](https://github.com/bakito/adguardhome-sync/actions/workflows/e2e.yaml/badge.svg)](https://github.com/bakito/adguardhome-sync/actions/workflows/e2e.yaml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/bakito/adguardhome-sync)](https://goreportcard.com/report/github.com/bakito/adguardhome-sync)
 [![Coverage Status](https://coveralls.io/repos/github/bakito/adguardhome-sync/badge.svg?branch=main&service=github)](https://coveralls.io/github/bakito/adguardhome-sync?branch=main)

@@ -6,38 +7,10 @@

 Synchronize [AdGuardHome](https://github.com/AdguardTeam/AdGuardHome) config to replica instances.

-## FAQ
+## FAQ & Deprecations

-Please check the wiki for [FAQ](https://github.com/bakito/adguardhome-sync/wiki/FAQ).
-
-## Deprecation of Environment Variables as of v0.6.0
-
-The following environment variables have been deprecated and replaced with better readable ones:
-Deprecated variables are still supported but will be logged as warning.
-| Deprecated | Replacement |
-| :----------- |:----------- |
-| RUNONSTART | RUN_ON_START |
-| PRINTCONFIGONLY | PRINT_CONFIG_ONLY |
-| CONTINUE_ON_ERROR | CONTINUE_ON_ERROR |
-| API_DARKMODE | API_DARK_MODE |
-| FEATURES_DHCP_SERVERCONFIG | FEATURES_DHCP_SERVER_CONFIG |
-| FEATURES_DHCP_STATICLEASES | FEATURES_DHCP_STATIC_LEASES |
-| FEATURES_DNS_ACCESSLISTS | FEATURES_DNS_ACCESS_LISTS |
-| FEATURES_DNS_SERVERCONFIG | FEATURES_DNS_SERVER_CONFIG |
-| FEATURES_GENERALSETTINGS | FEATURES_GENERAL_SETTINGS |
-| FEATURES_QUERYLOGCONFIG | FEATURES_QUERY_LOG_CONFIG |
-| FEATURES_STATSCONFIG | FEATURES_STATS_CONFIG |
-| FEATURES_CLIENTSETTINGS | FEATURES_CLIENT_SETTINGS |
-| ORIGIN_WEBURL | ORIGIN_WEB_URL |
-| ORIGIN_APIPATH | ORIGIN_API_PATH |
-| ORIGIN_INSECURE_SKIP_VERIFY | ORIGIN_INSECURE_SKIP_VERIFY |
-| *REPLICA_WEBURL | REPLICA_WEB_URL |
-| *REPLICA_APIPATH | REPLICA_API_PATH |
-| *REPLICA_INSECURE_SKIP_VERIFY | REPLICA_INSECURE_SKIP_VERIFY |
-| *REPLICA_AUTOSETUP | REPLICA_AUTO_SETUP |
-| *REPLICA_INTERFACENAME | REPLICA_INTERFACE_NAME |
-
-\* is also valid for numbered `REPLICA#_` variables
+Please check the wiki
+for [FAQ](https://github.com/bakito/adguardhome-sync/wiki/FAQ) and [Deprecations](https://github.com/bakito/adguardhome-sync/wiki/Deprecations).

 ## Current sync features

--- a/go.mod
+++ b/go.mod
@@ -3,67 +3,439 @@ module github.com/bakito/adguardhome-sync
 go 1.21

 require (
+	github.com/bakito/semver v1.1.3
 	github.com/caarlos0/env/v10 v10.0.0
+	github.com/deepmap/oapi-codegen/v2 v2.0.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-resty/resty/v2 v2.9.1
-	github.com/golang/mock v1.6.0
+	github.com/golangci/golangci-lint v1.55.2
 	github.com/google/uuid v1.5.0
+	github.com/goreleaser/goreleaser v1.23.0
 	github.com/jinzhu/copier v0.4.0
 	github.com/oapi-codegen/runtime v1.1.1
-	github.com/onsi/ginkgo/v2 v2.13.2
+	github.com/onsi/ginkgo/v2 v2.14.0
 	github.com/onsi/gomega v1.30.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cobra v1.8.0
+	go.uber.org/mock v0.4.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/mod v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/apimachinery v0.29.0
+	k8s.io/code-generator v0.29.0
 )

 require (
+	4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
+	4d63.com/gochecknoglobals v0.2.1 // indirect
+	cloud.google.com/go v0.110.10 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
+	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/iam v1.1.5 // indirect
+	cloud.google.com/go/kms v1.15.5 // indirect
+	cloud.google.com/go/storage v1.35.1 // indirect
+	code.gitea.io/sdk/gitea v0.17.0 // indirect
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/4meepo/tagalign v1.3.3 // indirect
+	github.com/Abirdcfly/dupword v0.0.13 // indirect
+	github.com/AlekSi/pointer v1.2.0 // indirect
+	github.com/Antonboom/errname v0.1.12 // indirect
+	github.com/Antonboom/nilnil v0.1.7 // indirect
+	github.com/Antonboom/testifylint v0.2.3 // indirect
+	github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.10.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.0 // indirect
+	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
+	github.com/Azure/go-autorest/autorest v0.11.29 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
+	github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 // indirect
+	github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
+	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
+	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
+	github.com/Azure/go-autorest/logger v0.2.1 // indirect
+	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
+	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Masterminds/semver/v3 v3.2.1 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.3 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230923063757-afb1ddc0824c // indirect
+	github.com/alecthomas/go-check-sumtype v0.1.3 // indirect
+	github.com/alessio/shellescape v1.4.1 // indirect
+	github.com/alexkohler/nakedret/v2 v2.0.2 // indirect
+	github.com/alexkohler/prealloc v1.0.0 // indirect
+	github.com/alingse/asasalint v0.0.11 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
+	github.com/ashanbrown/forbidigo v1.6.0 // indirect
+	github.com/ashanbrown/makezero v1.1.1 // indirect
+	github.com/atc0005/go-teams-notify/v2 v2.8.0 // indirect
+	github.com/aws/aws-sdk-go v1.48.3 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.23.1 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.1 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.25.5 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.16.4 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.5 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.14.2 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.4 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ecr v1.20.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.18.2 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kms v1.26.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.44.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.17.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.25.4 // indirect
+	github.com/aws/smithy-go v1.17.0 // indirect
+	github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20231024185945-8841054dbdb8 // indirect
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/bahlo/generic-list-go v0.2.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bkielbasa/cyclop v1.2.1 // indirect
+	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb // indirect
+	github.com/blizzy78/varnamelen v0.8.0 // indirect
+	github.com/bombsimon/wsl/v3 v3.4.0 // indirect
+	github.com/breml/bidichk v0.2.7 // indirect
+	github.com/breml/errchkjson v0.3.6 // indirect
+	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/butuzov/ireturn v0.2.2 // indirect
+	github.com/butuzov/mirror v1.1.0 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/caarlos0/ctrlc v1.2.0 // indirect
+	github.com/caarlos0/env/v9 v9.0.0 // indirect
+	github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect
+	github.com/caarlos0/go-shellwords v1.0.12 // indirect
+	github.com/caarlos0/go-version v0.1.1 // indirect
+	github.com/caarlos0/log v0.4.4 // indirect
+	github.com/catenacyber/perfsprint v0.2.0 // indirect
+	github.com/cavaliergopher/cpio v1.0.1 // indirect
+	github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/charithe/durationcheck v0.0.10 // indirect
+	github.com/charmbracelet/lipgloss v0.9.1 // indirect
+	github.com/charmbracelet/x/exp/ordered v0.0.0-20231010190216-1cb11efc897d // indirect
+	github.com/chavacava/garif v0.1.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/chrismellard/docker-credential-acr-env v0.0.0-20230304212654-82a0ddb27589 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
+	github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/curioswitch/go-reassign v0.2.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/daixiang0/gci v0.11.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davidmz/go-pageant v1.0.2 // indirect
+	github.com/denis-tingaikin/go-header v0.4.3 // indirect
+	github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb // indirect
+	github.com/dghubble/oauth1 v0.7.2 // indirect
+	github.com/dghubble/sling v1.4.0 // indirect
+	github.com/dimchansky/utfbom v1.1.1 // indirect
+	github.com/disgoorg/disgo v0.17.0 // indirect
+	github.com/disgoorg/json v1.1.0 // indirect
+	github.com/disgoorg/snowflake/v2 v2.0.1 // indirect
+	github.com/distribution/reference v0.5.0 // indirect
+	github.com/docker/cli v24.0.7+incompatible // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker v24.0.7+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.8.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/elliotchance/orderedmap/v2 v2.2.0 // indirect
+	github.com/emirpasic/gods v1.18.1 // indirect
+	github.com/esimonov/ifshort v1.0.4 // indirect
+	github.com/ettle/strcase v0.1.1 // indirect
+	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/fatih/structtag v1.2.0 // indirect
+	github.com/firefart/nonamedreturns v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fzipp/gocyclo v0.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/getkin/kin-openapi v0.118.0 // indirect
+	github.com/ghostiam/protogetter v0.2.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-critic/go-critic v0.9.0 // indirect
+	github.com/go-fed/httpsig v1.1.0 // indirect
+	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
+	github.com/go-git/go-billy/v5 v5.5.0 // indirect
+	github.com/go-git/go-git/v5 v5.11.0 // indirect
 	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-openapi/analysis v0.21.4 // indirect
+	github.com/go-openapi/errors v0.20.4 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/loads v0.21.2 // indirect
+	github.com/go-openapi/runtime v0.26.0 // indirect
+	github.com/go-openapi/spec v0.20.9 // indirect
+	github.com/go-openapi/strfmt v0.21.7 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/validate v0.22.1 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.16.0 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
+	github.com/go-toolsmith/astcast v1.1.0 // indirect
+	github.com/go-toolsmith/astcopy v1.1.0 // indirect
+	github.com/go-toolsmith/astequal v1.1.0 // indirect
+	github.com/go-toolsmith/astfmt v1.1.0 // indirect
+	github.com/go-toolsmith/astp v1.1.0 // indirect
+	github.com/go-toolsmith/strparse v1.1.0 // indirect
+	github.com/go-toolsmith/typep v1.1.0 // indirect
+	github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
+	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
+	github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect
+	github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect
+	github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
+	github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
+	github.com/golangci/misspell v0.4.1 // indirect
+	github.com/golangci/revgrep v0.5.2 // indirect
+	github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/go-containerregistry v0.17.0 // indirect
+	github.com/google/go-github/v57 v57.0.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/ko v0.15.1 // indirect
+	github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect
+	github.com/google/rpmpack v0.5.0 // indirect
+	github.com/google/s2a-go v0.1.7 // indirect
+	github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
+	github.com/google/wire v0.5.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
+	github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
+	github.com/goreleaser/chglog v0.5.0 // indirect
+	github.com/goreleaser/fileglob v1.3.0 // indirect
+	github.com/goreleaser/nfpm/v2 v2.35.1 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
+	github.com/gostaticanalysis/comment v1.4.2 // indirect
+	github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
+	github.com/gostaticanalysis/nilerr v0.1.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
+	github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
+	github.com/hexops/gotextdiff v1.0.3 // indirect
+	github.com/huandu/xstrings v1.3.3 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/invopop/jsonschema v0.12.0 // indirect
+	github.com/invopop/yaml v0.1.0 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/jgautheron/goconst v1.6.0 // indirect
+	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
+	github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/julz/importas v0.1.0 // indirect
+	github.com/kevinburke/ssh_config v1.2.0 // indirect
+	github.com/kisielk/errcheck v1.6.3 // indirect
+	github.com/kisielk/gotool v1.0.0 // indirect
+	github.com/kkHAIKE/contextcheck v1.1.4 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/kulti/thelper v0.6.3 // indirect
+	github.com/kunwardeep/paralleltest v1.0.8 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
+	github.com/kyoh86/exportloopref v0.1.11 // indirect
+	github.com/ldez/gomoddirectives v0.2.3 // indirect
+	github.com/ldez/tagliatelle v0.5.0 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/leonklingele/grouper v1.1.1 // indirect
+	github.com/letsencrypt/boulder v0.0.0-20231026200631-000cd05d5491 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/lufeee/execinquery v1.2.1 // indirect
+	github.com/macabu/inamedparam v0.1.2 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/maratori/testableexamples v1.0.0 // indirect
+	github.com/maratori/testpackage v1.1.1 // indirect
+	github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-mastodon v0.0.6 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/mbilski/exhaustivestruct v1.2.0 // indirect
+	github.com/mgechev/revive v1.3.4 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/moricho/tparallel v0.3.1 // indirect
+	github.com/muesli/mango v0.1.0 // indirect
+	github.com/muesli/mango-cobra v1.2.0 // indirect
+	github.com/muesli/mango-pflag v0.1.0 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
+	github.com/muesli/roff v0.1.0 // indirect
+	github.com/muesli/termenv v0.15.2 // indirect
+	github.com/nakabonne/nestif v0.3.1 // indirect
+	github.com/nishanths/exhaustive v0.11.0 // indirect
+	github.com/nishanths/predeclared v0.2.2 // indirect
+	github.com/nunnatsa/ginkgolinter v0.14.1 // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/perimeterx/marshmallow v1.1.4 // indirect
+	github.com/pjbgf/sha1cd v0.3.0 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/polyfloyd/go-errorlint v1.4.5 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/quasilyte/go-ruleguard v0.4.0 // indirect
+	github.com/quasilyte/gogrep v0.5.0 // indirect
+	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
+	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
+	github.com/rivo/uniseg v0.4.2 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/ryancurrah/gomodguard v1.3.0 // indirect
+	github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
+	github.com/sasha-s/go-csync v0.0.0-20210812194225-61421b77c44b // indirect
+	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
+	github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
+	github.com/securego/gosec/v2 v2.18.2 // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/sigstore/cosign/v2 v2.2.1 // indirect
+	github.com/sigstore/rekor v1.3.3 // indirect
+	github.com/sigstore/sigstore v1.7.5 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sivchari/containedctx v1.0.3 // indirect
+	github.com/sivchari/nosnakecase v1.7.0 // indirect
+	github.com/sivchari/tenv v1.7.1 // indirect
+	github.com/skeema/knownhosts v1.2.1 // indirect
+	github.com/slack-go/slack v0.12.3 // indirect
+	github.com/sonatard/noctx v0.0.2 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/sourcegraph/go-diff v0.7.0 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.17.0 // indirect
+	github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
+	github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
+	github.com/tdakkota/asciicheck v0.2.0 // indirect
+	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
+	github.com/tetafro/godot v1.4.15 // indirect
+	github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
+	github.com/timonwong/loggercheck v0.9.4 // indirect
+	github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
+	github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect
+	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
+	github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ulikunitz/xz v0.5.11 // indirect
+	github.com/ultraware/funlen v0.1.0 // indirect
+	github.com/ultraware/whitespace v0.0.5 // indirect
+	github.com/uudashr/gocognit v1.1.2 // indirect
+	github.com/vbatts/tar-split v0.11.5 // indirect
+	github.com/withfig/autocomplete-tools/integrations/cobra v1.2.1 // indirect
+	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
+	github.com/xanzy/go-gitlab v0.95.2 // indirect
+	github.com/xanzy/ssh-agent v0.3.3 // indirect
+	github.com/xen0n/gosmopolitan v1.2.2 // indirect
+	github.com/yagipy/maintidx v1.0.0 // indirect
+	github.com/yeya24/promlinter v0.2.0 // indirect
+	github.com/ykadowak/zerologlint v0.1.3 // indirect
+	gitlab.com/bosi/decorder v0.4.1 // indirect
+	gitlab.com/digitalxero/go-conventional-commit v1.0.7 // indirect
+	go-simpler.org/sloglint v0.1.2 // indirect
+	go.mongodb.org/mongo-driver v1.12.1 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.tmz.dev/musttag v0.7.2 // indirect
+	go.uber.org/automaxprocs v1.5.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	gocloud.dev v0.35.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect
+	golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
 	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/oauth2 v0.15.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.16.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+	google.golang.org/api v0.151.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.32.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/mail.v2 v2.3.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	honnef.co/go/tools v0.4.6 // indirect
+	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	mvdan.cc/gofumpt v0.5.0 // indirect
+	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
+	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
+	mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/kind v0.20.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/pkg/client/model/model-functions.go
+++ b/pkg/client/model/model-functions.go
@@ -16,6 +16,22 @@ func (c *DhcpStatus) Clone() *DhcpStatus {
 	return clone
 }

+func (c *DhcpStatus) cleanV4V6() {
+	if c.V4 != nil && !c.V4.isValid() {
+		c.V4 = nil
+	}
+	if c.V6 != nil && !c.V6.isValid() {
+		c.V6 = nil
+	}
+}
+
+// CleanAndEquals dhcp server config equal check where V4 and V6 are cleaned in advance
+func (c *DhcpStatus) CleanAndEquals(o *DhcpStatus) bool {
+	c.cleanV4V6()
+	o.cleanV4V6()
+	return c.Equals(o)
+}
+
 // Equals dhcp server config equal check
 func (c *DhcpStatus) Equals(o *DhcpStatus) bool {
 	return utils.JsonEquals(c, o)
@@ -26,11 +42,14 @@ func (c *DhcpStatus) HasConfig() bool {
 }

 func (j DhcpConfigV4) isValid() bool {
-	return j.GatewayIp != nil && *j.GatewayIp != "" && j.SubnetMask != nil && j.RangeStart != nil && j.RangeEnd != nil
+	return j.GatewayIp != nil && *j.GatewayIp != "" &&
+		j.SubnetMask != nil && *j.SubnetMask != "" &&
+		j.RangeStart != nil && *j.RangeStart != "" &&
+		j.RangeEnd != nil && *j.RangeEnd != ""
 }

 func (j DhcpConfigV6) isValid() bool {
-	return j.RangeStart != nil
+	return j.RangeStart != nil && *j.RangeStart != ""
 }

 type DhcpStaticLeases []DhcpStaticLease
--- a/pkg/client/model/model_private_test.go
+++ b/pkg/client/model/model_private_test.go
@@ -0,0 +1,74 @@
+package model
+
+import (
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	. "github.com/onsi/ginkgo/v2"
+	"github.com/onsi/gomega"
+)
+
+var _ = Describe("Types", func() {
+	Context("DhcpConfigV4", func() {
+		DescribeTable("DhcpConfigV4 should not be valid",
+			func(v4 DhcpConfigV4) {
+				gomega.Ω(v4.isValid()).Should(gomega.BeFalse())
+			},
+			Entry(`When GatewayIp is nil`, DhcpConfigV4{
+				GatewayIp:  nil,
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When GatewayIp is ""`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr(""),
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When SubnetMask is nil`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: nil,
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When SubnetMask is ""`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: utils.Ptr(""),
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When SubnetMask is nil`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: nil,
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When SubnetMask is ""`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: utils.Ptr(""),
+				RangeEnd:   utils.Ptr("4.4.4.4"),
+			}),
+			Entry(`When RangeEnd is nil`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   nil,
+			}),
+			Entry(`When RangeEnd is ""`, DhcpConfigV4{
+				GatewayIp:  utils.Ptr("1.1.1.1"),
+				SubnetMask: utils.Ptr("2.2.2.2"),
+				RangeStart: utils.Ptr("3.3.3.3"),
+				RangeEnd:   utils.Ptr(""),
+			}),
+		)
+	})
+	Context("DhcpConfigV6", func() {
+		DescribeTable("DhcpConfigV6 should not be valid",
+			func(v6 DhcpConfigV6) {
+				gomega.Ω(v6.isValid()).Should(gomega.BeFalse())
+			},
+			Entry(`When SubnetMask is nil`, DhcpConfigV6{RangeStart: nil}),
+			Entry(`When SubnetMask is ""`, DhcpConfigV6{RangeStart: utils.Ptr("")}),
+		)
+	})
+})
--- a/pkg/client/model/model_test.go
+++ b/pkg/client/model/model_test.go
@@ -403,7 +403,29 @@ var _ = Describe("Types", func() {
 				}
 				Ω(dc1.HasConfig()).Should(BeFalse())
 			})
-			It("should not have a v4 config", func() {
+			It("should not have a v4 config with nil IP", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp: nil,
+					},
+					V6: &model.DhcpConfigV6{
+						RangeStart: utils.Ptr("1.2.3.5"),
+					},
+				}
+				Ω(dc1.HasConfig()).Should(BeTrue())
+			})
+			It("should not have a v4 config with empty IP", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp: utils.Ptr(""),
+					},
+					V6: &model.DhcpConfigV6{
+						RangeStart: utils.Ptr("1.2.3.5"),
+					},
+				}
+				Ω(dc1.HasConfig()).Should(BeTrue())
+			})
+			It("should not have a v6 config", func() {
 				dc1 := &model.DhcpStatus{
 					V4: &model.DhcpConfigV4{
 						GatewayIp:     utils.Ptr("1.2.3.4"),
@@ -416,15 +438,6 @@ var _ = Describe("Types", func() {
 				}
 				Ω(dc1.HasConfig()).Should(BeTrue())
 			})
-			It("should not have a v6 config", func() {
-				dc1 := &model.DhcpStatus{
-					V4: &model.DhcpConfigV4{},
-					V6: &model.DhcpConfigV6{
-						RangeStart: utils.Ptr("1.2.3.5"),
-					},
-				}
-				Ω(dc1.HasConfig()).Should(BeTrue())
-			})
 		})
 	})
 })
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -32,15 +32,26 @@ func Get(configFile string, flags Flags) (*types.Config, error) {
 		return nil, err
 	}

-	// overwrite from env vars
+	// *bool field creates issues when already not nil
+	cfg.Origin.DHCPServerEnabled = nil // origin filed makes no sense to be set.

+	// keep previously set value
+	replicaDhcpServer := cfg.Replica.DHCPServerEnabled
+	cfg.Replica.DHCPServerEnabled = nil
+
+	// overwrite from env vars
 	if err := env.Parse(cfg); err != nil {
 		return nil, err
 	}
-	if err := env.ParseWithOptions(&cfg.Origin, env.Options{Prefix: "ORIGIN_"}); err != nil {
+	if err := env.ParseWithOptions(cfg.Replica, env.Options{Prefix: "REPLICA_"}); err != nil {
 		return nil, err
 	}
-	if err := env.ParseWithOptions(cfg.Replica, env.Options{Prefix: "REPLICA_"}); err != nil {
+	// if not set from env, use previous value
+	if cfg.Replica.DHCPServerEnabled == nil {
+		cfg.Replica.DHCPServerEnabled = replicaDhcpServer
+	}
+
+	if err := env.ParseWithOptions(&cfg.Origin, env.Options{Prefix: "ORIGIN_"}); err != nil {
 		return nil, err
 	}

--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -5,9 +5,9 @@ import (

 	"github.com/bakito/adguardhome-sync/pkg/config"
 	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
-	gm "github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	gm "go.uber.org/mock/gomock"
 )

 var _ = Describe("Config", func() {
@@ -146,6 +146,61 @@ var _ = Describe("Config", func() {
 					Ω(cfg.API.Port).Should(Equal(9999))
 				})
 			})
+
+			Context("Replica DHCPServerEnabled", func() {
+				It("should have the dhcp server enabled from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replica.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+					Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeFalse())
+				})
+			})
+
+			Context("Replica 1 DHCPServerEnabled", func() {
+				It("should have the dhcp server enabled from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+					Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeFalse())
+				})
+			})
+			Context("API Port", func() {
+				It("should have the api port from the config file", func() {
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9090))
+				})
+				It("should have the api port from the config flags", func() {
+					flags.EXPECT().Changed(config.FlagApiPort).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetInt(config.FlagApiPort).Return(9990, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9990))
+				})
+				It("should have the api port from the config env var", func() {
+					os.Setenv("API_PORT", "9999")
+					defer func() {
+						_ = os.Unsetenv("API_PORT")
+					}()
+					flags.EXPECT().Changed(config.FlagApiPort).Return(true).AnyTimes()
+					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
+					flags.EXPECT().GetInt(config.FlagApiPort).Return(9990, nil).AnyTimes()
+
+					cfg, err := config.Get("../../testdata/config_test_replicas.yaml", flags)
+					Ω(err).ShouldNot(HaveOccurred())
+					Ω(cfg.API.Port).Should(Equal(9999))
+				})
+			})
+
+			//////
+
 			Context("Feature DNS Server Config", func() {
 				It("should have the feature dns server config from the config file", func() {
 					flags.EXPECT().Changed(gm.Any()).Return(false).AnyTimes()
--- a/pkg/config/env.go
+++ b/pkg/config/env.go
@@ -107,9 +107,15 @@ func enrichReplicasFromEnv(initialReplicas []types.AdGuardInstance) ([]types.AdG
 	for i := range replicas {
 		reID := i + 1

+		// keep previously set value
+		replicaDhcpServer := replicas[i].DHCPServerEnabled
+		replicas[i].DHCPServerEnabled = nil
 		if err := env.ParseWithOptions(&replicas[i], env.Options{Prefix: fmt.Sprintf("REPLICA%d_", reID)}); err != nil {
 			return nil, err
 		}
+		if replicas[i].DHCPServerEnabled == nil {
+			replicas[i].DHCPServerEnabled = replicaDhcpServer
+		}
 		if val, ok := checkDeprecatedReplicaEnvVar("REPLICA%d_APIPATH", "REPLICA%d_API_PATH", reID); ok {
 			replicas[i].APIPath = val
 		}
--- a/pkg/config/flags_test.go
+++ b/pkg/config/flags_test.go
@@ -5,9 +5,9 @@ import (

 	flagsmock "github.com/bakito/adguardhome-sync/pkg/mocks/flags"
 	"github.com/bakito/adguardhome-sync/pkg/types"
-	gm "github.com/golang/mock/gomock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	gm "go.uber.org/mock/gomock"
 )

 var _ = Describe("Config", func() {
--- a/pkg/mocks/client/mock.go
+++ b/pkg/mocks/client/mock.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/bakito/adguardhome-sync/pkg/client (interfaces: Client)
+//
+// Generated by this command:
+//
+//	mockgen -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
+//

 // Package client is a generated GoMock package.
 package client
@@ -8,7 +13,7 @@ import (
 	reflect "reflect"

 	model "github.com/bakito/adguardhome-sync/pkg/client/model"
-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )

 // MockClient is a mock of Client interface.
@@ -58,7 +63,7 @@ func (m *MockClient) AddClient(arg0 *model.Client) error {
 }

 // AddClient indicates an expected call of AddClient.
-func (mr *MockClientMockRecorder) AddClient(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) AddClient(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddClient", reflect.TypeOf((*MockClient)(nil).AddClient), arg0)
 }
@@ -72,7 +77,7 @@ func (m *MockClient) AddDHCPStaticLease(arg0 model.DhcpStaticLease) error {
 }

 // AddDHCPStaticLease indicates an expected call of AddDHCPStaticLease.
-func (mr *MockClientMockRecorder) AddDHCPStaticLease(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) AddDHCPStaticLease(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddDHCPStaticLease", reflect.TypeOf((*MockClient)(nil).AddDHCPStaticLease), arg0)
 }
@@ -86,7 +91,7 @@ func (m *MockClient) AddFilter(arg0 bool, arg1 model.Filter) error {
 }

 // AddFilter indicates an expected call of AddFilter.
-func (mr *MockClientMockRecorder) AddFilter(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) AddFilter(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddFilter", reflect.TypeOf((*MockClient)(nil).AddFilter), arg0, arg1)
 }
@@ -94,7 +99,7 @@ func (mr *MockClientMockRecorder) AddFilter(arg0, arg1 interface{}) *gomock.Call
 // AddRewriteEntries mocks base method.
 func (m *MockClient) AddRewriteEntries(arg0 ...model.RewriteEntry) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
+	varargs := []any{}
 	for _, a := range arg0 {
 		varargs = append(varargs, a)
 	}
@@ -104,7 +109,7 @@ func (m *MockClient) AddRewriteEntries(arg0 ...model.RewriteEntry) error {
 }

 // AddRewriteEntries indicates an expected call of AddRewriteEntries.
-func (mr *MockClientMockRecorder) AddRewriteEntries(arg0 ...interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) AddRewriteEntries(arg0 ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRewriteEntries", reflect.TypeOf((*MockClient)(nil).AddRewriteEntries), arg0...)
 }
@@ -178,7 +183,7 @@ func (m *MockClient) DeleteClient(arg0 *model.Client) error {
 }

 // DeleteClient indicates an expected call of DeleteClient.
-func (mr *MockClientMockRecorder) DeleteClient(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) DeleteClient(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteClient", reflect.TypeOf((*MockClient)(nil).DeleteClient), arg0)
 }
@@ -192,7 +197,7 @@ func (m *MockClient) DeleteDHCPStaticLease(arg0 model.DhcpStaticLease) error {
 }

 // DeleteDHCPStaticLease indicates an expected call of DeleteDHCPStaticLease.
-func (mr *MockClientMockRecorder) DeleteDHCPStaticLease(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) DeleteDHCPStaticLease(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteDHCPStaticLease", reflect.TypeOf((*MockClient)(nil).DeleteDHCPStaticLease), arg0)
 }
@@ -206,7 +211,7 @@ func (m *MockClient) DeleteFilter(arg0 bool, arg1 model.Filter) error {
 }

 // DeleteFilter indicates an expected call of DeleteFilter.
-func (mr *MockClientMockRecorder) DeleteFilter(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) DeleteFilter(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteFilter", reflect.TypeOf((*MockClient)(nil).DeleteFilter), arg0, arg1)
 }
@@ -214,7 +219,7 @@ func (mr *MockClientMockRecorder) DeleteFilter(arg0, arg1 interface{}) *gomock.C
 // DeleteRewriteEntries mocks base method.
 func (m *MockClient) DeleteRewriteEntries(arg0 ...model.RewriteEntry) error {
 	m.ctrl.T.Helper()
-	varargs := []interface{}{}
+	varargs := []any{}
 	for _, a := range arg0 {
 		varargs = append(varargs, a)
 	}
@@ -224,7 +229,7 @@ func (m *MockClient) DeleteRewriteEntries(arg0 ...model.RewriteEntry) error {
 }

 // DeleteRewriteEntries indicates an expected call of DeleteRewriteEntries.
-func (mr *MockClientMockRecorder) DeleteRewriteEntries(arg0 ...interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) DeleteRewriteEntries(arg0 ...any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRewriteEntries", reflect.TypeOf((*MockClient)(nil).DeleteRewriteEntries), arg0...)
 }
@@ -327,7 +332,7 @@ func (m *MockClient) RefreshFilters(arg0 bool) error {
 }

 // RefreshFilters indicates an expected call of RefreshFilters.
-func (mr *MockClientMockRecorder) RefreshFilters(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) RefreshFilters(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshFilters", reflect.TypeOf((*MockClient)(nil).RefreshFilters), arg0)
 }
@@ -386,7 +391,7 @@ func (m *MockClient) SetAccessList(arg0 *model.AccessList) error {
 }

 // SetAccessList indicates an expected call of SetAccessList.
-func (mr *MockClientMockRecorder) SetAccessList(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetAccessList(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccessList", reflect.TypeOf((*MockClient)(nil).SetAccessList), arg0)
 }
@@ -400,7 +405,7 @@ func (m *MockClient) SetBlockedServices(arg0 *[]string) error {
 }

 // SetBlockedServices indicates an expected call of SetBlockedServices.
-func (mr *MockClientMockRecorder) SetBlockedServices(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetBlockedServices(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetBlockedServices", reflect.TypeOf((*MockClient)(nil).SetBlockedServices), arg0)
 }
@@ -414,7 +419,7 @@ func (m *MockClient) SetBlockedServicesSchedule(arg0 *model.BlockedServicesSched
 }

 // SetBlockedServicesSchedule indicates an expected call of SetBlockedServicesSchedule.
-func (mr *MockClientMockRecorder) SetBlockedServicesSchedule(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetBlockedServicesSchedule(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetBlockedServicesSchedule", reflect.TypeOf((*MockClient)(nil).SetBlockedServicesSchedule), arg0)
 }
@@ -428,7 +433,7 @@ func (m *MockClient) SetCustomRules(arg0 *[]string) error {
 }

 // SetCustomRules indicates an expected call of SetCustomRules.
-func (mr *MockClientMockRecorder) SetCustomRules(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetCustomRules(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCustomRules", reflect.TypeOf((*MockClient)(nil).SetCustomRules), arg0)
 }
@@ -442,7 +447,7 @@ func (m *MockClient) SetDNSConfig(arg0 *model.DNSConfig) error {
 }

 // SetDNSConfig indicates an expected call of SetDNSConfig.
-func (mr *MockClientMockRecorder) SetDNSConfig(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetDNSConfig(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDNSConfig", reflect.TypeOf((*MockClient)(nil).SetDNSConfig), arg0)
 }
@@ -456,7 +461,7 @@ func (m *MockClient) SetDhcpConfig(arg0 *model.DhcpStatus) error {
 }

 // SetDhcpConfig indicates an expected call of SetDhcpConfig.
-func (mr *MockClientMockRecorder) SetDhcpConfig(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetDhcpConfig(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDhcpConfig", reflect.TypeOf((*MockClient)(nil).SetDhcpConfig), arg0)
 }
@@ -470,7 +475,7 @@ func (m *MockClient) SetProfileInfo(arg0 *model.ProfileInfo) error {
 }

 // SetProfileInfo indicates an expected call of SetProfileInfo.
-func (mr *MockClientMockRecorder) SetProfileInfo(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetProfileInfo(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetProfileInfo", reflect.TypeOf((*MockClient)(nil).SetProfileInfo), arg0)
 }
@@ -484,7 +489,7 @@ func (m *MockClient) SetQueryLogConfig(arg0 *model.QueryLogConfig) error {
 }

 // SetQueryLogConfig indicates an expected call of SetQueryLogConfig.
-func (mr *MockClientMockRecorder) SetQueryLogConfig(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetQueryLogConfig(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQueryLogConfig", reflect.TypeOf((*MockClient)(nil).SetQueryLogConfig), arg0)
 }
@@ -498,7 +503,7 @@ func (m *MockClient) SetSafeSearchConfig(arg0 *model.SafeSearchConfig) error {
 }

 // SetSafeSearchConfig indicates an expected call of SetSafeSearchConfig.
-func (mr *MockClientMockRecorder) SetSafeSearchConfig(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetSafeSearchConfig(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSafeSearchConfig", reflect.TypeOf((*MockClient)(nil).SetSafeSearchConfig), arg0)
 }
@@ -512,7 +517,7 @@ func (m *MockClient) SetStatsConfig(arg0 *model.StatsConfig) error {
 }

 // SetStatsConfig indicates an expected call of SetStatsConfig.
-func (mr *MockClientMockRecorder) SetStatsConfig(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetStatsConfig(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStatsConfig", reflect.TypeOf((*MockClient)(nil).SetStatsConfig), arg0)
 }
@@ -570,7 +575,7 @@ func (m *MockClient) ToggleFiltering(arg0 bool, arg1 int) error {
 }

 // ToggleFiltering indicates an expected call of ToggleFiltering.
-func (mr *MockClientMockRecorder) ToggleFiltering(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) ToggleFiltering(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleFiltering", reflect.TypeOf((*MockClient)(nil).ToggleFiltering), arg0, arg1)
 }
@@ -584,7 +589,7 @@ func (m *MockClient) ToggleParental(arg0 bool) error {
 }

 // ToggleParental indicates an expected call of ToggleParental.
-func (mr *MockClientMockRecorder) ToggleParental(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) ToggleParental(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleParental", reflect.TypeOf((*MockClient)(nil).ToggleParental), arg0)
 }
@@ -598,7 +603,7 @@ func (m *MockClient) ToggleProtection(arg0 bool) error {
 }

 // ToggleProtection indicates an expected call of ToggleProtection.
-func (mr *MockClientMockRecorder) ToggleProtection(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) ToggleProtection(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleProtection", reflect.TypeOf((*MockClient)(nil).ToggleProtection), arg0)
 }
@@ -612,7 +617,7 @@ func (m *MockClient) ToggleSafeBrowsing(arg0 bool) error {
 }

 // ToggleSafeBrowsing indicates an expected call of ToggleSafeBrowsing.
-func (mr *MockClientMockRecorder) ToggleSafeBrowsing(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) ToggleSafeBrowsing(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleSafeBrowsing", reflect.TypeOf((*MockClient)(nil).ToggleSafeBrowsing), arg0)
 }
@@ -626,7 +631,7 @@ func (m *MockClient) UpdateClient(arg0 *model.Client) error {
 }

 // UpdateClient indicates an expected call of UpdateClient.
-func (mr *MockClientMockRecorder) UpdateClient(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) UpdateClient(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateClient", reflect.TypeOf((*MockClient)(nil).UpdateClient), arg0)
 }
@@ -640,7 +645,7 @@ func (m *MockClient) UpdateFilter(arg0 bool, arg1 model.Filter) error {
 }

 // UpdateFilter indicates an expected call of UpdateFilter.
-func (mr *MockClientMockRecorder) UpdateFilter(arg0, arg1 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) UpdateFilter(arg0, arg1 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilter", reflect.TypeOf((*MockClient)(nil).UpdateFilter), arg0, arg1)
 }
--- a/pkg/mocks/flags/mock.go
+++ b/pkg/mocks/flags/mock.go
@@ -1,5 +1,10 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: github.com/bakito/adguardhome-sync/pkg/config (interfaces: Flags)
+//
+// Generated by this command:
+//
+//	mockgen -package client -destination pkg/mocks/flags/mock.go github.com/bakito/adguardhome-sync/pkg/config Flags
+//

 // Package client is a generated GoMock package.
 package client
@@ -7,7 +12,7 @@ package client
 import (
 	reflect "reflect"

-	gomock "github.com/golang/mock/gomock"
+	gomock "go.uber.org/mock/gomock"
 )

 // MockFlags is a mock of Flags interface.
@@ -42,7 +47,7 @@ func (m *MockFlags) Changed(arg0 string) bool {
 }

 // Changed indicates an expected call of Changed.
-func (mr *MockFlagsMockRecorder) Changed(arg0 interface{}) *gomock.Call {
+func (mr *MockFlagsMockRecorder) Changed(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Changed", reflect.TypeOf((*MockFlags)(nil).Changed), arg0)
 }
@@ -57,7 +62,7 @@ func (m *MockFlags) GetBool(arg0 string) (bool, error) {
 }

 // GetBool indicates an expected call of GetBool.
-func (mr *MockFlagsMockRecorder) GetBool(arg0 interface{}) *gomock.Call {
+func (mr *MockFlagsMockRecorder) GetBool(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBool", reflect.TypeOf((*MockFlags)(nil).GetBool), arg0)
 }
@@ -72,7 +77,7 @@ func (m *MockFlags) GetInt(arg0 string) (int, error) {
 }

 // GetInt indicates an expected call of GetInt.
-func (mr *MockFlagsMockRecorder) GetInt(arg0 interface{}) *gomock.Call {
+func (mr *MockFlagsMockRecorder) GetInt(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetInt", reflect.TypeOf((*MockFlags)(nil).GetInt), arg0)
 }
@@ -87,7 +92,7 @@ func (m *MockFlags) GetString(arg0 string) (string, error) {
 }

 // GetString indicates an expected call of GetString.
-func (mr *MockFlagsMockRecorder) GetString(arg0 interface{}) *gomock.Call {
+func (mr *MockFlagsMockRecorder) GetString(arg0 any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetString", reflect.TypeOf((*MockFlags)(nil).GetString), arg0)
 }
--- a/pkg/sync/action-general.go
+++ b/pkg/sync/action-general.go
@@ -209,7 +209,7 @@ var (
 				origClone.Enabled = ac.replica.DHCPServerEnabled
 			}

-			if !sc.Equals(origClone) {
+			if !sc.CleanAndEquals(origClone) {
 				return ac.client.SetDhcpConfig(origClone)
 			}
 		}
--- a/pkg/sync/sync_test.go
+++ b/pkg/sync/sync_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/bakito/adguardhome-sync/pkg/types"
 	"github.com/bakito/adguardhome-sync/pkg/utils"
 	"github.com/bakito/adguardhome-sync/pkg/versions"
-	gm "github.com/golang/mock/gomock"
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	gm "go.uber.org/mock/gomock"
 )

 var _ = Describe("Sync", func() {
--- a/testdata/config_test_replica.yaml
+++ b/testdata/config_test_replica.yaml
@@ -15,6 +15,7 @@ replica:
  insecureSkipVerify: false
  autoSetup: false
  interfaceName: eth3
+  dhcpServerEnabled: false
 cron: '*/15 * * * *'
 runOnStart: true
 printConfigOnly: true
--- a/testdata/config_test_replicas.yaml
+++ b/testdata/config_test_replicas.yaml
@@ -15,6 +15,7 @@ replicas:
    insecureSkipVerify: false
    autoSetup: false
    interfaceName: eth3
+    dhcpServerEnabled: false
 cron: '*/15 * * * *'
 runOnStart: true
 printConfigOnly: true
--- a/testdata/config_test_replicas_and_replica.yaml
+++ b/testdata/config_test_replicas_and_replica.yaml
@@ -15,6 +15,7 @@ replica:
  insecureSkipVerify: false
  autoSetup: false
  interfaceName: eth3
+  dhcpServerEnabled: false
 replicas:
  - url: https://replicas-file:443
    webURL: https://replicas-file:443
@@ -24,6 +25,7 @@ replicas:
    insecureSkipVerify: false
    autoSetup: false
    interfaceName: eth3
+    dhcpServerEnabled: false
 cron: '*/15 * * * *'
 runOnStart: true
 printConfigOnly: true
--- a/tools.go
+++ b/tools.go
@@ -0,0 +1,14 @@
+//go:build tools
+// +build tools
+
+package tools
+
+import (
+	_ "github.com/bakito/semver"
+	_ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	_ "github.com/goreleaser/goreleaser"
+	_ "github.com/onsi/ginkgo/v2/ginkgo"
+	_ "go.uber.org/mock/mockgen"
+	_ "k8s.io/code-generator/cmd/deepcopy-gen"
+)
Author	SHA1	Message	Date
Marc Brugger	3c0115b71c	Dhcp server enabled handling (#282 ) * switch to go.uber.org/mock * #281 special handling for dhcpServerEnabled	2024-01-17 19:29:25 +01:00
Marc Brugger	c401c790bc	switch to go.uber.org/mock (#280 )	2024-01-16 16:46:13 +01:00
dependabot[bot]	271dcacf19	Bump github.com/go-git/go-git/v5 from 5.7.0 to 5.11.0 (#279 ) Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.7.0 to 5.11.0. - [Release notes](https://github.com/go-git/go-git/releases) - [Commits](https://github.com/go-git/go-git/compare/v5.7.0...v5.11.0) --- updated-dependencies: - dependency-name: github.com/go-git/go-git/v5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-15 22:06:42 +01:00
dependabot[bot]	983d29d033	Bump github.com/cloudflare/circl from 1.3.5 to 1.3.7 (#278 ) Bumps [github.com/cloudflare/circl](https://github.com/cloudflare/circl) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/cloudflare/circl/releases) - [Commits](https://github.com/cloudflare/circl/compare/v1.3.5...v1.3.7) --- updated-dependencies: - dependency-name: github.com/cloudflare/circl dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-15 22:06:31 +01:00
Marc Brugger	078f6e1cc4	add dependencies to tools.go (#277 )	2024-01-15 21:07:56 +01:00
Marc Brugger	9f8f6bc814	run tests with ginkgo cli (#276 )	2024-01-15 18:24:10 +01:00
bakito	ef35178396	move deprecations to wiki	2024-01-15 08:13:52 +01:00
dependabot[bot]	b3781c6d8f	Bump github.com/onsi/ginkgo/v2 from 2.13.2 to 2.14.0 (#274 ) Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.13.2 to 2.14.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.13.2...v2.14.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-01-15 07:07:45 +01:00
bakito	2319739f6d	ignore wiki from	2024-01-14 21:21:19 +01:00
Marc Brugger	f9ac1ca698	Add e2e status to Readme	2024-01-14 21:02:19 +01:00
bakito	9802bf2f37	add tests #272	2024-01-14 16:38:58 +01:00
bakito	843433e35d	extend dhcp checks #272	2024-01-14 16:13:45 +01:00