#239 do not sync incomplete profile (#240)

Bumps [github.com/oapi-codegen/runtime](https://github.com/oapi-codegen/runtime) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/oapi-codegen/runtime/releases)
- [Commits](https://github.com/oapi-codegen/runtime/compare/v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/oapi-codegen/runtime
  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>

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [bakito]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -22,6 +22,7 @@ A clear and concise description of what you expected to happen.
 
 **Log Files**
 If applicable, add log files or json responses from AdGuardHome to help explain your problem.
+Please set  the environment variable `LOG_LEVEL=debug` to generate debug logs.
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -1,10 +0,0 @@
----
-name: Custom issue template
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/e2e.yaml

@@ -0,0 +1,35 @@
+name: e2e tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install kind with registry
+        uses: bakito/kind-with-registry-action@main
+
+      - name: Build image
+        run: ./testdata/e2e/bin/build-image.sh
+
+      - name: Install Helm Chart
+        run: ./testdata/e2e/bin/install-chart.sh
+      - name: Wait for sync to finish
+        run: ./testdata/e2e/bin/wait-for-sync.sh
+      - name: Show origin Logs
+        run: ./testdata/e2e/bin/show-origin-logs.sh
+      - name: Show Replica Logs
+        run: ./testdata/e2e/bin/show-replica-logs.sh
+      - name: Show Sync Logs
+        run: ./testdata/e2e/bin/show-sync-logs.sh
+      - name: Read latest replica config
+        run: ./testdata/e2e/bin/read-latest-replica-config.sh

.github/workflows/go.yml

@@ -11,22 +11,30 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
+        with:
+          skip-pkg-cache: true
 
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.18
-
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
 
       - name: Test
         run: make test-ci
@@ -41,16 +49,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v2
-        with:
-          go-version: ^1.17
-
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: "go.mod"
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v5
         with:
           version: latest
           args: --skip-publish --snapshot --rm-dist

.github/workflows/publish.yml

@@ -20,33 +20,32 @@ jobs:
             tagPrefix: "alpine-"
     steps:
       - name: Get current date
-        id: date
+        run: echo "curr_date=$(date --utc +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_ENV
-        run: echo "::set-output name=date::$(date --utc +%Y-%m-%dT%H:%M:%SZ)"
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to Quay
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: quay.io
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
       - name: Login to ghcr.io
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Modify Dockerfile
         run: |
           sed -i -e "s|FROM scratch|FROM ${{ matrix.build.fromImage }}|g" Dockerfile
 
       - name: Build and push ${{github.event.release.tag_name }}
         id: docker_build_release
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         if: ${{ github.event.release.tag_name != '' }}
         with:
           context: .
@@ -54,13 +53,14 @@ jobs:
           push: true
           tags: quay.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}latest,quay.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}${{ github.event.release.tag_name }},ghcr.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}latest,ghcr.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}${{ github.event.release.tag_name }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          provenance: false
           build-args: |
             VERSION=${{ github.event.release.tag_name }}
-            BUILD=${{ steps.date.outputs.date }}
+            BUILD=${{ env.curr_date }}
 
       - name: Build and push main
         id: docker_build_main
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         if: ${{ github.event.release.tag_name == '' }}
         with:
           context: .
@@ -68,9 +68,11 @@ jobs:
           push: true
           tags: quay.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}main,ghcr.io/bakito/adguardhome-sync:${{ matrix.build.tagPrefix }}main
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          provenance: false
           build-args: |
             VERSION=main
-            BUILD=${{ steps.date.outputs.date }}
+            BUILD=${{ env.curr_date }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
+

.gitignore

@@ -1,7 +1,12 @@
+.vscode
 .idea
-coverage.out
+.run
+coverage.out*
 dist
 adguardhome-sync
 main
 .adguardhome-sync.yaml
 tmp
+bin
+config.yaml
+*.log

.golangci.yml

@@ -1,12 +1,10 @@
 run:
-  timeout: 1m
+  timeout: 5m
 
 linters:
   enable:
   - asciicheck
   - bodyclose
-  - deadcode
-  - depguard
   - dogsled
   - durationcheck
   - errcheck
@@ -25,15 +23,10 @@ linters:
   - misspell
   - nakedret
   - nolintlint
-  - revive
   - staticcheck
-  - structcheck
-  - typecheck
   - unconvert
   - unparam
   - unused
-  - varcheck
-  - wastedassign
 linters-settings:
   gosec:
     # Exclude generated files
@@ -41,3 +34,4 @@ linters-settings:
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
+

.goreleaser.yml

@@ -28,11 +28,9 @@ builds:
       - goos: windows
         goarch: arm64
     hooks:
-      post: upx {{ .Path }}
+      post:
-archives:
+        # don't upx windows binaries as they make trouble with virus scanners
-  - replacements:
+        - bash -c 'if [[ "{{ .Path }}" != *.exe ]]; then upx {{ .Path }}; fi'
-      386: i386
-      amd64: x86_64
 checksum:
   name_template: 'checksums.txt'
 snapshot:
@@ -44,4 +42,4 @@ changelog:
       - '^docs:'
       - '^test:'
 release:
-  prerelease: auto
+  prerelease: auto

.oapi-codegen.yaml

@@ -0,0 +1,3 @@
+output-options:
+  client-type-name: AdguardHomeClient
+  response-type-suffix: Resp

Dockerfile

@@ -1,8 +1,10 @@
-FROM golang:1.18 as builder
+FROM golang:1.21-bullseye as builder
 
 WORKDIR /go/src/app
 
-RUN apt-get update && apt-get install -y upx
+RUN apt-get update && \
+    apt-get install -y upx && \
+    apt-get upgrade -y # upgrade to get latest ca-certs
 
 ARG VERSION=main
 ARG BUILD="N/A"

Makefile

@@ -1,51 +1,112 @@
-# Run go fmt against code
+# Run go lint against code
-fmt:
+lint: golangci-lint
-	golangci-lint run --fix
+	$(GOLANGCI_LINT) run --fix
 
 # Run go mod tidy
 tidy:
 	go mod tidy
 
 generate: deepcopy-gen
-	touch ./tmp/deepcopy-gen-boilerplate.go.txt
+	@mkdir -p ./tmp
-	deepcopy-gen -h ./tmp/deepcopy-gen-boilerplate.go.txt -i ./pkg/types
+	@touch ./tmp/deepcopy-gen-boilerplate.go.txt
+	$(DEEPCOPY_GEN) -h ./tmp/deepcopy-gen-boilerplate.go.txt -i ./pkg/types
 
 # Run tests
-test: generate test-ci fmt
+test: generate lint test-ci
 
 # Run ci tests
 test-ci: mocks tidy
-	go test ./...  -coverprofile=coverage.out
+	go test ./...  -coverprofile=coverage.out.tmp
+	cat coverage.out.tmp | grep -v "_generated.go" > coverage.out
 	go tool cover -func=coverage.out
 
 mocks: mockgen
-	mockgen -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
+	$(MOCKGEN) -package client -destination pkg/mocks/client/mock.go github.com/bakito/adguardhome-sync/pkg/client Client
 
-release: semver
+release: semver goreleaser
-	@version=$$(semver); \
+	@version=$$($(LOCALBIN)/semver); \
 	git tag -s $$version -m"Release $$version"
-	goreleaser --rm-dist
+	$(GORELEASER) --clean
 
-test-release:
+test-release: goreleaser
-	goreleaser --skip-publish --snapshot --rm-dist
+	$(GORELEASER) --skip-publish --snapshot --clean
 
-semver:
+## toolbox - start
-ifeq (, $(shell which semver))
+## Current working directory
- $(shell go install github.com/bakito/semver@latest)
+LOCALDIR ?= $(shell which cygpath > /dev/null 2>&1 && cygpath -m $$(pwd) || pwd)
-endif
+## Location to install dependencies to
+LOCALBIN ?= $(LOCALDIR)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
 
-mockgen:
+## Tool Binaries
-ifeq (, $(shell which mockgen))
+SEMVER ?= $(LOCALBIN)/semver
- $(shell go install github.com/golang/mock/mockgen@v1.6.0)
+OAPI_CODEGEN ?= $(LOCALBIN)/oapi-codegen
-endif
+MOCKGEN ?= $(LOCALBIN)/mockgen
+GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
+GORELEASER ?= $(LOCALBIN)/goreleaser
+DEEPCOPY_GEN ?= $(LOCALBIN)/deepcopy-gen
 
-deepcopy-gen:
+## Tool Versions
-ifeq (, $(shell which deepcopy-gen))
+SEMVER_VERSION ?= v1.1.3
- $(shell go install k8s.io/code-generator/cmd/deepcopy-gen@latest)
+OAPI_CODEGEN_VERSION ?= v2.0.0
-endif
+MOCKGEN_VERSION ?= v1.6.0
+GOLANGCI_LINT_VERSION ?= v1.55.2
+GORELEASER_VERSION ?= v1.22.1
+DEEPCOPY_GEN_VERSION ?= v0.28.4
+
+## 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)
+
+## Update Tools
+.PHONY: update-toolbox-tools
+update-toolbox-tools:
+	@rm -f \
+		$(LOCALBIN)/semver \
+		$(LOCALBIN)/oapi-codegen \
+		$(LOCALBIN)/mockgen \
+		$(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
+## toolbox - end
 
 start-replica:
-	podman run --pull always --rm -it -p 9090:80 -p 9091:3000  adguard/adguardhome
+	docker run --pull always --name adguardhome-replica -p 9091:3000 --rm adguard/adguardhome:latest
+#	docker run --pull always --name adguardhome-replica -p 9090:80 -p 9091:3000 --rm adguard/adguardhome:v0.107.13
+
+start-replica2:
+	docker run --pull always --name adguardhome-replica2 -p 9093:3000 --rm adguard/adguardhome:latest
+#	docker run --pull always --name adguardhome-replica -p 9090:80 -p 9091:3000 --rm adguard/adguardhome:v0.107.13
 
 check_defined = \
     $(strip $(foreach 1,$1, \
@@ -56,4 +117,21 @@ __check_defined = \
 
 build-image:
 	$(call check_defined, AGH_SYNC_VERSION)
-	podman build --build-arg VERSION=${AGH_SYNC_VERSION} --build-arg BUILD=$(shell date -u +'%Y-%m-%dT%H:%M:%S.%3NZ') --name adgardhome-replica -t ghcr.io/bakito/adguardhome-sync:${AGH_SYNC_VERSION} .
+	docker build --build-arg VERSION=${AGH_SYNC_VERSION} --build-arg BUILD=$(shell date -u +'%Y-%m-%dT%H:%M:%S.%3NZ') --name adgardhome-replica -t ghcr.io/bakito/adguardhome-sync:${AGH_SYNC_VERSION} .
+
+kind-create:
+	kind delete cluster
+	kind create  cluster
+
+kind-test:
+	@./testdata/e2e/bin/install-chart.sh
+
+model: oapi-codegen
+	@mkdir -p tmp
+	go run openapi/main.go v0.107.40
+	$(OAPI_CODEGEN) -package model -generate types,client -config .oapi-codegen.yaml tmp/schema.yaml > pkg/client/model/model_generated.go
+
+model-diff:
+	go run openapi/main.go v0.107.40
+	go run openapi/main.go
+	diff tmp/schema.yaml tmp/schema-master.yaml

README.md

@@ -1,6 +1,6 @@
 [![Go](https://github.com/bakito/adguardhome-sync/actions/workflows/go.yml/badge.svg)](https://github.com/bakito/adguardhome-sync/actions/workflows/go.yml)
 [![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)](https://coveralls.io/github/bakito/adguardhome-sync?branch=main)
+[![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)
 
 # AdGuardHome sync
 
@@ -37,16 +37,58 @@ go install github.com/bakito/adguardhome-sync@latest
 
 Both the origin instance must be initially setup via the AdguardHome installation wizard.
 
-## Run
+## Username / Password vs. Cookie
+
+Some instances of AdGuard Home do not support basic authentication. For instance, many routers with built-in Adguard Home support do not. If this is the case, a valid cookie may be provided instead. If the router protects the AdGuard instance behind its own authentication, the cookie from an authenticated request may allow the sync to succeed.
+
+- This has been tested successfully against GL.Inet routers with AdGuard Home.
+- Note: due to the short validity of cookies, this approach is likely only suitable for one-time syncs
+
+## Run Linux/Mac
 
 ```bash
 
+export LOG_LEVEL=info
 export ORIGIN_URL=https://192.168.1.2:3000
 export ORIGIN_USERNAME=username
 export ORIGIN_PASSWORD=password
+# export ORIGIN_COOKIE=Origin-Cookie-Name=CCCOOOKKKIIIEEE
 export REPLICA_URL=http://192.168.1.3
 export REPLICA_USERNAME=username
 export REPLICA_PASSWORD=password
+# export REPLICA_COOKIE=Replica-Cookie-Name=CCCOOOKKKIIIEEE
+
+# run once
+adguardhome-sync run
+
+# run as daemon
+adguardhome-sync run --cron "*/10 * * * *"
+```
+
+## Run Windows
+
+```bash
+@ECHO OFF
+@TITLE AdGuardHome-Sync
+
+REM set LOG_LEVEL=debug
+set LOG_LEVEL=info
+REM set LOG_LEVEL=warn
+REM set LOG_LEVEL=error
+
+set ORIGIN_URL=http://192.168.1.2:3000
+set ORIGIN_USERNAME=username
+set ORIGIN_PASSWORD=password
+# set ORIGIN_COOKIE=Origin-Cookie-Name=CCCOOOKKKIIIEEE
+
+set REPLICA_URL=http://192.168.2.2:3000
+set REPLICA_USERNAME=username
+set REPLICA_PASSWORD=password
+# set REPLICA_COOKIE=Replica-Cookie-Name=CCCOOOKKKIIIEEE
+
+set FEATURES_DHCP=false
+set FEATURES_DHCP_SERVERCONFIG=false
+set FEATURES_DHCP_STATICLEASES=false
 
 # run once
 adguardhome-sync run
@@ -96,20 +138,26 @@ services:
     container_name: adguardhome-sync
     command: run
     environment:
-      ORIGIN_URL: 'https://192.168.1.2:3000'
+      LOG_LEVEL: "info"
-      ORIGIN_USERNAME: 'username'
+      ORIGIN_URL: "https://192.168.1.2:3000"
-      ORIGIN_PASSWORD: 'password'
+      ORIGIN_USERNAME: "username"
-      REPLICA_URL: 'http://192.168.1.3'
+      ORIGIN_PASSWORD: "password"
-      REPLICA_USERNAME: 'username'
+      REPLICA_URL: "http://192.168.1.3"
-      REPLICA_PASSWORD: 'password'
+      REPLICA_USERNAME: "username"
-      REPLICA1_URL: 'http://192.168.1.4'
+      REPLICA_PASSWORD: "password"
-      REPLICA1_USERNAME: 'username'
+      REPLICA1_URL: "http://192.168.1.4"
-      REPLICA1_PASSWORD: 'password'
+      REPLICA1_USERNAME: "username"
-      REPLICA1_APIPATH: '/some/path/control'
+      REPLICA1_PASSWORD: "password"
+      REPLICA1_APIPATH: "/some/path/control"
       # REPLICA1_AUTOSETUP: true # if true, AdGuardHome is automatically initialized.
       # REPLICA1_INTERFACENAME: 'ens18' # use custom dhcp interface name
-      CRON: '*/10 * * * *' # run every 10 minutes
+      # REPLICA1_DHCPSERVERENABLED: true/false (optional) enables/disables the dhcp server on the replica
+      CRON: "*/10 * * * *" # run every 10 minutes
       RUNONSTART: true
+
+      # Configure the sync API server, disabled if api port is 0
+      API_PORT: 8080
+
       # Configure sync features; by default all features are enabled.
       # FEATURES_GENERALSETTINGS: true
       # FEATURES_QUERYLOGCONFIG: true
@@ -145,6 +193,7 @@ origin:
   # insecureSkipVerify: true # disable tls check
   username: username
   password: password
+  # cookie: Origin-Cookie-Name=CCCOOOKKKIIIEEE
 
 # replica instance (optional, if only one)
 replica:
@@ -152,6 +201,7 @@ replica:
   url: http://192.168.1.3
   username: username
   password: password
+  # cookie: Replica-Cookie-Name=CCCOOOKKKIIIEEE
 
 # replicas instances (optional, if more than one)
 replicas:
@@ -159,16 +209,18 @@ replicas:
   - url: http://192.168.1.3
     username: username
     password: password
+    # cookie: Replica1-Cookie-Name=CCCOOOKKKIIIEEE
   - url: http://192.168.1.4
     username: username
     password: password
-    # autoSetup: true # if true, AdGuardHome is automatically initialized. 
+    # cookie: Replica2-Cookie-Name=CCCOOOKKKIIIEEE
+    # autoSetup: true # if true, AdGuardHome is automatically initialized.
 
 # Configure the sync API server, disabled if api port is 0
 api:
   # Port, default 8080
   port: 8080
-  # if username and password are defined, basic auth is applied to the sync API 
+  # if username and password are defined, basic auth is applied to the sync API
   username: username
   password: password
 

cmd/root.go

@@ -12,6 +12,7 @@ import (
 	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.uber.org/zap"
 )
 
 const (
@@ -39,22 +40,28 @@ const (
 	configOriginAPIPath            = "origin.apiPath"
 	configOriginUsername           = "origin.username"
 	configOriginPassword           = "origin.password"
+	configOriginCookie             = "origin.cookie"
 	configOriginInsecureSkipVerify = "origin.insecureSkipVerify"
 
 	configReplicaURL                = "replica.url"
 	configReplicaAPIPath            = "replica.apiPath"
 	configReplicaUsername           = "replica.username"
 	configReplicaPassword           = "replica.password"
+	configReplicaCookie             = "replica.cookie"
 	configReplicaInsecureSkipVerify = "replica.insecureSkipVerify"
 	configReplicaAutoSetup          = "replica.autoSetup"
 	configReplicaInterfaceName      = "replica.interfaceName"
 
 	envReplicasUsernameFormat           = "REPLICA%s_USERNAME" // #nosec G101
 	envReplicasPasswordFormat           = "REPLICA%s_PASSWORD" // #nosec G101
+	envReplicasCookieFormat             = "REPLICA%s_COOKIE"   // #nosec G101
 	envReplicasAPIPathFormat            = "REPLICA%s_APIPATH"
 	envReplicasInsecureSkipVerifyFormat = "REPLICA%s_INSECURESKIPVERIFY"
 	envReplicasAutoSetup                = "REPLICA%s_AUTOSETUP"
-	envReplicasInterfaceName            = "REPLICA%s_INTERFACWENAME"
+	envReplicasInterfaceName            = "REPLICA%s_INTERFACENAME"
+	// Deprecated: use envReplicasInterfaceName instead
+	envReplicasInterfaceNameDeprecated = "REPLICA%s_INTERFACWENAME"
+	envDHCPServerEnabled               = "REPLICA%s_DHCPSERVERENABLED"
 )
 
 var (
@@ -122,20 +129,20 @@ func initConfig() {
 	}
 }
 
-func getConfig() (*types.Config, error) {
+func getConfig(logger *zap.SugaredLogger) (*types.Config, error) {
 	cfg := &types.Config{}
 	if err := viper.Unmarshal(cfg); err != nil {
 		return nil, err
 	}
 
 	if len(cfg.Replicas) == 0 {
-		cfg.Replicas = append(cfg.Replicas, collectEnvReplicas()...)
+		cfg.Replicas = append(cfg.Replicas, collectEnvReplicas(logger)...)
 	}
 	return cfg, nil
 }
 
 // Manually collect replicas from env.
-func collectEnvReplicas() []types.AdGuardInstance {
+func collectEnvReplicas(logger *zap.SugaredLogger) []types.AdGuardInstance {
 	var replicas []types.AdGuardInstance
 	for _, v := range os.Environ() {
 		if envReplicasURLPattern.MatchString(v) {
@@ -144,14 +151,35 @@ func collectEnvReplicas() []types.AdGuardInstance {
 				URL:                sm[2],
 				Username:           os.Getenv(fmt.Sprintf(envReplicasUsernameFormat, sm[1])),
 				Password:           os.Getenv(fmt.Sprintf(envReplicasPasswordFormat, sm[1])),
+				Cookie:             os.Getenv(fmt.Sprintf(envReplicasCookieFormat, sm[1])),
 				APIPath:            os.Getenv(fmt.Sprintf(envReplicasAPIPathFormat, sm[1])),
 				InsecureSkipVerify: strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasInsecureSkipVerifyFormat, sm[1])), "true"),
 				AutoSetup:          strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasAutoSetup, sm[1])), "true"),
 				InterfaceName:      os.Getenv(fmt.Sprintf(envReplicasInterfaceName, sm[1])),
 			}
+
+			if re.InterfaceName == "" {
+				if in, ok := os.LookupEnv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, sm[1])); ok {
+					logger.
+						With("correct", envReplicasInterfaceName, "deprecated", envReplicasInterfaceNameDeprecated).
+						Warn("Deprecated env variable is used, please use the correct one")
+					re.InterfaceName = in
+				}
+			}
+			if dhcpEnabled, ok := os.LookupEnv(fmt.Sprintf(envDHCPServerEnabled, sm[1])); ok {
+				if strings.EqualFold(dhcpEnabled, "true") {
+					re.DHCPServerEnabled = boolPtr(true)
+				} else if strings.EqualFold(dhcpEnabled, "false") {
+					re.DHCPServerEnabled = boolPtr(false)
+				}
+			}
 			replicas = append(replicas, re)
 		}
 	}
 
 	return replicas
 }
+
+func boolPtr(b bool) *bool {
+	return &b
+}

cmd/root_test.go

@@ -1,11 +1,14 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 
+	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/types"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"go.uber.org/zap"
 )
 
 var envVars = []string{
@@ -20,18 +23,28 @@ var envVars = []string{
 	"FEATURES_DNS_SERVERCONFIG",
 	"FEATURES_DNS_ACCESSLISTS",
 	"FEATURES_DNS_REWRITES",
+	"REPLICA1_INTERFACENAME",
+	"REPLICA1_INTERFACWENAME",
+	"REPLICA1_DHCPSERVERENABLED",
 }
 
 var _ = Describe("Run", func() {
+	var logger *zap.SugaredLogger
 	BeforeEach(func() {
+		logger = log.GetLogger("root")
 		for _, envVar := range envVars {
 			Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
 		}
 		initConfig()
 	})
+	AfterEach(func() {
+		for _, envVar := range envVars {
+			Ω(os.Unsetenv(envVar)).ShouldNot(HaveOccurred())
+		}
+	})
 	Context("getConfig", func() {
 		It("features should be true by default", func() {
-			cfg, err := getConfig()
+			cfg, err := getConfig(logger)
 			Ω(err).ShouldNot(HaveOccurred())
 			verifyFeatures(cfg, true)
 		})
@@ -39,10 +52,52 @@ var _ = Describe("Run", func() {
 			for _, envVar := range envVars {
 				Ω(os.Setenv(envVar, "false")).ShouldNot(HaveOccurred())
 			}
-			cfg, err := getConfig()
+			cfg, err := getConfig(logger)
 			Ω(err).ShouldNot(HaveOccurred())
 			verifyFeatures(cfg, false)
 		})
+		Context("interface name", func() {
+			It("should set interface name of replica 1", func() {
+				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceName, "1"), "eth0")).ShouldNot(HaveOccurred())
+				cfg, err := getConfig(logger)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
+			})
+			It("should set interface name of replica 1 from deprecated env", func() {
+				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, "1"), "eth0")).ShouldNot(HaveOccurred())
+				cfg, err := getConfig(logger)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
+			})
+			It("deprecated should not overwrite the correct", func() {
+				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceNameDeprecated, "1"), "eth1")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envReplicasInterfaceName, "1"), "eth0")).ShouldNot(HaveOccurred())
+				cfg, err := getConfig(logger)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(cfg.Replicas[0].InterfaceName).Should(Equal("eth0"))
+			})
+		})
+		Context("dhcp server", func() {
+			It("should enable the dhcp server of replica 1", func() {
+				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envDHCPServerEnabled, "1"), "true")).ShouldNot(HaveOccurred())
+				cfg, err := getConfig(logger)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+				Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeTrue())
+			})
+			It("should disable the dhcp server of replica 1", func() {
+				Ω(os.Setenv("REPLICA1_URL", "https://foo.bar")).ShouldNot(HaveOccurred())
+				Ω(os.Setenv(fmt.Sprintf(envDHCPServerEnabled, "1"), "false")).ShouldNot(HaveOccurred())
+				cfg, err := getConfig(logger)
+				Ω(err).ShouldNot(HaveOccurred())
+				Ω(cfg.Replicas[0].DHCPServerEnabled).ShouldNot(BeNil())
+				Ω(*cfg.Replicas[0].DHCPServerEnabled).Should(BeFalse())
+			})
+		})
 	})
 })
 

cmd/run.go

@@ -14,7 +14,7 @@ var doCmd = &cobra.Command{
 	Long:  `Synchronizes the configuration form an origin instance to a replica`,
 	RunE: func(cmd *cobra.Command, args []string) error {
 		logger = log.GetLogger("run")
-		cfg, err := getConfig()
+		cfg, err := getConfig(logger)
 		if err != nil {
 			logger.Error(err)
 			return err
@@ -72,7 +72,9 @@ func init() {
 	_ = viper.BindPFlag(configOriginUsername, doCmd.PersistentFlags().Lookup("origin-username"))
 	doCmd.PersistentFlags().String("origin-password", "", "Origin instance password")
 	_ = viper.BindPFlag(configOriginPassword, doCmd.PersistentFlags().Lookup("origin-password"))
-	doCmd.PersistentFlags().String("origin-insecure-skip-verify", "", "Enable Origin instance InsecureSkipVerify")
+	doCmd.PersistentFlags().String("origin-cookie", "", "If Set, uses a cookie for authentication")
+	_ = viper.BindPFlag(configOriginCookie, doCmd.PersistentFlags().Lookup("origin-cookie"))
+	doCmd.PersistentFlags().Bool("origin-insecure-skip-verify", false, "Enable Origin instance InsecureSkipVerify")
 	_ = viper.BindPFlag(configOriginInsecureSkipVerify, doCmd.PersistentFlags().Lookup("origin-insecure-skip-verify"))
 
 	doCmd.PersistentFlags().String("replica-url", "", "Replica instance url")
@@ -83,10 +85,12 @@ func init() {
 	_ = viper.BindPFlag(configReplicaUsername, doCmd.PersistentFlags().Lookup("replica-username"))
 	doCmd.PersistentFlags().String("replica-password", "", "Replica instance password")
 	_ = viper.BindPFlag(configReplicaPassword, doCmd.PersistentFlags().Lookup("replica-password"))
+	doCmd.PersistentFlags().String("replica-cookie", "", "If Set, uses a cookie for authentication")
+	_ = viper.BindPFlag(configReplicaCookie, doCmd.PersistentFlags().Lookup("replica-cookie"))
 	doCmd.PersistentFlags().Bool("replica-insecure-skip-verify", false, "Enable Replica instance InsecureSkipVerify")
 	_ = viper.BindPFlag(configReplicaInsecureSkipVerify, doCmd.PersistentFlags().Lookup("replica-insecure-skip-verify"))
 	doCmd.PersistentFlags().Bool("replica-auto-setup", false, "Enable automatic setup of new AdguardHome instances. This replaces the setup wizard.")
 	_ = viper.BindPFlag(configReplicaAutoSetup, doCmd.PersistentFlags().Lookup("replica-auto-setup"))
-	doCmd.PersistentFlags().Bool("replica-interface-name", false, "Optional change the interface name of the replica if it differs from the master")
+	doCmd.PersistentFlags().String("replica-interface-name", "", "Optional change the interface name of the replica if it differs from the master")
 	_ = viper.BindPFlag(configReplicaInterfaceName, doCmd.PersistentFlags().Lookup("replica-interface-name"))
 }

go.mod

@@ -1,56 +1,80 @@
 module github.com/bakito/adguardhome-sync
 
-go 1.18
+go 1.20
 
 require (
-	github.com/gin-gonic/gin v1.8.1
+	github.com/gin-gonic/gin v1.9.1
-	github.com/go-resty/resty/v2 v2.7.0
+	github.com/go-resty/resty/v2 v2.10.0
 	github.com/golang/mock v1.6.0
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.4.0
-	github.com/jinzhu/copier v0.3.5
+	github.com/jinzhu/copier v0.4.0
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/onsi/ginkgo/v2 v2.1.4
+	github.com/oapi-codegen/runtime v1.1.0
-	github.com/onsi/gomega v1.20.0
+	github.com/onsi/ginkgo/v2 v2.13.1
+	github.com/onsi/gomega v1.30.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/spf13/cobra v1.5.0
+	github.com/spf13/cobra v1.8.0
-	github.com/spf13/viper v1.12.0
+	github.com/spf13/viper v1.17.0
-	go.uber.org/zap v1.21.0
+	go.uber.org/zap v1.26.0
-	golang.org/x/mod v0.5.1
+	golang.org/x/mod v0.14.0
+	gopkg.in/yaml.v3 v3.0.1
+	k8s.io/apimachinery v0.28.4
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
+	github.com/bytedance/sonic v1.10.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/validator/v10 v10.10.0 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/goccy/go-json v0.9.7 // indirect
+	github.com/go-playground/validator/v10 v10.15.1 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/spf13/afero v1.8.2 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.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/subosito/gotenv v1.3.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/ugorji/go/codec v1.2.7 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
+	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
-	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/net v0.17.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
-	gopkg.in/ini.v1 v1.66.4 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.14.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.100.1 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
 )

go.sum

@@ -38,9 +38,21 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
+github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.10.0 h1:qtNZduETEIWJVIyDl01BeNxur2rW9OwTQ/yBqFRkKEk=
+github.com/bytedance/sonic v1.10.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -48,39 +60,46 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
+github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
+github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/validator/v10 v10.10.0 h1:I7mrTYv78z8k8VXa/qJlOlEXn/nBh+BF8dHX5nt/dr0=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
+github.com/go-playground/validator/v10 v10.15.1 h1:BSe8uhN+xQ4r5guV/ywQI4gO59C2raYcGffYWZEjZzM=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
+github.com/go-playground/validator/v10 v10.15.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM=
+github.com/go-resty/resty/v2 v2.10.0 h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/go-resty/resty/v2 v2.10.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -109,7 +128,7 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -122,9 +141,12 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -138,10 +160,12 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
@@ -151,30 +175,33 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
+github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
-github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
+github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -184,84 +211,93 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q=
+github.com/oapi-codegen/runtime v1.1.0 h1:rJpoNUawn5XTvekgfkvSZr0RqEnoYpFkyvrzfWeFKWM=
-github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
+github.com/oapi-codegen/runtime v1.1.0/go.mod h1:BeSfBkWWWnAnGdyS+S/GnlbmHKzf8/hwkvelJZDeKA8=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
-github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU=
+github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
-github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
-github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
+github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
+github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
+github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
-github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
+github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
+golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
-golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -272,6 +308,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -296,8 +334,10 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -330,9 +370,12 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -353,6 +396,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -390,12 +435,20 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -403,11 +456,16 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -445,6 +503,7 @@ golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
@@ -453,10 +512,14 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -550,21 +613,22 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -574,6 +638,19 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
+k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
+k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
+k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
+sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=

openapi/main.go

@@ -0,0 +1,63 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"log"
+	"net/http"
+	"os"
+
+	"gopkg.in/yaml.v3"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+)
+
+func main() {
+	version := "master"
+	fileName := "schema-master.yaml"
+	if len(os.Args) > 1 {
+		version = os.Args[1]
+		fileName = "schema.yaml"
+	}
+	log.Printf("Patching schema version %s\n", version)
+
+	resp, err := http.Get(fmt.Sprintf("https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/%s/openapi/openapi.yaml", version))
+	if err != nil {
+		log.Fatalln(err)
+	}
+	defer func() { _ = resp.Body.Close() }()
+	data, err := io.ReadAll(resp.Body)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	schema := make(map[string]interface{})
+	err = yaml.Unmarshal(data, &schema)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	if requestBodies, ok, _ := unstructured.NestedMap(schema, "components", "requestBodies"); ok {
+		for k := range requestBodies {
+			_ = unstructured.SetNestedField(schema, k+"Body", "components", "requestBodies", k, "x-go-name")
+		}
+	}
+
+	if dnsInfo, ok, _ := unstructured.NestedMap(schema,
+		"paths", "/dns_info", "get", "responses", "200", "content", "application/json", "schema"); ok {
+		if allOf, ok, _ := unstructured.NestedSlice(dnsInfo, "allOf"); ok && len(allOf) == 2 {
+			delete(dnsInfo, "allOf")
+			if err := unstructured.SetNestedMap(schema, allOf[0].(map[string]interface{}),
+				"paths", "/dns_info", "get", "responses", "200", "content", "application/json", "schema"); err != nil {
+				log.Fatalln(err)
+			}
+		}
+	}
+	b, err := yaml.Marshal(&schema)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	log.Printf("Writing schema file tmp/%s", fileName)
+	err = os.WriteFile("tmp/"+fileName, b, 0o600)
+	if err != nil {
+		log.Fatalln(err)
+	}
+}

pkg/client/client-methods.go

@@ -0,0 +1,83 @@
+package client
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/go-resty/resty/v2"
+)
+
+func (cl *client) doGet(req *resty.Request, url string) error {
+	rl := cl.log.With("method", "GET", "path", url)
+	if cl.client.UserInfo != nil {
+		rl = rl.With("username", cl.client.UserInfo.Username)
+	}
+	req.ForceContentType("application/json")
+	rl.Debug("do get")
+	resp, err := req.Get(url)
+	if err != nil {
+		if resp != nil && resp.StatusCode() == http.StatusFound {
+			loc := resp.Header().Get("Location")
+			if loc == "/install.html" || loc == "/control/install.html" {
+				return ErrSetupNeeded
+			}
+		}
+		rl.With("status", resp.StatusCode(), "body", string(resp.Body()), "error", err).Debug("error in do get")
+		return detailedError(resp, err)
+	}
+	rl.With(
+		"status", resp.StatusCode(),
+		"body", string(resp.Body()),
+		"content-type", resp.Header()["Content-Type"],
+	).Debug("got response")
+	if resp.StatusCode() != http.StatusOK {
+		return detailedError(resp, nil)
+	}
+	return nil
+}
+
+func (cl *client) doPost(req *resty.Request, url string) error {
+	rl := cl.log.With("method", "POST", "path", url)
+	if cl.client.UserInfo != nil {
+		rl = rl.With("username", cl.client.UserInfo.Username)
+	}
+	b, _ := json.Marshal(req.Body)
+	rl.With("body", string(b)).Debug("do post")
+	resp, err := req.Post(url)
+	if err != nil {
+		rl.With("status", resp.StatusCode(), "body", string(resp.Body()), "error", err).Debug("error in do post")
+		return detailedError(resp, err)
+	}
+	rl.With(
+		"status", resp.StatusCode(),
+		"body", string(resp.Body()),
+		"content-type", contentType(resp),
+	).Debug("got response")
+	if resp.StatusCode() != http.StatusOK {
+		return detailedError(resp, nil)
+	}
+	return nil
+}
+
+func (cl *client) doPut(req *resty.Request, url string) error {
+	rl := cl.log.With("method", "PUT", "path", url)
+	if cl.client.UserInfo != nil {
+		rl = rl.With("username", cl.client.UserInfo.Username)
+	}
+	b, _ := json.Marshal(req.Body)
+	rl.With("body", string(b)).Debug("do put")
+	resp, err := req.Put(url)
+	if err != nil {
+		rl.With("status", resp.StatusCode(), "body", string(resp.Body()), "error", err).Debug("error in do put")
+		return detailedError(resp, err)
+	}
+	rl.With(
+		"status", resp.StatusCode(),
+		"body", string(resp.Body()),
+		"content-type", contentType(resp),
+	).Debug("got response")
+	if resp.StatusCode() != http.StatusOK {
+		return detailedError(resp, nil)
+	}
+	return nil
+}

pkg/client/client.go

@@ -9,9 +9,12 @@ import (
 	"os"
 	"path"
 	"strconv"
+	"strings"
 
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
 	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
 	"github.com/go-resty/resty/v2"
 	"go.uber.org/zap"
 )
@@ -24,6 +27,17 @@ var (
 	ErrSetupNeeded = errors.New("setup needed")
 )
 
+func detailedError(resp *resty.Response, err error) error {
+	e := resp.Status()
+	if len(resp.Body()) > 0 {
+		e += fmt.Sprintf("(%s)", string(resp.Body()))
+	}
+	if err != nil {
+		e += fmt.Sprintf(": %s", err.Error())
+	}
+	return errors.New(e)
+}
+
 // New create a new client
 func New(config types.AdGuardInstance) (Client, error) {
 	var apiURL string
@@ -44,7 +58,13 @@ func New(config types.AdGuardInstance) (Client, error) {
 		cl.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true})
 	}
 
-	if config.Username != "" && config.Password != "" {
+	cookieParts := strings.Split(config.Cookie, "=")
+	if len(cookieParts) == 2 {
+		cl.SetCookie(&http.Cookie{
+			Name:  cookieParts[0],
+			Value: cookieParts[1],
+		})
+	} else if config.Username != "" && config.Password != "" {
 		cl = cl.SetBasicAuth(config.Username, config.Password)
 	}
 
@@ -69,110 +89,84 @@ func New(config types.AdGuardInstance) (Client, error) {
 // Client AdguardHome API client interface
 type Client interface {
 	Host() string
-	Status() (*types.Status, error)
+	Status() (*model.ServerStatus, error)
 	ToggleProtection(enable bool) error
-	RewriteList() (*types.RewriteEntries, error)
+	RewriteList() (*model.RewriteEntries, error)
-	AddRewriteEntries(e ...types.RewriteEntry) error
+	AddRewriteEntries(e ...model.RewriteEntry) error
-	DeleteRewriteEntries(e ...types.RewriteEntry) error
+	DeleteRewriteEntries(e ...model.RewriteEntry) error
-	Filtering() (*types.FilteringStatus, error)
+	Filtering() (*model.FilterStatus, error)
-	ToggleFiltering(enabled bool, interval float64) error
+	ToggleFiltering(enabled bool, interval int) error
-	AddFilters(whitelist bool, e ...types.Filter) error
+	AddFilters(whitelist bool, e ...model.Filter) error
-	DeleteFilters(whitelist bool, e ...types.Filter) error
+	DeleteFilters(whitelist bool, e ...model.Filter) error
-	UpdateFilters(whitelist bool, e ...types.Filter) error
+	UpdateFilters(whitelist bool, e ...model.Filter) error
 	RefreshFilters(whitelist bool) error
-	SetCustomRules(rules types.UserRules) error
+	SetCustomRules(rules *[]string) error
 	SafeBrowsing() (bool, error)
 	ToggleSafeBrowsing(enable bool) error
 	Parental() (bool, error)
 	ToggleParental(enable bool) error
-	SafeSearch() (bool, error)
+	SafeSearchConfig() (*model.SafeSearchConfig, error)
-	ToggleSafeSearch(enable bool) error
+	SetSafeSearchConfig(settings *model.SafeSearchConfig) error
-	Services() (types.Services, error)
+	ProfileInfo() (*model.ProfileInfo, error)
-	SetServices(services types.Services) error
+	SetProfileInfo(settings *model.ProfileInfo) error
-	Clients() (*types.Clients, error)
+	BlockedServices() (*model.BlockedServicesArray, error)
-	AddClients(client ...types.Client) error
+	BlockedServicesSchedule() (*model.BlockedServicesSchedule, error)
-	UpdateClients(client ...types.Client) error
+	SetBlockedServices(services *model.BlockedServicesArray) error
-	DeleteClients(client ...types.Client) error
+	SetBlockedServicesSchedule(schedule *model.BlockedServicesSchedule) error
-	QueryLogConfig() (*types.QueryLogConfig, error)
+	Clients() (*model.Clients, error)
-	SetQueryLogConfig(enabled bool, interval float64, anonymizeClientIP bool) error
+	AddClients(client ...*model.Client) error
-	StatsConfig() (*types.IntervalConfig, error)
+	UpdateClients(client ...*model.Client) error
-	SetStatsConfig(interval float64) error
+	DeleteClients(client ...*model.Client) error
+	QueryLogConfig() (*model.QueryLogConfig, error)
+	SetQueryLogConfig(*model.QueryLogConfig) error
+	StatsConfig() (*model.StatsConfig, error)
+	SetStatsConfig(sc *model.StatsConfig) error
 	Setup() error
-	AccessList() (*types.AccessList, error)
+	AccessList() (*model.AccessList, error)
-	SetAccessList(*types.AccessList) error
+	SetAccessList(*model.AccessList) error
-	DNSConfig() (*types.DNSConfig, error)
+	DNSConfig() (*model.DNSConfig, error)
-	SetDNSConfig(*types.DNSConfig) error
+	SetDNSConfig(*model.DNSConfig) error
-	DHCPServerConfig() (*types.DHCPServerConfig, error)
+	DhcpConfig() (*model.DhcpStatus, error)
-	SetDHCPServerConfig(*types.DHCPServerConfig) error
+	SetDhcpConfig(*model.DhcpStatus) error
-	AddDHCPStaticLeases(leases ...types.Lease) error
+	AddDHCPStaticLeases(leases ...model.DhcpStaticLease) error
-	DeleteDHCPStaticLeases(leases ...types.Lease) error
+	DeleteDHCPStaticLeases(leases ...model.DhcpStaticLease) error
 }
 
 type client struct {
-	client *resty.Client
+	client  *resty.Client
-	log    *zap.SugaredLogger
+	log     *zap.SugaredLogger
-	host   string
+	host    string
+	version string
 }
 
 func (cl *client) Host() string {
 	return cl.host
 }
 
-func (cl *client) doGet(req *resty.Request, url string) error {
+func contentType(resp *resty.Response) string {
-	rl := cl.log.With("method", "GET", "path", url)
+	if ct, ok := resp.Header()["Content-Type"]; ok {
-	if cl.client.UserInfo != nil {
+		if len(ct) != 1 {
-		rl = rl.With("username", cl.client.UserInfo.Username)
+			return fmt.Sprintf("%v", ct)
-	}
-	rl.Debug("do get")
-	resp, err := req.Get(url)
-	if err != nil {
-		if resp != nil && resp.StatusCode() == http.StatusFound {
-			loc := resp.Header().Get("Location")
-			if loc == "/install.html" {
-				return ErrSetupNeeded
-			}
 		}
-		rl.With("status", resp.StatusCode(), "body", string(resp.Body()), "error", err).Debug("error in do get")
+		return ct[0]
-		return err
 	}
-	rl.With("status", resp.StatusCode(), "body", string(resp.Body())).Debug("got response")
+	return ""
-	if resp.StatusCode() != http.StatusOK {
-		return errors.New(resp.Status())
-	}
-	return nil
 }
 
-func (cl *client) doPost(req *resty.Request, url string) error {
+func (cl *client) Status() (*model.ServerStatus, error) {
-	rl := cl.log.With("method", "POST", "path", url)
+	status := &model.ServerStatus{}
-	if cl.client.UserInfo != nil {
-		rl = rl.With("username", cl.client.UserInfo.Username)
-	}
-	rl.Debug("do post")
-	resp, err := req.Post(url)
-	if err != nil {
-		rl.With("status", resp.StatusCode(), "body", string(resp.Body()), "error", err).Debug("error in do post")
-		return err
-	}
-	rl.With("status", resp.StatusCode(), "body", string(resp.Body())).Debug("got response")
-	if resp.StatusCode() != http.StatusOK {
-		return errors.New(resp.Status())
-	}
-	return nil
-}
-
-func (cl *client) Status() (*types.Status, error) {
-	status := &types.Status{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(status), "status")
+	cl.version = status.Version
 	return status, err
 }
 
-func (cl *client) RewriteList() (*types.RewriteEntries, error) {
+func (cl *client) RewriteList() (*model.RewriteEntries, error) {
-	rewrites := &types.RewriteEntries{}
+	rewrites := &model.RewriteEntries{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(&rewrites), "/rewrite/list")
 	return rewrites, err
 }
 
-func (cl *client) AddRewriteEntries(entries ...types.RewriteEntry) error {
+func (cl *client) AddRewriteEntries(entries ...model.RewriteEntry) error {
 	for i := range entries {
 		e := entries[i]
 		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Add rewrite entry")
@@ -184,7 +178,7 @@ func (cl *client) AddRewriteEntries(entries ...types.RewriteEntry) error {
 	return nil
 }
 
-func (cl *client) DeleteRewriteEntries(entries ...types.RewriteEntry) error {
+func (cl *client) DeleteRewriteEntries(entries ...model.RewriteEntry) error {
 	for i := range entries {
 		e := entries[i]
 		cl.log.With("domain", e.Domain, "answer", e.Answer).Info("Delete rewrite entry")
@@ -212,16 +206,8 @@ func (cl *client) ToggleParental(enable bool) error {
 	return cl.toggleBool("parental", enable)
 }
 
-func (cl *client) SafeSearch() (bool, error) {
-	return cl.toggleStatus("safesearch")
-}
-
-func (cl *client) ToggleSafeSearch(enable bool) error {
-	return cl.toggleBool("safesearch", enable)
-}
-
 func (cl *client) toggleStatus(mode string) (bool, error) {
-	fs := &types.EnableConfig{}
+	fs := &model.EnableConfig{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(fs), fmt.Sprintf("/%s/status", mode))
 	return fs.Enabled, err
 }
@@ -237,16 +223,16 @@ func (cl *client) toggleBool(mode string, enable bool) error {
 	return cl.doPost(cl.client.R().EnableTrace(), fmt.Sprintf("/%s/%s", mode, target))
 }
 
-func (cl *client) Filtering() (*types.FilteringStatus, error) {
+func (cl *client) Filtering() (*model.FilterStatus, error) {
-	f := &types.FilteringStatus{}
+	f := &model.FilterStatus{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(f), "/filtering/status")
 	return f, err
 }
 
-func (cl *client) AddFilters(whitelist bool, filters ...types.Filter) error {
+func (cl *client) AddFilters(whitelist bool, filters ...model.Filter) error {
 	for _, f := range filters {
-		cl.log.With("url", f.URL, "whitelist", whitelist, "enabled", f.Enabled).Info("Add filter")
+		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Add filter")
-		ff := &types.Filter{Name: f.Name, URL: f.URL, Whitelist: whitelist}
+		ff := &model.AddUrlRequest{Name: utils.Ptr(f.Name), Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/add_url")
 		if err != nil {
 			return err
@@ -255,10 +241,10 @@ func (cl *client) AddFilters(whitelist bool, filters ...types.Filter) error {
 	return nil
 }
 
-func (cl *client) DeleteFilters(whitelist bool, filters ...types.Filter) error {
+func (cl *client) DeleteFilters(whitelist bool, filters ...model.Filter) error {
 	for _, f := range filters {
-		cl.log.With("url", f.URL, "whitelist", whitelist, "enabled", f.Enabled).Info("Delete filter")
+		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Delete filter")
-		ff := &types.Filter{URL: f.URL, Whitelist: whitelist}
+		ff := &model.RemoveUrlRequest{Url: utils.Ptr(f.Url), Whitelist: utils.Ptr(whitelist)}
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(ff), "/filtering/remove_url")
 		if err != nil {
 			return err
@@ -267,10 +253,13 @@ func (cl *client) DeleteFilters(whitelist bool, filters ...types.Filter) error {
 	return nil
 }
 
-func (cl *client) UpdateFilters(whitelist bool, filters ...types.Filter) error {
+func (cl *client) UpdateFilters(whitelist bool, filters ...model.Filter) error {
 	for _, f := range filters {
-		cl.log.With("url", f.URL, "whitelist", whitelist, "enabled", f.Enabled).Info("Update filter")
+		cl.log.With("url", f.Url, "whitelist", whitelist, "enabled", f.Enabled).Info("Update filter")
-		fu := &types.FilterUpdate{Whitelist: whitelist, URL: f.URL, Data: types.Filter{ID: f.ID, Name: f.Name, URL: f.URL, Whitelist: whitelist, Enabled: f.Enabled}}
+		fu := &model.FilterSetUrl{
+			Whitelist: utils.Ptr(whitelist), Url: utils.Ptr(f.Url),
+			Data: &model.FilterSetUrlData{Name: f.Name, Url: f.Url, Enabled: f.Enabled},
+		}
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(fu), "/filtering/set_url")
 		if err != nil {
 			return err
@@ -281,7 +270,7 @@ func (cl *client) UpdateFilters(whitelist bool, filters ...types.Filter) error {
 
 func (cl *client) RefreshFilters(whitelist bool) error {
 	cl.log.With("whitelist", whitelist).Info("Refresh filter")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.RefreshFilter{Whitelist: whitelist}), "/filtering/refresh")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(&model.FilterRefreshRequest{Whitelist: utils.Ptr(whitelist)}), "/filtering/refresh")
 }
 
 func (cl *client) ToggleProtection(enable bool) error {
@@ -289,41 +278,52 @@ func (cl *client) ToggleProtection(enable bool) error {
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.Protection{ProtectionEnabled: enable}), "/dns_config")
 }
 
-func (cl *client) SetCustomRules(rules types.UserRules) error {
+func (cl *client) SetCustomRules(rules *[]string) error {
-	cl.log.With("rules", len(rules)).Info("Set user rules")
+	cl.log.With("rules", len(*rules)).Info("Set user rules")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(rules.String()), "/filtering/set_rules")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(&model.SetRulesRequest{Rules: rules}), "/filtering/set_rules")
 }
 
-func (cl *client) ToggleFiltering(enabled bool, interval float64) error {
+func (cl *client) ToggleFiltering(enabled bool, interval int) error {
 	cl.log.With("enabled", enabled, "interval", interval).Info("Toggle filtering")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.FilteringConfig{
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(&model.FilterConfig{
-		EnableConfig:   types.EnableConfig{Enabled: enabled},
+		Enabled:  utils.Ptr(enabled),
-		IntervalConfig: types.IntervalConfig{Interval: interval},
+		Interval: utils.Ptr(interval),
 	}), "/filtering/config")
 }
 
-func (cl *client) Services() (types.Services, error) {
+func (cl *client) BlockedServices() (*model.BlockedServicesArray, error) {
-	svcs := types.Services{}
+	svcs := &model.BlockedServicesArray{}
-	err := cl.doGet(cl.client.R().EnableTrace().SetResult(&svcs), "/blocked_services/list")
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(svcs), "/blocked_services/list")
 	return svcs, err
 }
 
-func (cl *client) SetServices(services types.Services) error {
+func (cl *client) SetBlockedServices(services *model.BlockedServicesArray) error {
-	cl.log.With("services", len(services)).Info("Set services")
+	cl.log.With("services", model.ArrayString(services)).Info("Set blocked services")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(&services), "/blocked_services/set")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(services), "/blocked_services/set")
 }
 
-func (cl *client) Clients() (*types.Clients, error) {
+func (cl *client) BlockedServicesSchedule() (*model.BlockedServicesSchedule, error) {
-	clients := &types.Clients{}
+	sched := &model.BlockedServicesSchedule{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(sched), "/blocked_services/get")
+	return sched, err
+}
+
+func (cl *client) SetBlockedServicesSchedule(schedule *model.BlockedServicesSchedule) error {
+	cl.log.With("services", schedule.ServicesString()).Info("Set blocked services schedule")
+	return cl.doPut(cl.client.R().EnableTrace().SetBody(schedule), "/blocked_services/update")
+}
+
+func (cl *client) Clients() (*model.Clients, error) {
+	clients := &model.Clients{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(clients), "/clients")
 	return clients, err
 }
 
-func (cl *client) AddClients(clients ...types.Client) error {
+func (cl *client) AddClients(clients ...*model.Client) error {
 	for i := range clients {
 		client := clients[i]
-		cl.log.With("name", client.Name).Info("Add client")
+		cl.log.With("name", *client.Name).Info("Add client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&client), "/clients/add")
+		err := cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/add")
 		if err != nil {
 			return err
 		}
@@ -331,10 +331,10 @@ func (cl *client) AddClients(clients ...types.Client) error {
 	return nil
 }
 
-func (cl *client) UpdateClients(clients ...types.Client) error {
+func (cl *client) UpdateClients(clients ...*model.Client) error {
 	for _, client := range clients {
-		cl.log.With("name", client.Name).Info("Update client")
+		cl.log.With("name", *client.Name).Info("Update client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&types.ClientUpdate{Name: client.Name, Data: client}), "/clients/update")
+		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&model.ClientUpdate{Name: client.Name, Data: client}), "/clients/update")
 		if err != nil {
 			return err
 		}
@@ -342,11 +342,11 @@ func (cl *client) UpdateClients(clients ...types.Client) error {
 	return nil
 }
 
-func (cl *client) DeleteClients(clients ...types.Client) error {
+func (cl *client) DeleteClients(clients ...*model.Client) error {
 	for i := range clients {
 		client := clients[i]
-		cl.log.With("name", client.Name).Info("Delete client")
+		cl.log.With("name", *client.Name).Info("Delete client")
-		err := cl.doPost(cl.client.R().EnableTrace().SetBody(&client), "/clients/delete")
+		err := cl.doPost(cl.client.R().EnableTrace().SetBody(client), "/clients/delete")
 		if err != nil {
 			return err
 		}
@@ -354,30 +354,26 @@ func (cl *client) DeleteClients(clients ...types.Client) error {
 	return nil
 }
 
-func (cl *client) QueryLogConfig() (*types.QueryLogConfig, error) {
+func (cl *client) QueryLogConfig() (*model.QueryLogConfig, error) {
-	qlc := &types.QueryLogConfig{}
+	qlc := &model.QueryLogConfig{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(qlc), "/querylog_info")
 	return qlc, err
 }
 
-func (cl *client) SetQueryLogConfig(enabled bool, interval float64, anonymizeClientIP bool) error {
+func (cl *client) SetQueryLogConfig(qlc *model.QueryLogConfig) error {
-	cl.log.With("enabled", enabled, "interval", interval, "anonymizeClientIP", anonymizeClientIP).Info("Set query log config")
+	cl.log.With("enabled", *qlc.Enabled, "interval", *qlc.Interval, "anonymizeClientIP", *qlc.AnonymizeClientIp).Info("Set query log config")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.QueryLogConfig{
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(qlc), "/querylog_config")
-		EnableConfig:      types.EnableConfig{Enabled: enabled},
-		IntervalConfig:    types.IntervalConfig{Interval: interval},
-		AnonymizeClientIP: anonymizeClientIP,
-	}), "/querylog_config")
 }
 
-func (cl *client) StatsConfig() (*types.IntervalConfig, error) {
+func (cl *client) StatsConfig() (*model.StatsConfig, error) {
-	stats := &types.IntervalConfig{}
+	stats := &model.StatsConfig{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(stats), "/stats_info")
 	return stats, err
 }
 
-func (cl *client) SetStatsConfig(interval float64) error {
+func (cl *client) SetStatsConfig(sc *model.StatsConfig) error {
-	cl.log.With("interval", interval).Info("Set stats config")
+	cl.log.With("interval", *sc.Interval).Info("Set stats config")
-	return cl.doPost(cl.client.R().EnableTrace().SetBody(&types.IntervalConfig{Interval: interval}), "/stats_config")
+	return cl.doPost(cl.client.R().EnableTrace().SetBody(sc), "/stats_config")
 }
 
 func (cl *client) Setup() error {
@@ -406,42 +402,42 @@ func (cl *client) Setup() error {
 	return cl.doPost(req, "/install/configure")
 }
 
-func (cl *client) AccessList() (*types.AccessList, error) {
+func (cl *client) AccessList() (*model.AccessList, error) {
-	al := &types.AccessList{}
+	al := &model.AccessList{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(al), "/access/list")
 	return al, err
 }
 
-func (cl *client) SetAccessList(list *types.AccessList) error {
+func (cl *client) SetAccessList(list *model.AccessList) error {
 	cl.log.Info("Set access list")
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(list), "/access/set")
 }
 
-func (cl *client) DNSConfig() (*types.DNSConfig, error) {
+func (cl *client) DNSConfig() (*model.DNSConfig, error) {
-	cfg := &types.DNSConfig{}
+	cfg := &model.DNSConfig{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(cfg), "/dns_info")
 	return cfg, err
 }
 
-func (cl *client) SetDNSConfig(config *types.DNSConfig) error {
+func (cl *client) SetDNSConfig(config *model.DNSConfig) error {
 	cl.log.Info("Set dns config list")
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(config), "/dns_config")
 }
 
-func (cl *client) DHCPServerConfig() (*types.DHCPServerConfig, error) {
+func (cl *client) DhcpConfig() (*model.DhcpStatus, error) {
-	cfg := &types.DHCPServerConfig{}
+	cfg := &model.DhcpStatus{}
 	err := cl.doGet(cl.client.R().EnableTrace().SetResult(cfg), "/dhcp/status")
 	return cfg, err
 }
 
-func (cl *client) SetDHCPServerConfig(config *types.DHCPServerConfig) error {
+func (cl *client) SetDhcpConfig(config *model.DhcpStatus) error {
 	cl.log.Info("Set dhcp server config")
 	return cl.doPost(cl.client.R().EnableTrace().SetBody(config), "/dhcp/set_config")
 }
 
-func (cl *client) AddDHCPStaticLeases(leases ...types.Lease) error {
+func (cl *client) AddDHCPStaticLeases(leases ...model.DhcpStaticLease) error {
 	for _, l := range leases {
-		cl.log.With("mac", l.HWAddr, "ip", l.IP, "hostname", l.Hostname).Info("Add static dhcp lease")
+		cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Add static dhcp lease")
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/add_static_lease")
 		if err != nil {
 			return err
@@ -450,9 +446,9 @@ func (cl *client) AddDHCPStaticLeases(leases ...types.Lease) error {
 	return nil
 }
 
-func (cl *client) DeleteDHCPStaticLeases(leases ...types.Lease) error {
+func (cl *client) DeleteDHCPStaticLeases(leases ...model.DhcpStaticLease) error {
 	for _, l := range leases {
-		cl.log.With("mac", l.HWAddr, "ip", l.IP, "hostname", l.Hostname).Info("Delete static dhcp lease")
+		cl.log.With("mac", l.Mac, "ip", l.Ip, "hostname", l.Hostname).Info("Delete static dhcp lease")
 		err := cl.doPost(cl.client.R().EnableTrace().SetBody(l), "/dhcp/remove_static_lease")
 		if err != nil {
 			return err
@@ -460,3 +456,25 @@ func (cl *client) DeleteDHCPStaticLeases(leases ...types.Lease) error {
 	}
 	return nil
 }
+
+func (cl *client) SafeSearchConfig() (*model.SafeSearchConfig, error) {
+	sss := &model.SafeSearchConfig{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(sss), "/safesearch/status")
+	return sss, err
+}
+
+func (cl *client) SetSafeSearchConfig(settings *model.SafeSearchConfig) error {
+	cl.log.With("enabled", *settings.Enabled).Info("Set safesearch settings")
+	return cl.doPut(cl.client.R().EnableTrace().SetBody(settings), "/safesearch/settings")
+}
+
+func (cl *client) ProfileInfo() (*model.ProfileInfo, error) {
+	p := &model.ProfileInfo{}
+	err := cl.doGet(cl.client.R().EnableTrace().SetResult(p), "/profile")
+	return p, err
+}
+
+func (cl *client) SetProfileInfo(profile *model.ProfileInfo) error {
+	cl.log.With("language", profile.Language, "theme", profile.Theme).Info("Set profile")
+	return cl.doPut(cl.client.R().EnableTrace().SetBody(profile), "/profile/update")
+}

pkg/client/client_test.go

@@ -2,13 +2,16 @@ package client_test
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 
 	"github.com/bakito/adguardhome-sync/pkg/client"
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
 	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -38,13 +41,13 @@ var _ = Describe("Client", func() {
 		})
 	})
 
-	Context("Filtering", func() {
+	Context("Filter", func() {
-		It("should read filtering status", func() {
+		It("should read filter status", func() {
 			ts, cl = ClientGet("filtering-status.json", "/filtering/status")
 			fs, err := cl.Filtering()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(fs.Enabled).Should(BeTrue())
+			Ω(*fs.Enabled).Should(BeTrue())
-			Ω(fs.Filters).Should(HaveLen(2))
+			Ω(*fs.Filters).Should(HaveLen(2))
 		})
 		It("should enable protection", func() {
 			ts, cl = ClientPost("/filtering/config", `{"enabled":true,"interval":123}`)
@@ -63,35 +66,26 @@ var _ = Describe("Client", func() {
 		})
 		It("should add Filters", func() {
 			ts, cl = ClientPost("/filtering/add_url",
-				`{"id":0,"enabled":false,"url":"foo","name":"","rules_count":0,"whitelist":true}`,
+				`{"name":"","url":"foo","whitelist":true}`,
-				`{"id":0,"enabled":false,"url":"bar","name":"","rules_count":0,"whitelist":true}`,
+				`{"name":"","url":"bar","whitelist":true}`,
 			)
-			err := cl.AddFilters(true, types.Filter{URL: "foo"}, types.Filter{URL: "bar"})
+			err := cl.AddFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should update Filters", func() {
 			ts, cl = ClientPost("/filtering/set_url",
-				`{"url":"foo","data":{"id":0,"enabled":false,"url":"foo","name":"","rules_count":0,"whitelist":true},"whitelist":true}`,
+				`{"data":{"enabled":false,"name":"","url":"foo"},"url":"foo","whitelist":true}`,
-				`{"url":"bar","data":{"id":0,"enabled":false,"url":"bar","name":"","rules_count":0,"whitelist":true},"whitelist":true}`,
+				`{"data":{"enabled":false,"name":"","url":"bar"},"url":"bar","whitelist":true}`,
 			)
-			err := cl.UpdateFilters(true, types.Filter{URL: "foo"}, types.Filter{URL: "bar"})
+			err := cl.UpdateFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should delete Filters", func() {
 			ts, cl = ClientPost("/filtering/remove_url",
-				`{"id":0,"enabled":false,"url":"foo","name":"","rules_count":0,"whitelist":true}`,
+				`{"url":"foo","whitelist":true}`,
-				`{"id":0,"enabled":false,"url":"bar","name":"","rules_count":0,"whitelist":true}`,
+				`{"url":"bar","whitelist":true}`,
 			)
-			err := cl.DeleteFilters(true, types.Filter{URL: "foo"}, types.Filter{URL: "bar"})
+			err := cl.DeleteFilters(true, model.Filter{Url: "foo"}, model.Filter{Url: "bar"})
-			Ω(err).ShouldNot(HaveOccurred())
-		})
-	})
-
-	Context("CustomRules", func() {
-		It("should set SetCustomRules", func() {
-			ts, cl = ClientPost("/filtering/set_rules", `foo
-bar`)
-			err := cl.SetCustomRules([]string{"foo", "bar"})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -101,8 +95,8 @@ bar`)
 			ts, cl = ClientGet("status.json", "/status")
 			fs, err := cl.Status()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(fs.DNSAddresses).Should(HaveLen(1))
+			Ω(fs.DnsAddresses).Should(HaveLen(1))
-			Ω(fs.DNSAddresses[0]).Should(Equal("192.168.1.2"))
+			Ω(fs.DnsAddresses[0]).Should(Equal("192.168.1.2"))
 			Ω(fs.Version).Should(Equal("v0.105.2"))
 		})
 		It("should return ErrSetupNeeded", func() {
@@ -134,13 +128,19 @@ bar`)
 			Ω(*rwl).Should(HaveLen(2))
 		})
 		It("should add RewriteList", func() {
-			ts, cl = ClientPost("/rewrite/add", `{"domain":"foo","answer":"foo"}`, `{"domain":"bar","answer":"bar"}`)
+			ts, cl = ClientPost("/rewrite/add", `{"answer":"foo","domain":"foo"}`, `{"answer":"bar","domain":"bar"}`)
-			err := cl.AddRewriteEntries(types.RewriteEntry{Answer: "foo", Domain: "foo"}, types.RewriteEntry{Answer: "bar", Domain: "bar"})
+			err := cl.AddRewriteEntries(
+				model.RewriteEntry{Answer: utils.Ptr("foo"), Domain: utils.Ptr("foo")},
+				model.RewriteEntry{Answer: utils.Ptr("bar"), Domain: utils.Ptr("bar")},
+			)
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should delete RewriteList", func() {
-			ts, cl = ClientPost("/rewrite/delete", `{"domain":"foo","answer":"foo"}`, `{"domain":"bar","answer":"bar"}`)
+			ts, cl = ClientPost("/rewrite/delete", `{"answer":"foo","domain":"foo"}`, `{"answer":"bar","domain":"bar"}`)
-			err := cl.DeleteRewriteEntries(types.RewriteEntry{Answer: "foo", Domain: "foo"}, types.RewriteEntry{Answer: "bar", Domain: "bar"})
+			err := cl.DeleteRewriteEntries(
+				model.RewriteEntry{Answer: utils.Ptr("foo"), Domain: utils.Ptr("foo")},
+				model.RewriteEntry{Answer: utils.Ptr("bar"), Domain: utils.Ptr("bar")},
+			)
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -164,21 +164,22 @@ bar`)
 		})
 	})
 
-	Context("SafeSearch", func() {
+	Context("SafeSearchConfig", func() {
 		It("should read safesearch status", func() {
 			ts, cl = ClientGet("safesearch-status.json", "/safesearch/status")
-			ss, err := cl.SafeSearch()
+			ss, err := cl.SafeSearchConfig()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(ss).Should(BeTrue())
+			Ω(ss.Enabled).ShouldNot(BeNil())
+			Ω(*ss.Enabled).Should(BeTrue())
 		})
 		It("should enable safesearch", func() {
-			ts, cl = ClientPost("/safesearch/enable", "")
+			ts, cl = ClientPut("/safesearch/settings", `{"enabled":true}`)
-			err := cl.ToggleSafeSearch(true)
+			err := cl.SetSafeSearchConfig(&model.SafeSearchConfig{Enabled: utils.Ptr(true)})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should disable safesearch", func() {
-			ts, cl = ClientPost("/safesearch/disable", "")
+			ts, cl = ClientPut("/safesearch/settings", `{"enabled":false}`)
-			err := cl.ToggleSafeSearch(false)
+			err := cl.SetSafeSearchConfig(&model.SafeSearchConfig{Enabled: utils.Ptr(false)})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -215,16 +216,39 @@ bar`)
 		})
 	})
 
-	Context("Services", func() {
+	Context("BlockedServices", func() {
-		It("should read Services", func() {
+		It("should read BlockedServices", func() {
 			ts, cl = ClientGet("blockedservices-list.json", "/blocked_services/list")
-			s, err := cl.Services()
+			s, err := cl.BlockedServices()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(s).Should(HaveLen(2))
+			Ω(*s).Should(HaveLen(2))
 		})
-		It("should set Services", func() {
+		It("should set BlockedServices", func() {
-			ts, cl = ClientPost("/blocked_services/set", `["foo","bar"]`)
+			ts, cl = ClientPost("/blocked_services/set", `["bar","foo"]`)
-			err := cl.SetServices([]string{"foo", "bar"})
+			err := cl.SetBlockedServices(&model.BlockedServicesArray{"foo", "bar"})
+			Ω(err).ShouldNot(HaveOccurred())
+		})
+	})
+
+	Context("BlockedServicesSchedule", func() {
+		It("should read BlockedServicesSchedule", func() {
+			ts, cl = ClientGet("blockedservicesschedule-get.json", "/blocked_services/get")
+			s, err := cl.BlockedServicesSchedule()
+			Ω(err).ShouldNot(HaveOccurred())
+			Ω(*s.Ids).Should(HaveLen(3))
+		})
+		It("should set BlockedServicesSchedule", func() {
+			ts, cl = ClientPost("/blocked_services/update",
+				`{"ids":["bar","foo"],"schedule":{"mon":{"end":99,"start":1}}}`)
+			err := cl.SetBlockedServicesSchedule(&model.BlockedServicesSchedule{
+				Ids: utils.Ptr([]string{"foo", "bar"}),
+				Schedule: &model.Schedule{
+					Mon: &model.DayRange{
+						Start: utils.Ptr(float32(1.0)),
+						End:   utils.Ptr(float32(99.0)),
+					},
+				},
+			})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -234,27 +258,27 @@ bar`)
 			ts, cl = ClientGet("clients.json", "/clients")
 			c, err := cl.Clients()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(c.Clients).Should(HaveLen(2))
+			Ω(*c.Clients).Should(HaveLen(2))
 		})
 		It("should add Clients", func() {
 			ts, cl = ClientPost("/clients/add",
-				`{"ids":["id"],"use_global_settings":false,"use_global_blocked_services":false,"name":"foo","filtering_enabled":false,"parental_enabled":false,"safesearch_enabled":false,"safebrowsing_enabled":false,"disallowed":false,"disallowed_rule":""}`,
+				`{"ids":["id"],"name":"foo"}`,
 			)
-			err := cl.AddClients(types.Client{Name: "foo", Ids: []string{"id"}})
+			err := cl.AddClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should update Clients", func() {
 			ts, cl = ClientPost("/clients/update",
-				`{"name":"foo","data":{"ids":["id"],"use_global_settings":false,"use_global_blocked_services":false,"name":"foo","filtering_enabled":false,"parental_enabled":false,"safesearch_enabled":false,"safebrowsing_enabled":false,"disallowed":false,"disallowed_rule":""}}`,
+				`{"data":{"ids":["id"],"name":"foo"},"name":"foo"}`,
 			)
-			err := cl.UpdateClients(types.Client{Name: "foo", Ids: []string{"id"}})
+			err := cl.UpdateClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 		It("should delete Clients", func() {
 			ts, cl = ClientPost("/clients/delete",
-				`{"ids":["id"],"use_global_settings":false,"use_global_blocked_services":false,"name":"foo","filtering_enabled":false,"parental_enabled":false,"safesearch_enabled":false,"safebrowsing_enabled":false,"disallowed":false,"disallowed_rule":""}`,
+				`{"ids":["id"],"name":"foo"}`,
 			)
-			err := cl.DeleteClients(types.Client{Name: "foo", Ids: []string{"id"}})
+			err := cl.DeleteClients(&model.Client{Name: utils.Ptr("foo"), Ids: utils.Ptr([]string{"id"})})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -264,12 +288,16 @@ bar`)
 			ts, cl = ClientGet("querylog_info.json", "/querylog_info")
 			qlc, err := cl.QueryLogConfig()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(qlc.Enabled).Should(BeTrue())
+			Ω(qlc.Enabled).ShouldNot(BeNil())
-			Ω(qlc.Interval).Should(Equal(90.0))
+			Ω(*qlc.Enabled).Should(BeTrue())
+			Ω(qlc.Interval).ShouldNot(BeNil())
+			Ω(*qlc.Interval).Should(Equal(model.QueryLogConfigInterval(90)))
 		})
 		It("should set QueryLogConfig", func() {
-			ts, cl = ClientPost("/querylog_config", `{"enabled":true,"interval":123,"anonymize_client_ip":true}`)
+			ts, cl = ClientPost("/querylog_config", `{"anonymize_client_ip":true,"enabled":true,"interval":123}`)
-			err := cl.SetQueryLogConfig(true, 123, true)
+
+			var interval model.QueryLogConfigInterval = 123
+			err := cl.SetQueryLogConfig(&model.QueryLogConfig{AnonymizeClientIp: utils.Ptr(true), Interval: &interval, Enabled: utils.Ptr(true)})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -278,11 +306,14 @@ bar`)
 			ts, cl = ClientGet("stats_info.json", "/stats_info")
 			sc, err := cl.StatsConfig()
 			Ω(err).ShouldNot(HaveOccurred())
-			Ω(sc.Interval).Should(Equal(1.0))
+			Ω(sc.Interval).ShouldNot(BeNil())
+			Ω(*sc.Interval).Should(Equal(model.StatsConfigInterval(1)))
 		})
 		It("should set StatsConfig", func() {
 			ts, cl = ClientPost("/stats_config", `{"interval":123}`)
-			err := cl.SetStatsConfig(123.0)
+
+			var interval model.StatsConfigInterval = 123
+			err := cl.SetStatsConfig(&model.StatsConfig{Interval: &interval})
 			Ω(err).ShouldNot(HaveOccurred())
 		})
 	})
@@ -307,7 +338,8 @@ bar`)
 
 		Context("doPost", func() {
 			It("should return an error on status code != 200", func() {
-				err := cl.SetStatsConfig(123)
+				var interval model.StatsConfigInterval = 123
+				err := cl.SetStatsConfig(&model.StatsConfig{Interval: &interval})
 				Ω(err).Should(HaveOccurred())
 				Ω(err.Error()).Should(Equal("401 Unauthorized"))
 			})
@@ -318,7 +350,7 @@ bar`)
 func ClientGet(file string, path string) (*httptest.Server, client.Client) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		Ω(r.URL.Path).Should(Equal(types.DefaultAPIPath + path))
-		b, err := ioutil.ReadFile(filepath.Join("../../testdata", file))
+		b, err := os.ReadFile(filepath.Join("../../testdata", file))
 		Ω(err).ShouldNot(HaveOccurred())
 		w.Header().Set("Content-Type", "application/json")
 		_, err = w.Write(b)
@@ -333,7 +365,22 @@ func ClientPost(path string, content ...string) (*httptest.Server, client.Client
 	index := 0
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		Ω(r.URL.Path).Should(Equal(types.DefaultAPIPath + path))
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
+		Ω(err).ShouldNot(HaveOccurred())
+		Ω(body).Should(Equal([]byte(content[index])))
+		index++
+	}))
+
+	cl, err := client.New(types.AdGuardInstance{URL: ts.URL, Username: username, Password: password})
+	Ω(err).ShouldNot(HaveOccurred())
+	return ts, cl
+}
+
+func ClientPut(path string, content ...string) (*httptest.Server, client.Client) {
+	index := 0
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		Ω(r.URL.Path).Should(Equal(types.DefaultAPIPath + path))
+		body, err := io.ReadAll(r.Body)
 		Ω(err).ShouldNot(HaveOccurred())
 		Ω(body).Should(Equal([]byte(content[index])))
 		index++

pkg/client/model/client/client.go

@@ -0,0 +1,144 @@
+package client
+
+import (
+	"context"
+	"crypto/tls"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"path"
+
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/pkg/log"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"go.uber.org/zap"
+)
+
+var l = log.GetLogger("client")
+
+// New create a new api client
+func New(config types.AdGuardInstance) (Client, error) {
+	var apiURL string
+	if config.APIPath == "" {
+		apiURL = fmt.Sprintf("%s/control", config.URL)
+	} else {
+		apiURL = fmt.Sprintf("%s/%s", config.URL, config.APIPath)
+	}
+	u, err := url.Parse(apiURL)
+	if err != nil {
+		return nil, err
+	}
+	u.Path = path.Clean(u.Path)
+
+	httpClient := &http.Client{}
+	if config.InsecureSkipVerify {
+		// #nosec G402 has to be explicitly enabled
+		httpClient.Transport = &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
+	}
+
+	aghClient, err := model.NewClient(u.String(), func(client *model.AdguardHomeClient) error {
+		client.Client = httpClient
+		client.RequestEditors = append(client.RequestEditors, func(ctx context.Context, req *http.Request) error {
+			if config.Username != "" && config.Password != "" {
+				req.Header.Add("Authorization", "Basic "+basicAuth(config.Username, config.Password))
+			}
+			return nil
+		})
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &apiClient{
+		host:   u.Host,
+		client: aghClient,
+		log:    l.With("host", u.Host),
+	}, nil
+}
+
+func basicAuth(username, password string) string {
+	auth := username + ":" + password
+	return base64.StdEncoding.EncodeToString([]byte(auth))
+}
+
+type apiClient struct {
+	host   string
+	client *model.AdguardHomeClient
+	log    *zap.SugaredLogger
+}
+
+func (a apiClient) Host(context.Context) string {
+	return a.host
+}
+
+func (a apiClient) GetServerStatus(ctx context.Context) (*model.ServerStatus, error) {
+	sr, err := read(ctx, a.client.Status, model.ParseStatusResp)
+	if err != nil {
+		return nil, err
+	}
+	return sr.JSON200, nil
+}
+
+func (a apiClient) GetFilteringStatus(ctx context.Context) (*model.FilterStatus, error) {
+	sr, err := read(ctx, a.client.FilteringStatus, model.ParseFilteringStatusResp)
+	if err != nil {
+		return nil, err
+	}
+	return sr.JSON200, nil
+}
+
+func (a apiClient) SetFilteringConfig(ctx context.Context, config model.FilterConfig) error {
+	return write(ctx, config, a.client.FilteringConfig)
+}
+
+func write[B interface{}](
+	ctx context.Context,
+	body B,
+	req func(ctx context.Context, body B, reqEditors ...model.RequestEditorFn) (*http.Response, error),
+) error {
+	resp, err := req(ctx, body)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return detailedError(resp)
+	}
+	return nil
+}
+
+func read[I interface{}](
+	ctx context.Context,
+	req func(ctx context.Context, reqEditors ...model.RequestEditorFn) (*http.Response, error),
+	parse func(rsp *http.Response) (*I, error),
+) (*I, error) {
+	resp, err := req(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return nil, detailedError(resp)
+	}
+	return parse(resp)
+}
+
+func detailedError(resp *http.Response) error {
+	e := resp.Status
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	if len(body) > 0 {
+		e += fmt.Sprintf("(%s)", string(body))
+	}
+	return errors.New(e)
+}

pkg/client/model/client/interface.go

@@ -0,0 +1,15 @@
+package client
+
+import (
+	"context"
+
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+)
+
+type Client interface {
+	Host(ctx context.Context) string
+	GetServerStatus(ctx context.Context) (*model.ServerStatus, error)
+
+	GetFilteringStatus(ctx context.Context) (*model.FilterStatus, error)
+	SetFilteringConfig(ctx context.Context, config model.FilterConfig) error
+}

pkg/client/model/client/resty.go

@@ -0,0 +1,27 @@
+package client
+
+import (
+	"net/http"
+
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/go-resty/resty/v2"
+)
+
+var _ model.HttpRequestDoer = &adapter{}
+
+func RestyAdapter(r *resty.Client) model.HttpRequestDoer {
+	return &adapter{
+		client: r,
+	}
+}
+
+type adapter struct {
+	client *resty.Client
+}
+
+func (a adapter) Do(req *http.Request) (*http.Response, error) {
+	r, err := a.client.R().
+		SetHeaderMultiValues(req.Header).
+		Execute(req.Method, req.URL.String())
+	return r.RawResponse, err
+}

pkg/client/model/model-functions.go

@@ -0,0 +1,388 @@
+package model
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/jinzhu/copier"
+)
+
+// Clone the config
+func (c *DhcpStatus) Clone() *DhcpStatus {
+	clone := &DhcpStatus{}
+	_ = copier.Copy(clone, c)
+	return clone
+}
+
+// Equals dhcp server config equal check
+func (c *DhcpStatus) Equals(o *DhcpStatus) bool {
+	return utils.JsonEquals(c, o)
+}
+
+func (c *DhcpStatus) HasConfig() bool {
+	return (c.V4 != nil && c.V4.isValid()) || (c.V6 != nil && c.V6.isValid())
+}
+
+func (j DhcpConfigV4) isValid() bool {
+	return j.GatewayIp != nil && j.SubnetMask != nil && j.RangeStart != nil && j.RangeEnd != nil
+}
+
+func (j DhcpConfigV6) isValid() bool {
+	return j.RangeStart != nil
+}
+
+type DhcpStaticLeases []DhcpStaticLease
+
+// MergeDhcpStaticLeases the leases
+func MergeDhcpStaticLeases(l *[]DhcpStaticLease, other *[]DhcpStaticLease) (DhcpStaticLeases, DhcpStaticLeases) {
+	var thisLeases []DhcpStaticLease
+	var otherLeases []DhcpStaticLease
+
+	if l != nil {
+		thisLeases = *l
+	}
+	if other != nil {
+		otherLeases = *other
+	}
+	current := make(map[string]DhcpStaticLease)
+
+	var adds DhcpStaticLeases
+	var removes DhcpStaticLeases
+	for _, le := range thisLeases {
+		current[le.Mac] = le
+	}
+
+	for _, le := range otherLeases {
+		if _, ok := current[le.Mac]; ok {
+			delete(current, le.Mac)
+		} else {
+			adds = append(adds, le)
+		}
+	}
+
+	for _, rr := range current {
+		removes = append(removes, rr)
+	}
+
+	return adds, removes
+}
+
+// Equals dns config equal check
+func (c *DNSConfig) Equals(o *DNSConfig) bool {
+	cc := c.Clone()
+	oo := o.Clone()
+	cc.Sort()
+	oo.Sort()
+
+	return utils.JsonEquals(cc, oo)
+}
+
+func (c *DNSConfig) Clone() *DNSConfig {
+	return utils.Clone(c, &DNSConfig{})
+}
+
+// Sort sort dns config
+func (c *DNSConfig) Sort() {
+	if c.UpstreamDns != nil {
+		sort.Strings(*c.UpstreamDns)
+	}
+
+	if c.UpstreamDns != nil {
+		sort.Strings(*c.BootstrapDns)
+	}
+
+	if c.UpstreamDns != nil {
+		sort.Strings(*c.LocalPtrUpstreams)
+	}
+}
+
+// Equals access list equal check
+func (al *AccessList) Equals(o *AccessList) bool {
+	return EqualsStringSlice(al.AllowedClients, o.AllowedClients, true) &&
+		EqualsStringSlice(al.DisallowedClients, o.DisallowedClients, true) &&
+		EqualsStringSlice(al.BlockedHosts, o.BlockedHosts, true)
+}
+
+func EqualsStringSlice(a *[]string, b *[]string, sortIt bool) bool {
+	if a == nil && b == nil {
+		return true
+	}
+
+	if a == nil || b == nil {
+		return false
+	}
+
+	aa := *a
+	bb := *b
+	if sortIt {
+		sort.Strings(aa)
+		sort.Strings(bb)
+	}
+	if len(aa) != len(bb) {
+		return false
+	}
+	for i, v := range aa {
+		if v != bb[i] {
+			return false
+		}
+	}
+	return true
+}
+
+// Sort clients
+func (cl *Client) Sort() {
+	if cl.Ids != nil {
+		sort.Strings(*cl.Ids)
+	}
+	if cl.Tags != nil {
+		sort.Strings(*cl.Tags)
+	}
+	if cl.BlockedServices != nil {
+		sort.Strings(*cl.BlockedServices)
+	}
+	if cl.Upstreams != nil {
+		sort.Strings(*cl.Upstreams)
+	}
+}
+
+// Equals Clients equal check
+func (cl *Client) Equals(o *Client) bool {
+	cl.Sort()
+	o.Sort()
+
+	return utils.JsonEquals(cl, o)
+}
+
+// Add ac client
+func (clients *Clients) Add(cl Client) {
+	if clients.Clients == nil {
+		clients.Clients = &ClientsArray{cl}
+	} else {
+		a := append(*clients.Clients, cl)
+		clients.Clients = &a
+	}
+}
+
+// Merge merge Clients
+func (clients *Clients) Merge(other *Clients) ([]*Client, []*Client, []*Client) {
+	current := make(map[string]*Client)
+	if clients.Clients != nil {
+		cc := *clients.Clients
+		for i := range cc {
+			client := cc[i]
+			current[*client.Name] = &client
+		}
+	}
+
+	expected := make(map[string]*Client)
+	if other.Clients != nil {
+		oc := *other.Clients
+		for i := range oc {
+			client := oc[i]
+			expected[*client.Name] = &client
+		}
+	}
+
+	var adds []*Client
+	var removes []*Client
+	var updates []*Client
+
+	for _, cl := range expected {
+		if oc, ok := current[*cl.Name]; ok {
+			if !cl.Equals(oc) {
+				updates = append(updates, cl)
+			}
+			delete(current, *cl.Name)
+		} else {
+			adds = append(adds, cl)
+		}
+	}
+
+	for _, rr := range current {
+		removes = append(removes, rr)
+	}
+
+	return adds, updates, removes
+}
+
+// Key RewriteEntry key
+func (re *RewriteEntry) Key() string {
+	var d string
+	var a string
+	if re.Domain != nil {
+		d = *re.Domain
+	}
+	if re.Answer != nil {
+		a = *re.Answer
+	}
+	return fmt.Sprintf("%s#%s", d, a)
+}
+
+// RewriteEntries list of RewriteEntry
+type RewriteEntries []RewriteEntry
+
+// Merge RewriteEntries
+func (rwe *RewriteEntries) Merge(other *RewriteEntries) (RewriteEntries, RewriteEntries, RewriteEntries) {
+	current := make(map[string]RewriteEntry)
+
+	var adds RewriteEntries
+	var removes RewriteEntries
+	var duplicates RewriteEntries
+	processed := make(map[string]bool)
+	for _, rr := range *rwe {
+		if _, ok := processed[rr.Key()]; !ok {
+			current[rr.Key()] = rr
+			processed[rr.Key()] = true
+		} else {
+			// remove duplicate
+			removes = append(removes, rr)
+		}
+	}
+
+	for _, rr := range *other {
+		if _, ok := current[rr.Key()]; ok {
+			delete(current, rr.Key())
+		} else {
+			if _, ok := processed[rr.Key()]; !ok {
+				adds = append(adds, rr)
+				processed[rr.Key()] = true
+			} else {
+				//	skip duplicate
+				duplicates = append(duplicates, rr)
+			}
+		}
+	}
+
+	for _, rr := range current {
+		removes = append(removes, rr)
+	}
+
+	return adds, removes, duplicates
+}
+
+func MergeFilters(this *[]Filter, other *[]Filter) ([]Filter, []Filter, []Filter) {
+	if this == nil && other == nil {
+		return nil, nil, nil
+	}
+
+	current := make(map[string]*Filter)
+
+	var adds []Filter
+	var updates []Filter
+	var removes []Filter
+	if this != nil {
+		for i := range *this {
+			fi := (*this)[i]
+			current[fi.Url] = &fi
+		}
+	}
+
+	if other != nil {
+		for i := range *other {
+			rr := (*other)[i]
+			if c, ok := current[rr.Url]; ok {
+				if !c.Equals(&rr) {
+					updates = append(updates, rr)
+				}
+				delete(current, rr.Url)
+			} else {
+				adds = append(adds, rr)
+			}
+		}
+	}
+
+	for _, rr := range current {
+		removes = append(removes, *rr)
+	}
+
+	return adds, updates, removes
+}
+
+// Equals Filter equal check
+func (f *Filter) Equals(o *Filter) bool {
+	return f.Enabled == o.Enabled && f.Url == o.Url && f.Name == o.Name
+}
+
+// Equals QueryLogConfig equal check
+func (qlc *QueryLogConfig) Equals(o *QueryLogConfig) bool {
+	return ptrEquals(qlc.Enabled, o.Enabled) &&
+		ptrEquals(qlc.AnonymizeClientIp, o.AnonymizeClientIp) &&
+		qlc.Interval.Equals(o.Interval)
+}
+
+// Equals QueryLogConfigInterval equal check
+func (qlc *QueryLogConfigInterval) Equals(o *QueryLogConfigInterval) bool {
+	return ptrEquals(qlc, o)
+}
+
+func ptrEquals[T comparable](a *T, b *T) bool {
+	if a == nil && b == nil {
+		return true
+	}
+	var aa T
+	if a != nil {
+		aa = *a
+	}
+	var bb T
+	if b != nil {
+		bb = *b
+	}
+
+	return aa == bb
+}
+
+// EnableConfig API struct
+type EnableConfig struct {
+	Enabled bool `json:"enabled"`
+}
+
+func (ssc *SafeSearchConfig) Equals(o *SafeSearchConfig) bool {
+	return ptrEquals(ssc.Enabled, o.Enabled) &&
+		ptrEquals(ssc.Bing, o.Bing) &&
+		ptrEquals(ssc.Duckduckgo, o.Duckduckgo) &&
+		ptrEquals(ssc.Google, o.Google) &&
+		ptrEquals(ssc.Pixabay, o.Pixabay) &&
+		ptrEquals(ssc.Yandex, o.Yandex) &&
+		ptrEquals(ssc.Youtube, o.Youtube)
+}
+
+func (pi *ProfileInfo) Equals(o *ProfileInfo) bool {
+	return pi.Language == o.Language &&
+		pi.Theme == o.Theme
+}
+
+func (pi *ProfileInfo) ShouldSyncFor(o *ProfileInfo) *ProfileInfo {
+	if pi.Equals(o) {
+		return nil
+	}
+	merged := &ProfileInfo{Name: pi.Name, Language: pi.Language, Theme: pi.Theme}
+	if o.Language != "" {
+		merged.Language = o.Language
+	}
+	if o.Theme != "" {
+		merged.Theme = o.Theme
+	}
+	if merged.Name == "" || merged.Language == "" || merged.Theme == "" || merged.Equals(pi) {
+		return nil
+	}
+	return merged
+}
+
+func (bss *BlockedServicesSchedule) Equals(o *BlockedServicesSchedule) bool {
+	return utils.JsonEquals(bss, o)
+}
+
+func (bss *BlockedServicesSchedule) ServicesString() string {
+	return ArrayString(bss.Ids)
+}
+
+func ArrayString(a *[]string) string {
+	if a == nil {
+		return "[]"
+	}
+	sorted := *a
+	sort.Strings(sorted)
+	return fmt.Sprintf("[%s]", strings.Join(sorted, ","))
+}

pkg/client/model/model_suite_test.go

@@ -0,0 +1,13 @@
+package model_test
+
+import (
+	"testing"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+func TestTypes(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Model Suite")
+}

pkg/client/model/model_test.go

@@ -0,0 +1,430 @@
+package model_test
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
+	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/google/uuid"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Types", func() {
+	var (
+		url     string
+		apiPath string
+	)
+	BeforeEach(func() {
+		url = "https://" + uuid.NewString()
+		apiPath = "/" + uuid.NewString()
+	})
+
+	Context("FilteringStatus", func() {
+		It("should correctly parse json", func() {
+			b, err := os.ReadFile("../../../testdata/filtering-status.json")
+			fs := &model.FilterStatus{}
+			Ω(err).ShouldNot(HaveOccurred())
+			err = json.Unmarshal(b, fs)
+			Ω(err).ShouldNot(HaveOccurred())
+		})
+	})
+
+	Context("Filters", func() {
+		Context("Merge", func() {
+			var (
+				originFilters  []model.Filter
+				replicaFilters []model.Filter
+			)
+			BeforeEach(func() {
+				originFilters = []model.Filter{}
+				replicaFilters = []model.Filter{}
+			})
+
+			It("should add a missing filter", func() {
+				originFilters = append(originFilters, model.Filter{Url: url})
+				a, u, d := model.MergeFilters(&replicaFilters, &originFilters)
+				Ω(a).Should(HaveLen(1))
+				Ω(u).Should(BeEmpty())
+				Ω(d).Should(BeEmpty())
+
+				Ω(a[0].Url).Should(Equal(url))
+			})
+
+			It("should remove additional filter", func() {
+				replicaFilters = append(replicaFilters, model.Filter{Url: url})
+				a, u, d := model.MergeFilters(&replicaFilters, &originFilters)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(BeEmpty())
+				Ω(d).Should(HaveLen(1))
+
+				Ω(d[0].Url).Should(Equal(url))
+			})
+
+			It("should update existing filter when enabled differs", func() {
+				enabled := true
+				originFilters = append(originFilters, model.Filter{Url: url, Enabled: enabled})
+				replicaFilters = append(replicaFilters, model.Filter{Url: url, Enabled: !enabled})
+				a, u, d := model.MergeFilters(&replicaFilters, &originFilters)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(HaveLen(1))
+				Ω(d).Should(BeEmpty())
+
+				Ω(u[0].Enabled).Should(Equal(enabled))
+			})
+
+			It("should update existing filter when name differs", func() {
+				name1 := uuid.NewString()
+				name2 := uuid.NewString()
+				originFilters = append(originFilters, model.Filter{Url: url, Name: name1})
+				replicaFilters = append(replicaFilters, model.Filter{Url: url, Name: name2})
+				a, u, d := model.MergeFilters(&replicaFilters, &originFilters)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(HaveLen(1))
+				Ω(d).Should(BeEmpty())
+
+				Ω(u[0].Name).Should(Equal(name1))
+			})
+
+			It("should have no changes", func() {
+				originFilters = append(originFilters, model.Filter{Url: url})
+				replicaFilters = append(replicaFilters, model.Filter{Url: url})
+				a, u, d := model.MergeFilters(&replicaFilters, &originFilters)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(BeEmpty())
+				Ω(d).Should(BeEmpty())
+			})
+		})
+	})
+	Context("AdGuardInstance", func() {
+		It("should build a key with url and api apiPath", func() {
+			i := &types.AdGuardInstance{URL: url, APIPath: apiPath}
+			Ω(i.Key()).Should(Equal(url + "#" + apiPath))
+		})
+	})
+	Context("RewriteEntry", func() {
+		It("should build a key with url and api apiPath", func() {
+			domain := uuid.NewString()
+			answer := uuid.NewString()
+			re := &model.RewriteEntry{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}
+			Ω(re.Key()).Should(Equal(domain + "#" + answer))
+		})
+	})
+	Context("QueryLogConfig", func() {
+		Context("Equal", func() {
+			var (
+				a *model.QueryLogConfig
+				b *model.QueryLogConfig
+			)
+			BeforeEach(func() {
+				a = &model.QueryLogConfig{}
+				b = &model.QueryLogConfig{}
+			})
+			It("should be equal", func() {
+				a.Enabled = utils.Ptr(true)
+				var interval model.QueryLogConfigInterval = 1
+				a.Interval = &interval
+				a.AnonymizeClientIp = utils.Ptr(true)
+				b.Enabled = utils.Ptr(true)
+				b.Interval = &interval
+				b.AnonymizeClientIp = utils.Ptr(true)
+				Ω(a.Equals(b)).Should(BeTrue())
+			})
+			It("should not be equal when enabled differs", func() {
+				a.Enabled = utils.Ptr(true)
+				b.Enabled = utils.Ptr(false)
+				Ω(a.Equals(b)).ShouldNot(BeTrue())
+			})
+			It("should not be equal when interval differs", func() {
+				var interval1 model.QueryLogConfigInterval = 1
+				var interval2 model.QueryLogConfigInterval = 2
+				a.Interval = &interval1
+				b.Interval = &interval2
+				Ω(a.Equals(b)).ShouldNot(BeTrue())
+			})
+			It("should not be equal when anonymizeClientIP differs", func() {
+				a.AnonymizeClientIp = utils.Ptr(true)
+				b.AnonymizeClientIp = utils.Ptr(false)
+				Ω(a.Equals(b)).ShouldNot(BeTrue())
+			})
+		})
+	})
+	Context("RewriteEntries", func() {
+		Context("Merge", func() {
+			var (
+				originRE  model.RewriteEntries
+				replicaRE model.RewriteEntries
+				domain    string
+			)
+			BeforeEach(func() {
+				originRE = model.RewriteEntries{}
+				replicaRE = model.RewriteEntries{}
+				domain = uuid.NewString()
+			})
+
+			It("should add a missing rewrite entry", func() {
+				originRE = append(originRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				a, r, d := replicaRE.Merge(&originRE)
+				Ω(a).Should(HaveLen(1))
+				Ω(r).Should(BeEmpty())
+				Ω(d).Should(BeEmpty())
+
+				Ω(*a[0].Domain).Should(Equal(domain))
+			})
+
+			It("should remove additional rewrite entry", func() {
+				replicaRE = append(replicaRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				a, r, d := replicaRE.Merge(&originRE)
+				Ω(a).Should(BeEmpty())
+				Ω(r).Should(HaveLen(1))
+				Ω(d).Should(BeEmpty())
+
+				Ω(*r[0].Domain).Should(Equal(domain))
+			})
+
+			It("should have no changes", func() {
+				originRE = append(originRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				replicaRE = append(replicaRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				a, r, d := replicaRE.Merge(&originRE)
+				Ω(a).Should(BeEmpty())
+				Ω(r).Should(BeEmpty())
+				Ω(d).Should(BeEmpty())
+			})
+
+			It("should remove target duplicate", func() {
+				originRE = append(originRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				replicaRE = append(replicaRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				replicaRE = append(replicaRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				a, r, d := replicaRE.Merge(&originRE)
+				Ω(a).Should(BeEmpty())
+				Ω(r).Should(HaveLen(1))
+				Ω(d).Should(BeEmpty())
+			})
+
+			It("should remove target duplicate", func() {
+				originRE = append(originRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				originRE = append(originRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				replicaRE = append(replicaRE, model.RewriteEntry{Domain: utils.Ptr(domain)})
+				a, r, d := replicaRE.Merge(&originRE)
+				Ω(a).Should(BeEmpty())
+				Ω(r).Should(BeEmpty())
+				Ω(d).Should(HaveLen(1))
+			})
+		})
+	})
+	Context("Config", func() {
+		var cfg *types.Config
+		BeforeEach(func() {
+			cfg = &types.Config{}
+		})
+		Context("UniqueReplicas", func() {
+			It("should be empty if noting defined", func() {
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(BeEmpty())
+			})
+			It("should be empty if replica url is not set", func() {
+				cfg.Replica = &types.AdGuardInstance{URL: ""}
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(BeEmpty())
+			})
+			It("should be empty if replicas url is not set", func() {
+				cfg.Replicas = []types.AdGuardInstance{{URL: ""}}
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(BeEmpty())
+			})
+			It("should return only one replica if same url and apiPath", func() {
+				cfg.Replica = &types.AdGuardInstance{URL: url, APIPath: apiPath}
+				cfg.Replicas = []types.AdGuardInstance{{URL: url, APIPath: apiPath}, {URL: url, APIPath: apiPath}}
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(HaveLen(1))
+			})
+			It("should return 3 one replicas if urls are different", func() {
+				cfg.Replica = &types.AdGuardInstance{URL: url, APIPath: apiPath}
+				cfg.Replicas = []types.AdGuardInstance{{URL: url + "1", APIPath: apiPath}, {URL: url, APIPath: apiPath + "1"}}
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(HaveLen(3))
+			})
+			It("should set default api apiPath if not set", func() {
+				cfg.Replica = &types.AdGuardInstance{URL: url}
+				cfg.Replicas = []types.AdGuardInstance{{URL: url + "1"}}
+				r := cfg.UniqueReplicas()
+				Ω(r).Should(HaveLen(2))
+				Ω(r[0].APIPath).Should(Equal(types.DefaultAPIPath))
+				Ω(r[1].APIPath).Should(Equal(types.DefaultAPIPath))
+			})
+		})
+	})
+
+	Context("Clients", func() {
+		Context("Merge", func() {
+			var (
+				originClients  *model.Clients
+				replicaClients model.Clients
+				name           string
+			)
+			BeforeEach(func() {
+				originClients = &model.Clients{}
+				replicaClients = model.Clients{}
+				name = uuid.NewString()
+			})
+
+			It("should add a missing client", func() {
+				originClients.Add(model.Client{Name: utils.Ptr(name)})
+				a, u, d := replicaClients.Merge(originClients)
+				Ω(a).Should(HaveLen(1))
+				Ω(u).Should(BeEmpty())
+				Ω(d).Should(BeEmpty())
+
+				Ω(*a[0].Name).Should(Equal(name))
+			})
+
+			It("should remove additional client", func() {
+				replicaClients.Add(model.Client{Name: utils.Ptr(name)})
+				a, u, d := replicaClients.Merge(originClients)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(BeEmpty())
+				Ω(d).Should(HaveLen(1))
+
+				Ω(*d[0].Name).Should(Equal(name))
+			})
+
+			It("should update existing client when name differs", func() {
+				disallowed := true
+				originClients.Add(model.Client{Name: utils.Ptr(name), FilteringEnabled: utils.Ptr(disallowed)})
+				replicaClients.Add(model.Client{Name: utils.Ptr(name), FilteringEnabled: utils.Ptr(!disallowed)})
+				a, u, d := replicaClients.Merge(originClients)
+				Ω(a).Should(BeEmpty())
+				Ω(u).Should(HaveLen(1))
+				Ω(d).Should(BeEmpty())
+
+				Ω(*u[0].FilteringEnabled).Should(Equal(disallowed))
+			})
+		})
+	})
+	Context("BlockedServices", func() {
+		Context("Equals", func() {
+			It("should be equal", func() {
+				s1 := &model.BlockedServicesArray{"a", "b"}
+				s2 := &model.BlockedServicesArray{"b", "a"}
+				Ω(model.EqualsStringSlice(s1, s2, true)).Should(BeTrue())
+			})
+			It("should not be equal different values", func() {
+				s1 := &model.BlockedServicesArray{"a", "b"}
+				s2 := &model.BlockedServicesArray{"B", "a"}
+				Ω(model.EqualsStringSlice(s1, s2, true)).ShouldNot(BeTrue())
+			})
+			It("should not be equal different length", func() {
+				s1 := &model.BlockedServicesArray{"a", "b"}
+				s2 := &model.BlockedServicesArray{"b", "a", "c"}
+				Ω(model.EqualsStringSlice(s1, s2, true)).ShouldNot(BeTrue())
+			})
+		})
+	})
+	Context("DNSConfig", func() {
+		Context("Equals", func() {
+			It("should be equal", func() {
+				dc1 := &model.DNSConfig{LocalPtrUpstreams: utils.Ptr([]string{"a"})}
+				dc2 := &model.DNSConfig{LocalPtrUpstreams: utils.Ptr([]string{"a"})}
+				Ω(dc1.Equals(dc2)).Should(BeTrue())
+			})
+			It("should not be equal", func() {
+				dc1 := &model.DNSConfig{LocalPtrUpstreams: utils.Ptr([]string{"a"})}
+				dc2 := &model.DNSConfig{LocalPtrUpstreams: utils.Ptr([]string{"b"})}
+				Ω(dc1.Equals(dc2)).ShouldNot(BeTrue())
+			})
+		})
+	})
+	Context("DHCPServerConfig", func() {
+		Context("Equals", func() {
+			It("should be equal", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.4"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+				}
+				dc2 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.4"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+				}
+				Ω(dc1.Equals(dc2)).Should(BeTrue())
+			})
+			It("should not be equal", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.3"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+				}
+				dc2 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.4"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+				}
+				Ω(dc1.Equals(dc2)).ShouldNot(BeTrue())
+			})
+		})
+		Context("Clone", func() {
+			It("clone should be equal", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.4"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+				}
+				Ω(dc1.Clone().Equals(dc1)).Should(BeTrue())
+			})
+		})
+		Context("HasConfig", func() {
+			It("should not have a config", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{},
+					V6: &model.DhcpConfigV6{},
+				}
+				Ω(dc1.HasConfig()).Should(BeFalse())
+			})
+			It("should not have a v4 config", func() {
+				dc1 := &model.DhcpStatus{
+					V4: &model.DhcpConfigV4{
+						GatewayIp:     utils.Ptr("1.2.3.4"),
+						LeaseDuration: utils.Ptr(123),
+						RangeStart:    utils.Ptr("1.2.3.5"),
+						RangeEnd:      utils.Ptr("1.2.3.6"),
+						SubnetMask:    utils.Ptr("255.255.255.0"),
+					},
+					V6: &model.DhcpConfigV6{},
+				}
+				Ω(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())
+			})
+		})
+	})
+})

pkg/mocks/client/mock.go

@@ -7,7 +7,7 @@ package client
 import (
 	reflect "reflect"
 
-	types "github.com/bakito/adguardhome-sync/pkg/types"
+	model "github.com/bakito/adguardhome-sync/pkg/client/model"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -35,10 +35,10 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder {
 }
 
 // AccessList mocks base method.
-func (m *MockClient) AccessList() (*types.AccessList, error) {
+func (m *MockClient) AccessList() (*model.AccessList, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "AccessList")
-	ret0, _ := ret[0].(*types.AccessList)
+	ret0, _ := ret[0].(*model.AccessList)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -50,7 +50,7 @@ func (mr *MockClientMockRecorder) AccessList() *gomock.Call {
 }
 
 // AddClients mocks base method.
-func (m *MockClient) AddClients(arg0 ...types.Client) error {
+func (m *MockClient) AddClients(arg0 ...*model.Client) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -68,7 +68,7 @@ func (mr *MockClientMockRecorder) AddClients(arg0 ...interface{}) *gomock.Call {
 }
 
 // AddDHCPStaticLeases mocks base method.
-func (m *MockClient) AddDHCPStaticLeases(arg0 ...types.Lease) error {
+func (m *MockClient) AddDHCPStaticLeases(arg0 ...model.DhcpStaticLease) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -86,7 +86,7 @@ func (mr *MockClientMockRecorder) AddDHCPStaticLeases(arg0 ...interface{}) *gomo
 }
 
 // AddFilters mocks base method.
-func (m *MockClient) AddFilters(arg0 bool, arg1 ...types.Filter) error {
+func (m *MockClient) AddFilters(arg0 bool, arg1 ...model.Filter) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0}
 	for _, a := range arg1 {
@@ -105,7 +105,7 @@ func (mr *MockClientMockRecorder) AddFilters(arg0 interface{}, arg1 ...interface
 }
 
 // AddRewriteEntries mocks base method.
-func (m *MockClient) AddRewriteEntries(arg0 ...types.RewriteEntry) error {
+func (m *MockClient) AddRewriteEntries(arg0 ...model.RewriteEntry) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -122,11 +122,41 @@ func (mr *MockClientMockRecorder) AddRewriteEntries(arg0 ...interface{}) *gomock
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRewriteEntries", reflect.TypeOf((*MockClient)(nil).AddRewriteEntries), arg0...)
 }
 
+// BlockedServices mocks base method.
+func (m *MockClient) BlockedServices() (*[]string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BlockedServices")
+	ret0, _ := ret[0].(*[]string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// BlockedServices indicates an expected call of BlockedServices.
+func (mr *MockClientMockRecorder) BlockedServices() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockedServices", reflect.TypeOf((*MockClient)(nil).BlockedServices))
+}
+
+// BlockedServicesSchedule mocks base method.
+func (m *MockClient) BlockedServicesSchedule() (*model.BlockedServicesSchedule, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "BlockedServicesSchedule")
+	ret0, _ := ret[0].(*model.BlockedServicesSchedule)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// BlockedServicesSchedule indicates an expected call of BlockedServicesSchedule.
+func (mr *MockClientMockRecorder) BlockedServicesSchedule() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BlockedServicesSchedule", reflect.TypeOf((*MockClient)(nil).BlockedServicesSchedule))
+}
+
 // Clients mocks base method.
-func (m *MockClient) Clients() (*types.Clients, error) {
+func (m *MockClient) Clients() (*model.Clients, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Clients")
-	ret0, _ := ret[0].(*types.Clients)
+	ret0, _ := ret[0].(*model.Clients)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -137,26 +167,11 @@ func (mr *MockClientMockRecorder) Clients() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Clients", reflect.TypeOf((*MockClient)(nil).Clients))
 }
 
-// DHCPServerConfig mocks base method.
-func (m *MockClient) DHCPServerConfig() (*types.DHCPServerConfig, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DHCPServerConfig")
-	ret0, _ := ret[0].(*types.DHCPServerConfig)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DHCPServerConfig indicates an expected call of DHCPServerConfig.
-func (mr *MockClientMockRecorder) DHCPServerConfig() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DHCPServerConfig", reflect.TypeOf((*MockClient)(nil).DHCPServerConfig))
-}
-
 // DNSConfig mocks base method.
-func (m *MockClient) DNSConfig() (*types.DNSConfig, error) {
+func (m *MockClient) DNSConfig() (*model.DNSConfig, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "DNSConfig")
-	ret0, _ := ret[0].(*types.DNSConfig)
+	ret0, _ := ret[0].(*model.DNSConfig)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -168,7 +183,7 @@ func (mr *MockClientMockRecorder) DNSConfig() *gomock.Call {
 }
 
 // DeleteClients mocks base method.
-func (m *MockClient) DeleteClients(arg0 ...types.Client) error {
+func (m *MockClient) DeleteClients(arg0 ...*model.Client) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -186,7 +201,7 @@ func (mr *MockClientMockRecorder) DeleteClients(arg0 ...interface{}) *gomock.Cal
 }
 
 // DeleteDHCPStaticLeases mocks base method.
-func (m *MockClient) DeleteDHCPStaticLeases(arg0 ...types.Lease) error {
+func (m *MockClient) DeleteDHCPStaticLeases(arg0 ...model.DhcpStaticLease) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -204,7 +219,7 @@ func (mr *MockClientMockRecorder) DeleteDHCPStaticLeases(arg0 ...interface{}) *g
 }
 
 // DeleteFilters mocks base method.
-func (m *MockClient) DeleteFilters(arg0 bool, arg1 ...types.Filter) error {
+func (m *MockClient) DeleteFilters(arg0 bool, arg1 ...model.Filter) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0}
 	for _, a := range arg1 {
@@ -223,7 +238,7 @@ func (mr *MockClientMockRecorder) DeleteFilters(arg0 interface{}, arg1 ...interf
 }
 
 // DeleteRewriteEntries mocks base method.
-func (m *MockClient) DeleteRewriteEntries(arg0 ...types.RewriteEntry) error {
+func (m *MockClient) DeleteRewriteEntries(arg0 ...model.RewriteEntry) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -240,11 +255,26 @@ func (mr *MockClientMockRecorder) DeleteRewriteEntries(arg0 ...interface{}) *gom
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRewriteEntries", reflect.TypeOf((*MockClient)(nil).DeleteRewriteEntries), arg0...)
 }
 
+// DhcpConfig mocks base method.
+func (m *MockClient) DhcpConfig() (*model.DhcpStatus, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "DhcpConfig")
+	ret0, _ := ret[0].(*model.DhcpStatus)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// DhcpConfig indicates an expected call of DhcpConfig.
+func (mr *MockClientMockRecorder) DhcpConfig() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DhcpConfig", reflect.TypeOf((*MockClient)(nil).DhcpConfig))
+}
+
 // Filtering mocks base method.
-func (m *MockClient) Filtering() (*types.FilteringStatus, error) {
+func (m *MockClient) Filtering() (*model.FilterStatus, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Filtering")
-	ret0, _ := ret[0].(*types.FilteringStatus)
+	ret0, _ := ret[0].(*model.FilterStatus)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -284,11 +314,26 @@ func (mr *MockClientMockRecorder) Parental() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Parental", reflect.TypeOf((*MockClient)(nil).Parental))
 }
 
+// ProfileInfo mocks base method.
+func (m *MockClient) ProfileInfo() (*model.ProfileInfo, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "ProfileInfo")
+	ret0, _ := ret[0].(*model.ProfileInfo)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// ProfileInfo indicates an expected call of ProfileInfo.
+func (mr *MockClientMockRecorder) ProfileInfo() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ProfileInfo", reflect.TypeOf((*MockClient)(nil).ProfileInfo))
+}
+
 // QueryLogConfig mocks base method.
-func (m *MockClient) QueryLogConfig() (*types.QueryLogConfig, error) {
+func (m *MockClient) QueryLogConfig() (*model.QueryLogConfig, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "QueryLogConfig")
-	ret0, _ := ret[0].(*types.QueryLogConfig)
+	ret0, _ := ret[0].(*model.QueryLogConfig)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -314,10 +359,10 @@ func (mr *MockClientMockRecorder) RefreshFilters(arg0 interface{}) *gomock.Call
 }
 
 // RewriteList mocks base method.
-func (m *MockClient) RewriteList() (*types.RewriteEntries, error) {
+func (m *MockClient) RewriteList() (*model.RewriteEntries, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "RewriteList")
-	ret0, _ := ret[0].(*types.RewriteEntries)
+	ret0, _ := ret[0].(*model.RewriteEntries)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -343,38 +388,23 @@ func (mr *MockClientMockRecorder) SafeBrowsing() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SafeBrowsing", reflect.TypeOf((*MockClient)(nil).SafeBrowsing))
 }
 
-// SafeSearch mocks base method.
+// SafeSearchConfig mocks base method.
-func (m *MockClient) SafeSearch() (bool, error) {
+func (m *MockClient) SafeSearchConfig() (*model.SafeSearchConfig, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SafeSearch")
+	ret := m.ctrl.Call(m, "SafeSearchConfig")
-	ret0, _ := ret[0].(bool)
+	ret0, _ := ret[0].(*model.SafeSearchConfig)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
 
-// SafeSearch indicates an expected call of SafeSearch.
+// SafeSearchConfig indicates an expected call of SafeSearchConfig.
-func (mr *MockClientMockRecorder) SafeSearch() *gomock.Call {
+func (mr *MockClientMockRecorder) SafeSearchConfig() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SafeSearch", reflect.TypeOf((*MockClient)(nil).SafeSearch))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SafeSearchConfig", reflect.TypeOf((*MockClient)(nil).SafeSearchConfig))
-}
-
-// Services mocks base method.
-func (m *MockClient) Services() (types.Services, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Services")
-	ret0, _ := ret[0].(types.Services)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// Services indicates an expected call of Services.
-func (mr *MockClientMockRecorder) Services() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Services", reflect.TypeOf((*MockClient)(nil).Services))
 }
 
 // SetAccessList mocks base method.
-func (m *MockClient) SetAccessList(arg0 *types.AccessList) error {
+func (m *MockClient) SetAccessList(arg0 *model.AccessList) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetAccessList", arg0)
 	ret0, _ := ret[0].(error)
@@ -387,8 +417,36 @@ func (mr *MockClientMockRecorder) SetAccessList(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccessList", reflect.TypeOf((*MockClient)(nil).SetAccessList), arg0)
 }
 
+// SetBlockedServices mocks base method.
+func (m *MockClient) SetBlockedServices(arg0 *[]string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetBlockedServices", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetBlockedServices indicates an expected call of SetBlockedServices.
+func (mr *MockClientMockRecorder) SetBlockedServices(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetBlockedServices", reflect.TypeOf((*MockClient)(nil).SetBlockedServices), arg0)
+}
+
+// SetBlockedServicesSchedule mocks base method.
+func (m *MockClient) SetBlockedServicesSchedule(arg0 *model.BlockedServicesSchedule) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetBlockedServicesSchedule", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetBlockedServicesSchedule indicates an expected call of SetBlockedServicesSchedule.
+func (mr *MockClientMockRecorder) SetBlockedServicesSchedule(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetBlockedServicesSchedule", reflect.TypeOf((*MockClient)(nil).SetBlockedServicesSchedule), arg0)
+}
+
 // SetCustomRules mocks base method.
-func (m *MockClient) SetCustomRules(arg0 types.UserRules) error {
+func (m *MockClient) SetCustomRules(arg0 *[]string) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetCustomRules", arg0)
 	ret0, _ := ret[0].(error)
@@ -401,22 +459,8 @@ func (mr *MockClientMockRecorder) SetCustomRules(arg0 interface{}) *gomock.Call
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetCustomRules", reflect.TypeOf((*MockClient)(nil).SetCustomRules), arg0)
 }
 
-// SetDHCPServerConfig mocks base method.
-func (m *MockClient) SetDHCPServerConfig(arg0 *types.DHCPServerConfig) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SetDHCPServerConfig", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// SetDHCPServerConfig indicates an expected call of SetDHCPServerConfig.
-func (mr *MockClientMockRecorder) SetDHCPServerConfig(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDHCPServerConfig", reflect.TypeOf((*MockClient)(nil).SetDHCPServerConfig), arg0)
-}
-
 // SetDNSConfig mocks base method.
-func (m *MockClient) SetDNSConfig(arg0 *types.DNSConfig) error {
+func (m *MockClient) SetDNSConfig(arg0 *model.DNSConfig) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetDNSConfig", arg0)
 	ret0, _ := ret[0].(error)
@@ -429,36 +473,64 @@ func (mr *MockClientMockRecorder) SetDNSConfig(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDNSConfig", reflect.TypeOf((*MockClient)(nil).SetDNSConfig), arg0)
 }
 
-// SetQueryLogConfig mocks base method.
+// SetDhcpConfig mocks base method.
-func (m *MockClient) SetQueryLogConfig(arg0 bool, arg1 float64, arg2 bool) error {
+func (m *MockClient) SetDhcpConfig(arg0 *model.DhcpStatus) error {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SetQueryLogConfig", arg0, arg1, arg2)
+	ret := m.ctrl.Call(m, "SetDhcpConfig", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetDhcpConfig indicates an expected call of SetDhcpConfig.
+func (mr *MockClientMockRecorder) SetDhcpConfig(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDhcpConfig", reflect.TypeOf((*MockClient)(nil).SetDhcpConfig), arg0)
+}
+
+// SetProfileInfo mocks base method.
+func (m *MockClient) SetProfileInfo(arg0 *model.ProfileInfo) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetProfileInfo", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// SetProfileInfo indicates an expected call of SetProfileInfo.
+func (mr *MockClientMockRecorder) SetProfileInfo(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetProfileInfo", reflect.TypeOf((*MockClient)(nil).SetProfileInfo), arg0)
+}
+
+// SetQueryLogConfig mocks base method.
+func (m *MockClient) SetQueryLogConfig(arg0 *model.QueryLogConfig) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SetQueryLogConfig", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
 // SetQueryLogConfig indicates an expected call of SetQueryLogConfig.
-func (mr *MockClientMockRecorder) SetQueryLogConfig(arg0, arg1, arg2 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetQueryLogConfig(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQueryLogConfig", reflect.TypeOf((*MockClient)(nil).SetQueryLogConfig), arg0, arg1, arg2)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetQueryLogConfig", reflect.TypeOf((*MockClient)(nil).SetQueryLogConfig), arg0)
 }
 
-// SetServices mocks base method.
+// SetSafeSearchConfig mocks base method.
-func (m *MockClient) SetServices(arg0 types.Services) error {
+func (m *MockClient) SetSafeSearchConfig(arg0 *model.SafeSearchConfig) error {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SetServices", arg0)
+	ret := m.ctrl.Call(m, "SetSafeSearchConfig", arg0)
 	ret0, _ := ret[0].(error)
 	return ret0
 }
 
-// SetServices indicates an expected call of SetServices.
+// SetSafeSearchConfig indicates an expected call of SetSafeSearchConfig.
-func (mr *MockClientMockRecorder) SetServices(arg0 interface{}) *gomock.Call {
+func (mr *MockClientMockRecorder) SetSafeSearchConfig(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetServices", reflect.TypeOf((*MockClient)(nil).SetServices), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSafeSearchConfig", reflect.TypeOf((*MockClient)(nil).SetSafeSearchConfig), arg0)
 }
 
 // SetStatsConfig mocks base method.
-func (m *MockClient) SetStatsConfig(arg0 float64) error {
+func (m *MockClient) SetStatsConfig(arg0 *model.StatsConfig) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "SetStatsConfig", arg0)
 	ret0, _ := ret[0].(error)
@@ -486,10 +558,10 @@ func (mr *MockClientMockRecorder) Setup() *gomock.Call {
 }
 
 // StatsConfig mocks base method.
-func (m *MockClient) StatsConfig() (*types.IntervalConfig, error) {
+func (m *MockClient) StatsConfig() (*model.StatsConfig, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "StatsConfig")
-	ret0, _ := ret[0].(*types.IntervalConfig)
+	ret0, _ := ret[0].(*model.StatsConfig)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -501,10 +573,10 @@ func (mr *MockClientMockRecorder) StatsConfig() *gomock.Call {
 }
 
 // Status mocks base method.
-func (m *MockClient) Status() (*types.Status, error) {
+func (m *MockClient) Status() (*model.ServerStatus, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Status")
-	ret0, _ := ret[0].(*types.Status)
+	ret0, _ := ret[0].(*model.ServerStatus)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -516,7 +588,7 @@ func (mr *MockClientMockRecorder) Status() *gomock.Call {
 }
 
 // ToggleFiltering mocks base method.
-func (m *MockClient) ToggleFiltering(arg0 bool, arg1 float64) error {
+func (m *MockClient) ToggleFiltering(arg0 bool, arg1 int) error {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ToggleFiltering", arg0, arg1)
 	ret0, _ := ret[0].(error)
@@ -571,22 +643,8 @@ func (mr *MockClientMockRecorder) ToggleSafeBrowsing(arg0 interface{}) *gomock.C
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleSafeBrowsing", reflect.TypeOf((*MockClient)(nil).ToggleSafeBrowsing), arg0)
 }
 
-// ToggleSafeSearch mocks base method.
-func (m *MockClient) ToggleSafeSearch(arg0 bool) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "ToggleSafeSearch", arg0)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// ToggleSafeSearch indicates an expected call of ToggleSafeSearch.
-func (mr *MockClientMockRecorder) ToggleSafeSearch(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ToggleSafeSearch", reflect.TypeOf((*MockClient)(nil).ToggleSafeSearch), arg0)
-}
-
 // UpdateClients mocks base method.
-func (m *MockClient) UpdateClients(arg0 ...types.Client) error {
+func (m *MockClient) UpdateClients(arg0 ...*model.Client) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{}
 	for _, a := range arg0 {
@@ -604,7 +662,7 @@ func (mr *MockClientMockRecorder) UpdateClients(arg0 ...interface{}) *gomock.Cal
 }
 
 // UpdateFilters mocks base method.
-func (m *MockClient) UpdateFilters(arg0 bool, arg1 ...types.Filter) error {
+func (m *MockClient) UpdateFilters(arg0 bool, arg1 ...model.Filter) error {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0}
 	for _, a := range arg1 {

pkg/sync/http.go

@@ -33,9 +33,10 @@ func (w *worker) handleSync(c *gin.Context) {
 
 func (w *worker) handleRoot(c *gin.Context) {
 	c.HTML(http.StatusOK, "index.html", map[string]interface{}{
-		"DarkMode": w.cfg.API.DarkMode,
+		"DarkMode":   w.cfg.API.DarkMode,
-		"Version":  version.Version,
+		"Version":    version.Version,
-		"Build":    version.Build,
+		"Build":      version.Build,
+		"SyncStatus": w.status(),
 	},
 	)
 }
@@ -48,6 +49,10 @@ func (w *worker) handleLogs(c *gin.Context) {
 	c.Data(http.StatusOK, "text/plain", []byte(strings.Join(log.Logs(), "")))
 }
 
+func (w *worker) handleStatus(c *gin.Context) {
+	c.JSON(http.StatusOK, w.status())
+}
+
 func (w *worker) listenAndServe() {
 	l.With("port", w.cfg.API.Port).Info("Starting API server")
 
@@ -69,6 +74,7 @@ func (w *worker) listenAndServe() {
 	r.SetHTMLTemplate(template.Must(template.New("index.html").Parse(string(index))))
 	r.POST("/api/v1/sync", w.handleSync)
 	r.GET("/api/v1/logs", w.handleLogs)
+	r.GET("/api/v1/status", w.handleStatus)
 	r.GET("/favicon.ico", w.handleFavicon)
 	r.GET("/", w.handleRoot)
 
@@ -115,3 +121,15 @@ func (w *worker) listenAndServe() {
 
 	defer os.Exit(0)
 }
+
+type syncStatus struct {
+	Origin   replicaStatus   `json:"origin"`
+	Replicas []replicaStatus `json:"replicas"`
+}
+
+type replicaStatus struct {
+	Host   string `json:"origin"`
+	URL    string `json:"url"`
+	Status string `json:"status"`
+	Error  string `json:"error"`
+}

pkg/sync/index.html

@@ -1,4 +1,4 @@
-<html>
+<html lang="en">
 <head>
     <title>AdGuardHome sync</title>
     <script type="text/javascript" src="https://code.jquery.com/jquery-3.6.0.min.js">
@@ -18,21 +18,35 @@
                         $('#logs').html(data);
                     }
                 );
+                $.get("api/v1/status", {}, function (status) {
+                        $('#origin').removeClass(function (index, className) {
+                            return (className.match(/(^|\s)btn-\S+/g) || []).join(' ');
+                        }).addClass("btn-" + status.origin.status).attr('title', status.origin.error);
+                        status.replicas.forEach(function (replica, i) {
+                            $('#replica_' + i).removeClass(function (index, className) {
+                                return (className.match(/(^|\s)btn-\S+/g) || []).join(' ');
+                            }).addClass("btn-" + replica.status).attr('title', replica.error);
+                        });
+                    }
+                );
             });
             $("#sync").click(function () {
                 $.post("api/v1/sync", {}, function (data) {
                 });
+                $("#showLogs").click();
             });
-            $("#showLogs").click()
+            $("#showLogs").click();
         });
     </script>
     <link rel="shortcut icon" href="favicon.ico">
 </head>
 <body>
-<div class="container-fluid  px-4">
+<div class="container-fluid px-4">
     <div class="row">
-        <p class="h1">AdGuardHome sync
+        <p class="h1">
-        <p class="h6">{{ .Version }} ({{ .Build }})</p></p>
+            AdGuardHome sync
+        <p class="h6">{{ .Version }} ({{ .Build }})</p>
+        </p>
     </div>
     <div class="row">
         <div class="col">
@@ -41,6 +55,18 @@
                 <input class="btn btn-secondary" type="button" id="showLogs" value="Update Logs"/>
             </div>
         </div>
+        <div class="col col-md-auto">
+            <div class="float-right">
+                <a href="{{ .SyncStatus.Origin.URL }}" target="_blank" class="btn btn-{{ .SyncStatus.Origin.Status }}"
+                   type="button" id="origin"
+                   {{ if .SyncStatus.Origin.Error }} title="{{ .SyncStatus.Origin.Error }}" {{ end }}>Origin {{ .SyncStatus.Origin.Host }}</a>
+                {{ range $i, $r := .SyncStatus.Replicas }}
+                <a href="{{ $r.URL }}" target="_blank" class="btn btn-{{ $r.Status }}"
+                   type="button" id="replica_{{ $i }}"
+                   {{ if $r.Error }} title="{{ $r.Error }}" {{ end }} >Replica {{ $r.Host }}</a>
+                {{ end }}
+            </div>
+        </div>
     </div>
     <div class="row  mt-3">
         <div class="col-12">
@@ -49,4 +75,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>

pkg/sync/sync.go

@@ -3,18 +3,21 @@ package sync
 import (
 	"errors"
 	"fmt"
+	"runtime"
+	"sort"
+	"time"
 
 	"github.com/bakito/adguardhome-sync/pkg/client"
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
 	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/pkg/utils"
+	"github.com/bakito/adguardhome-sync/pkg/versions"
 	"github.com/bakito/adguardhome-sync/version"
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
-	"golang.org/x/mod/semver"
 )
 
-const minAghVersion = "v0.107.0"
-
 var l = log.GetLogger("sync")
 
 // Sync config from origin to replica
@@ -27,7 +30,13 @@ func Sync(cfg *types.Config) error {
 		return fmt.Errorf("no replicas configured")
 	}
 
-	l.With("version", version.Version, "build", version.Build).Info("AdGuardHome sync")
+	l.With(
+		"version", version.Version,
+		"build", version.Build,
+		"os", runtime.GOOS,
+		"arch", runtime.GOARCH,
+	).Info("AdGuardHome sync")
+	cfg.Log(l)
 	cfg.Features.LogDisabled(l)
 	cfg.Origin.AutoSetup = false
 
@@ -40,7 +49,13 @@ func Sync(cfg *types.Config) error {
 	if cfg.Cron != "" {
 		w.cron = cron.New()
 		cl := l.With("cron", cfg.Cron)
-		_, err := w.cron.AddFunc(cfg.Cron, func() {
+		sched, err := cron.ParseStandard(cfg.Cron)
+		if err != nil {
+			cl.With("error", err).Error("Error parsing cron expression")
+			return err
+		}
+		cl = cl.With("next-execution", sched.Next(time.Now()))
+		_, err = w.cron.AddFunc(cfg.Cron, func() {
 			w.sync()
 		})
 		if err != nil {
@@ -77,6 +92,45 @@ type worker struct {
 	createClient func(instance types.AdGuardInstance) (client.Client, error)
 }
 
+func (w *worker) status() *syncStatus {
+	syncStatus := &syncStatus{
+		Origin: w.getStatus(w.cfg.Origin),
+	}
+
+	for _, replica := range w.cfg.Replicas {
+		st := w.getStatus(replica)
+		if w.running {
+			st.Status = "info"
+		}
+		syncStatus.Replicas = append(syncStatus.Replicas, st)
+	}
+
+	sort.Slice(syncStatus.Replicas, func(i, j int) bool {
+		return syncStatus.Replicas[i].Host < syncStatus.Replicas[j].Host
+	})
+
+	return syncStatus
+}
+
+func (w *worker) getStatus(inst types.AdGuardInstance) replicaStatus {
+	oc, err := w.createClient(inst)
+	if err != nil {
+		l.With("error", err, "url", w.cfg.Origin.URL).Error("Error creating origin client")
+		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
+	}
+	sl := l.With("from", oc.Host())
+	_, err = oc.Status()
+	if err != nil {
+		if errors.Is(err, client.ErrSetupNeeded) {
+			return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "warning"}
+		}
+		sl.With("error", err).Error("Error getting origin status")
+		return replicaStatus{Host: oc.Host(), URL: inst.URL, Error: err.Error(), Status: "danger"}
+	}
+	st := replicaStatus{Host: oc.Host(), URL: inst.URL, Status: "success"}
+	return st
+}
+
 func (w *worker) sync() {
 	if w.running {
 		l.Info("Sync already running")
@@ -100,19 +154,25 @@ func (w *worker) sync() {
 		return
 	}
 
-	if semver.Compare(o.status.Version, minAghVersion) == -1 {
+	if versions.IsNewerThan(versions.MinAgh, o.status.Version) {
-		sl.With("error", err, "version", o.status.Version).Errorf("Origin AdGuard Home version must be >= %s", minAghVersion)
+		sl.With("error", err, "version", o.status.Version).Errorf("Origin AdGuard Home version must be >= %s", versions.MinAgh)
 		return
 	}
 
 	sl.With("version", o.status.Version).Info("Connected to origin")
 
+	o.profileInfo, err = oc.ProfileInfo()
+	if err != nil {
+		sl.With("error", err).Error("Error getting profileInfo info")
+		return
+	}
+
 	o.parental, err = oc.Parental()
 	if err != nil {
 		sl.With("error", err).Error("Error getting parental status")
 		return
 	}
-	o.safeSearch, err = oc.SafeSearch()
+	o.safeSearch, err = oc.SafeSearchConfig()
 	if err != nil {
 		sl.With("error", err).Error("Error getting safe search status")
 		return
@@ -129,9 +189,15 @@ func (w *worker) sync() {
 		return
 	}
 
-	o.services, err = oc.Services()
+	o.blockedServices, err = oc.BlockedServices()
 	if err != nil {
-		sl.With("error", err).Error("Error getting origin services")
+		sl.With("error", err).Error("Error getting origin blocked services")
+		return
+	}
+
+	o.blockedServicesSchedule, err = oc.BlockedServicesSchedule()
+	if err != nil {
+		sl.With("error", err).Error("Error getting origin blocked services schedule")
 		return
 	}
 
@@ -168,10 +234,12 @@ func (w *worker) sync() {
 		return
 	}
 
-	o.dhcpServerConfig, err = oc.DHCPServerConfig()
+	if w.cfg.Features.DHCP.ServerConfig || w.cfg.Features.DHCP.StaticLeases {
-	if err != nil {
+		o.dhcpServerConfig, err = oc.DhcpConfig()
-		sl.With("error", err).Error("Error getting dhcp server config")
+		if err != nil {
-		return
+			sl.With("error", err).Error("Error getting dhcp server config")
+			return
+		}
 	}
 
 	replicas := w.cfg.UniqueReplicas()
@@ -196,10 +264,10 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn
 		return
 	}
 
-	rl.With("version", o.status.Version).Info("Connected to replica")
+	rl.With("version", rs.Version).Info("Connected to replica")
 
-	if semver.Compare(rs.Version, minAghVersion) == -1 {
+	if versions.IsNewerThan(versions.MinAgh, rs.Version) {
-		rl.With("error", err, "version", rs.Version).Errorf("Replica AdGuard Home version must be >= %s", minAghVersion)
+		rl.With("error", err, "version", rs.Version).Errorf("Replica AdGuard Home version must be >= %s", versions.MinAgh)
 		return
 	}
 
@@ -230,9 +298,9 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn
 		return
 	}
 
-	err = w.syncServices(o.services, rc)
+	err = w.syncServices(o.blockedServices, o.blockedServicesSchedule, rc)
 	if err != nil {
-		rl.With("error", err).Error("Error syncing services")
+		rl.With("error", err).Error("Error syncing blockedServices")
 		return
 	}
 
@@ -246,15 +314,17 @@ func (w *worker) syncTo(l *zap.SugaredLogger, o *origin, replica types.AdGuardIn
 		return
 	}
 
-	if err = w.syncDHCPServer(o.dhcpServerConfig, rc, replica); err != nil {
+	if w.cfg.Features.DHCP.ServerConfig || w.cfg.Features.DHCP.StaticLeases {
-		rl.With("error", err).Error("Error syncing dns")
+		if err = w.syncDHCPServer(o.dhcpServerConfig, rc, replica); err != nil {
-		return
+			rl.With("error", err).Error("Error syncing dhcp")
+			return
+		}
 	}
 
 	rl.Info("Sync done")
 }
 
-func (w *worker) statusWithSetup(rl *zap.SugaredLogger, replica types.AdGuardInstance, rc client.Client) (*types.Status, error) {
+func (w *worker) statusWithSetup(rl *zap.SugaredLogger, replica types.AdGuardInstance, rc client.Client) (*model.ServerStatus, error) {
 	rs, err := rc.Status()
 	if err != nil {
 		if replica.AutoSetup && errors.Is(err, client.ErrSetupNeeded) {
@@ -269,15 +339,26 @@ func (w *worker) statusWithSetup(rl *zap.SugaredLogger, replica types.AdGuardIns
 	return rs, err
 }
 
-func (w *worker) syncServices(os types.Services, replica client.Client) error {
+func (w *worker) syncServices(os *model.BlockedServicesArray, obss *model.BlockedServicesSchedule, replica client.Client) error {
 	if w.cfg.Features.Services {
-		rs, err := replica.Services()
+		rs, err := replica.BlockedServices()
 		if err != nil {
 			return err
 		}
 
-		if !os.Equals(rs) {
+		if !model.EqualsStringSlice(os, rs, true) {
-			if err := replica.SetServices(os); err != nil {
+			if err := replica.SetBlockedServices(os); err != nil {
+				return err
+			}
+		}
+
+		rbss, err := replica.BlockedServicesSchedule()
+		if err != nil {
+			return err
+		}
+
+		if !obss.Equals(rbss) {
+			if err := replica.SetBlockedServicesSchedule(obss); err != nil {
 				return err
 			}
 		}
@@ -285,7 +366,7 @@ func (w *worker) syncServices(os types.Services, replica client.Client) error {
 	return nil
 }
 
-func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) error {
+func (w *worker) syncFilters(of *model.FilterStatus, replica client.Client) error {
 	if w.cfg.Features.Filters {
 		rf, err := replica.Filtering()
 		if err != nil {
@@ -299,12 +380,12 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
 			return err
 		}
 
-		if of.UserRules.String() != rf.UserRules.String() {
+		if utils.PtrToString(of.UserRules) != utils.PtrToString(rf.UserRules) {
 			return replica.SetCustomRules(of.UserRules)
 		}
 
 		if of.Enabled != rf.Enabled || of.Interval != rf.Interval {
-			if err = replica.ToggleFiltering(of.Enabled, of.Interval); err != nil {
+			if err = replica.ToggleFiltering(*of.Enabled, *of.Interval); err != nil {
 				return err
 			}
 		}
@@ -312,9 +393,12 @@ func (w *worker) syncFilters(of *types.FilteringStatus, replica client.Client) e
 	return nil
 }
 
-func (w *worker) syncFilterType(of types.Filters, rFilters types.Filters, whitelist bool, replica client.Client) error {
+func (w *worker) syncFilterType(of *[]model.Filter, rFilters *[]model.Filter, whitelist bool, replica client.Client) error {
-	fa, fu, fd := rFilters.Merge(of)
+	fa, fu, fd := model.MergeFilters(rFilters, of)
 
+	if err := replica.DeleteFilters(whitelist, fd...); err != nil {
+		return err
+	}
 	if err := replica.AddFilters(whitelist, fa...); err != nil {
 		return err
 	}
@@ -327,14 +411,10 @@ func (w *worker) syncFilterType(of types.Filters, rFilters types.Filters, whitel
 			return err
 		}
 	}
-
-	if err := replica.DeleteFilters(whitelist, fd...); err != nil {
-		return err
-	}
 	return nil
 }
 
-func (w *worker) syncRewrites(rl *zap.SugaredLogger, or *types.RewriteEntries, replica client.Client) error {
+func (w *worker) syncRewrites(rl *zap.SugaredLogger, or *model.RewriteEntries, replica client.Client) error {
 	if w.cfg.Features.DNS.Rewrites {
 		replicaRewrites, err := replica.RewriteList()
 		if err != nil {
@@ -343,10 +423,10 @@ func (w *worker) syncRewrites(rl *zap.SugaredLogger, or *types.RewriteEntries, r
 
 		a, r, d := replicaRewrites.Merge(or)
 
-		if err = replica.AddRewriteEntries(a...); err != nil {
+		if err = replica.DeleteRewriteEntries(r...); err != nil {
 			return err
 		}
-		if err = replica.DeleteRewriteEntries(r...); err != nil {
+		if err = replica.AddRewriteEntries(a...); err != nil {
 			return err
 		}
 
@@ -358,7 +438,7 @@ func (w *worker) syncRewrites(rl *zap.SugaredLogger, or *types.RewriteEntries, r
 	return nil
 }
 
-func (w *worker) syncClients(oc *types.Clients, replica client.Client) error {
+func (w *worker) syncClients(oc *model.Clients, replica client.Client) error {
 	if w.cfg.Features.ClientSettings {
 		rc, err := replica.Clients()
 		if err != nil {
@@ -367,21 +447,30 @@ func (w *worker) syncClients(oc *types.Clients, replica client.Client) error {
 
 		a, u, r := rc.Merge(oc)
 
+		if err = replica.DeleteClients(r...); err != nil {
+			return err
+		}
 		if err = replica.AddClients(a...); err != nil {
 			return err
 		}
 		if err = replica.UpdateClients(u...); err != nil {
 			return err
 		}
-		if err = replica.DeleteClients(r...); err != nil {
-			return err
-		}
 	}
 	return nil
 }
 
-func (w *worker) syncGeneralSettings(o *origin, rs *types.Status, replica client.Client) error {
+func (w *worker) syncGeneralSettings(o *origin, rs *model.ServerStatus, replica client.Client) error {
 	if w.cfg.Features.GeneralSettings {
+
+		if pro, err := replica.ProfileInfo(); err != nil {
+			return err
+		} else if merged := pro.ShouldSyncFor(o.profileInfo); merged != nil {
+			if err = replica.SetProfileInfo(merged); err != nil {
+				return err
+			}
+		}
+
 		if o.status.ProtectionEnabled != rs.ProtectionEnabled {
 			if err := replica.ToggleProtection(o.status.ProtectionEnabled); err != nil {
 				return err
@@ -394,10 +483,10 @@ func (w *worker) syncGeneralSettings(o *origin, rs *types.Status, replica client
 				return err
 			}
 		}
-		if rs, err := replica.SafeSearch(); err != nil {
+		if ssc, err := replica.SafeSearchConfig(); err != nil {
 			return err
-		} else if o.safeSearch != rs {
+		} else if !o.safeSearch.Equals(ssc) {
-			if err = replica.ToggleSafeSearch(o.safeSearch); err != nil {
+			if err = replica.SetSafeSearchConfig(o.safeSearch); err != nil {
 				return err
 			}
 		}
@@ -419,7 +508,7 @@ func (w *worker) syncConfigs(o *origin, rc client.Client) error {
 			return err
 		}
 		if !o.queryLogConfig.Equals(qlc) {
-			if err = rc.SetQueryLogConfig(o.queryLogConfig.Enabled, o.queryLogConfig.Interval, o.queryLogConfig.AnonymizeClientIP); err != nil {
+			if err = rc.SetQueryLogConfig(o.queryLogConfig); err != nil {
 				return err
 			}
 		}
@@ -430,7 +519,7 @@ func (w *worker) syncConfigs(o *origin, rc client.Client) error {
 			return err
 		}
 		if o.statsConfig.Interval != sc.Interval {
-			if err = rc.SetStatsConfig(o.statsConfig.Interval); err != nil {
+			if err = rc.SetStatsConfig(o.statsConfig); err != nil {
 				return err
 			}
 		}
@@ -439,7 +528,7 @@ func (w *worker) syncConfigs(o *origin, rc client.Client) error {
 	return nil
 }
 
-func (w *worker) syncDNS(oal *types.AccessList, odc *types.DNSConfig, rc client.Client) error {
+func (w *worker) syncDNS(oal *model.AccessList, odc *model.DNSConfig, rc client.Client) error {
 	if w.cfg.Features.DNS.AccessLists {
 		al, err := rc.AccessList()
 		if err != nil {
@@ -465,31 +554,39 @@ func (w *worker) syncDNS(oal *types.AccessList, odc *types.DNSConfig, rc client.
 	return nil
 }
 
-func (w *worker) syncDHCPServer(osc *types.DHCPServerConfig, rc client.Client, replica types.AdGuardInstance) error {
+func (w *worker) syncDHCPServer(osc *model.DhcpStatus, rc client.Client, replica types.AdGuardInstance) error {
-	sc, err := rc.DHCPServerConfig()
+	if !w.cfg.Features.DHCP.ServerConfig && !w.cfg.Features.DHCP.StaticLeases {
-	if w.cfg.Features.DHCP.ServerConfig {
+		return nil
+	}
+	sc, err := rc.DhcpConfig()
+	if w.cfg.Features.DHCP.ServerConfig && osc.HasConfig() {
 		if err != nil {
 			return err
 		}
 		origClone := osc.Clone()
 		if replica.InterfaceName != "" {
 			// overwrite interface name
-			origClone.InterfaceName = replica.InterfaceName
+			origClone.InterfaceName = utils.Ptr(replica.InterfaceName)
 		}
+		if replica.DHCPServerEnabled != nil {
+			// overwrite dhcp enabled
+			origClone.Enabled = replica.DHCPServerEnabled
+		}
+
 		if !sc.Equals(origClone) {
-			if err = rc.SetDHCPServerConfig(origClone); err != nil {
+			if err = rc.SetDhcpConfig(origClone); err != nil {
 				return err
 			}
 		}
 	}
 
 	if w.cfg.Features.DHCP.StaticLeases {
-		a, r := sc.StaticLeases.Merge(osc.StaticLeases)
+		a, r := model.MergeDhcpStaticLeases(sc.StaticLeases, osc.StaticLeases)
 
-		if err = rc.AddDHCPStaticLeases(a...); err != nil {
+		if err = rc.DeleteDHCPStaticLeases(r...); err != nil {
 			return err
 		}
-		if err = rc.DeleteDHCPStaticLeases(r...); err != nil {
+		if err = rc.AddDHCPStaticLeases(a...); err != nil {
 			return err
 		}
 	}
@@ -497,17 +594,19 @@ func (w *worker) syncDHCPServer(osc *types.DHCPServerConfig, rc client.Client, r
 }
 
 type origin struct {
-	status           *types.Status
+	status                  *model.ServerStatus
-	rewrites         *types.RewriteEntries
+	rewrites                *model.RewriteEntries
-	services         types.Services
+	blockedServices         *model.BlockedServicesArray
-	filters          *types.FilteringStatus
+	blockedServicesSchedule *model.BlockedServicesSchedule
-	clients          *types.Clients
+	filters                 *model.FilterStatus
-	queryLogConfig   *types.QueryLogConfig
+	clients                 *model.Clients
-	statsConfig      *types.IntervalConfig
+	queryLogConfig          *model.QueryLogConfig
-	accessList       *types.AccessList
+	statsConfig             *model.StatsConfig
-	dnsConfig        *types.DNSConfig
+	accessList              *model.AccessList
-	dhcpServerConfig *types.DHCPServerConfig
+	dnsConfig               *model.DNSConfig
-	parental         bool
+	dhcpServerConfig        *model.DhcpStatus
-	safeSearch       bool
+	parental                bool
-	safeBrowsing     bool
+	safeSearch              *model.SafeSearchConfig
+	profileInfo             *model.ProfileInfo
+	safeBrowsing            bool
 }

pkg/sync/sync_test.go

@@ -4,14 +4,19 @@ import (
 	"errors"
 
 	"github.com/bakito/adguardhome-sync/pkg/client"
+	"github.com/bakito/adguardhome-sync/pkg/client/model"
 	clientmock "github.com/bakito/adguardhome-sync/pkg/mocks/client"
 	"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"
 )
 
+var boolTrue = true
+
 var _ = Describe("Sync", func() {
 	var (
 		mockCtrl *gm.Controller
@@ -58,15 +63,15 @@ var _ = Describe("Sync", func() {
 			var (
 				domain string
 				answer string
-				reO    types.RewriteEntries
+				reO    model.RewriteEntries
-				reR    types.RewriteEntries
+				reR    model.RewriteEntries
 			)
 
 			BeforeEach(func() {
 				domain = uuid.NewString()
 				answer = uuid.NewString()
-				reO = []types.RewriteEntry{{Domain: domain, Answer: answer}}
+				reO = []model.RewriteEntry{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
-				reR = []types.RewriteEntry{{Domain: domain, Answer: answer}}
+				reR = []model.RewriteEntry{{Domain: utils.Ptr(domain), Answer: utils.Ptr(answer)}}
 			})
 			It("should have no changes (empty slices)", func() {
 				cl.EXPECT().RewriteList().Return(&reR, nil)
@@ -76,7 +81,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should add one rewrite entry", func() {
-				reR = []types.RewriteEntry{}
+				reR = []model.RewriteEntry{}
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries(reO[0])
 				cl.EXPECT().DeleteRewriteEntries()
@@ -84,7 +89,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should remove one rewrite entry", func() {
-				reO = []types.RewriteEntry{}
+				reO = []model.RewriteEntry{}
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries(reR[0])
@@ -92,7 +97,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should remove one rewrite entry", func() {
-				reO = []types.RewriteEntry{}
+				reO = []model.RewriteEntry{}
 				cl.EXPECT().RewriteList().Return(&reR, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries(reR[0])
@@ -106,13 +111,13 @@ var _ = Describe("Sync", func() {
 			})
 			It("should return error when error on AddRewriteEntries()", func() {
 				cl.EXPECT().RewriteList().Return(&reR, nil)
+				cl.EXPECT().DeleteRewriteEntries()
 				cl.EXPECT().AddRewriteEntries().Return(te)
 				err := w.syncRewrites(l, &reO, cl)
 				Ω(err).Should(HaveOccurred())
 			})
 			It("should return error when error on DeleteRewriteEntries()", func() {
 				cl.EXPECT().RewriteList().Return(&reR, nil)
-				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries().Return(te)
 				err := w.syncRewrites(l, &reO, cl)
 				Ω(err).Should(HaveOccurred())
@@ -120,14 +125,14 @@ var _ = Describe("Sync", func() {
 		})
 		Context("syncClients", func() {
 			var (
-				clO  *types.Clients
+				clO  *model.Clients
-				clR  *types.Clients
+				clR  *model.Clients
 				name string
 			)
 			BeforeEach(func() {
 				name = uuid.NewString()
-				clO = &types.Clients{Clients: []types.Client{{Name: name}}}
+				clO = &model.Clients{Clients: &model.ClientsArray{{Name: utils.Ptr(name)}}}
-				clR = &types.Clients{Clients: []types.Client{{Name: name}}}
+				clR = &model.Clients{Clients: &model.ClientsArray{{Name: utils.Ptr(name)}}}
 			})
 			It("should have no changes (empty slices)", func() {
 				cl.EXPECT().Clients().Return(clR, nil)
@@ -138,29 +143,29 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should add one client", func() {
-				clR.Clients = []types.Client{}
+				clR.Clients = &model.ClientsArray{}
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients(clO.Clients[0])
+				cl.EXPECT().AddClients(&(*clO.Clients)[0])
 				cl.EXPECT().UpdateClients()
 				cl.EXPECT().DeleteClients()
 				err := w.syncClients(clO, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should update one client", func() {
-				clR.Clients[0].Disallowed = true
+				(*clR.Clients)[0].FilteringEnabled = utils.Ptr(true)
 				cl.EXPECT().Clients().Return(clR, nil)
 				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients(clO.Clients[0])
+				cl.EXPECT().UpdateClients(&(*clO.Clients)[0])
 				cl.EXPECT().DeleteClients()
 				err := w.syncClients(clO, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should delete one client", func() {
-				clO.Clients = []types.Client{}
+				clO.Clients = &model.ClientsArray{}
 				cl.EXPECT().Clients().Return(clR, nil)
 				cl.EXPECT().AddClients()
 				cl.EXPECT().UpdateClients()
-				cl.EXPECT().DeleteClients(clR.Clients[0])
+				cl.EXPECT().DeleteClients(&(*clR.Clients)[0])
 				err := w.syncClients(clO, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
@@ -171,12 +176,14 @@ var _ = Describe("Sync", func() {
 			})
 			It("should return error when error on AddClients()", func() {
 				cl.EXPECT().Clients().Return(clR, nil)
+				cl.EXPECT().DeleteClients()
 				cl.EXPECT().AddClients().Return(te)
 				err := w.syncClients(clO, cl)
 				Ω(err).Should(HaveOccurred())
 			})
 			It("should return error when error on UpdateClients()", func() {
 				cl.EXPECT().Clients().Return(clR, nil)
+				cl.EXPECT().DeleteClients()
 				cl.EXPECT().AddClients()
 				cl.EXPECT().UpdateClients().Return(te)
 				err := w.syncClients(clO, cl)
@@ -184,8 +191,6 @@ var _ = Describe("Sync", func() {
 			})
 			It("should return error when error on DeleteClients()", func() {
 				cl.EXPECT().Clients().Return(clR, nil)
-				cl.EXPECT().AddClients()
-				cl.EXPECT().UpdateClients()
 				cl.EXPECT().DeleteClients().Return(te)
 				err := w.syncClients(clO, cl)
 				Ω(err).Should(HaveOccurred())
@@ -194,17 +199,24 @@ var _ = Describe("Sync", func() {
 		Context("syncGeneralSettings", func() {
 			var (
 				o  *origin
-				rs *types.Status
+				rs *model.ServerStatus
 			)
 			BeforeEach(func() {
 				o = &origin{
-					status: &types.Status{},
+					profileInfo: &model.ProfileInfo{
+						Name:     "origin",
+						Language: "en",
+						Theme:    "auto",
+					},
+					status:     &model.ServerStatus{},
+					safeSearch: &model.SafeSearchConfig{},
 				}
-				rs = &types.Status{}
+				rs = &model.ServerStatus{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
 				cl.EXPECT().SafeBrowsing()
 				err := w.syncGeneralSettings(o, rs, cl)
 				Ω(err).ShouldNot(HaveOccurred())
@@ -213,7 +225,8 @@ var _ = Describe("Sync", func() {
 				o.status.ProtectionEnabled = true
 				cl.EXPECT().ToggleProtection(true)
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
 				cl.EXPECT().SafeBrowsing()
 				err := w.syncGeneralSettings(o, rs, cl)
 				Ω(err).ShouldNot(HaveOccurred())
@@ -222,24 +235,82 @@ var _ = Describe("Sync", func() {
 				o.parental = true
 				cl.EXPECT().Parental()
 				cl.EXPECT().ToggleParental(true)
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
 				cl.EXPECT().SafeBrowsing()
 				err := w.syncGeneralSettings(o, rs, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have safeSearch enabled changes", func() {
-				o.safeSearch = true
+				o.safeSearch = &model.SafeSearchConfig{Enabled: utils.Ptr(true)}
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
-				cl.EXPECT().ToggleSafeSearch(true)
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SetSafeSearchConfig(o.safeSearch)
 				cl.EXPECT().SafeBrowsing()
 				err := w.syncGeneralSettings(o, rs, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
+			It("should have Duckduckgo safeSearch enabled changed", func() {
+				o.safeSearch = &model.SafeSearchConfig{Duckduckgo: utils.Ptr(true)}
+				cl.EXPECT().Parental()
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{Google: utils.Ptr(true)}, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().SetSafeSearchConfig(o.safeSearch)
+
+				err := w.syncGeneralSettings(o, rs, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should have profileInfo language changed", func() {
+				o.profileInfo.Language = "de"
+				cl.EXPECT().Parental()
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en"}, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().SetProfileInfo(&model.ProfileInfo{
+					Language: "de",
+					Name:     "replica",
+					Theme:    "auto",
+				})
+				err := w.syncGeneralSettings(o, rs, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should not sync profileInfo if language is not set", func() {
+				o.profileInfo.Language = ""
+				cl.EXPECT().Parental()
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
+				err := w.syncGeneralSettings(o, rs, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should not sync profileInfo if language is not set", func() {
+				o.profileInfo.Language = ""
+				cl.EXPECT().Parental()
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
+				err := w.syncGeneralSettings(o, rs, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
+			It("should not sync profileInfo if theme is not set", func() {
+				o.profileInfo.Theme = ""
+				cl.EXPECT().Parental()
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{Name: "replica", Language: "en", Theme: "auto"}, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().SetProfileInfo(o.profileInfo).Times(0)
+				err := w.syncGeneralSettings(o, rs, cl)
+				Ω(err).ShouldNot(HaveOccurred())
+			})
 			It("should have safeBrowsing enabled changes", func() {
 				o.safeBrowsing = true
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().ProfileInfo().Return(o.profileInfo, nil)
+				cl.EXPECT().SafeSearchConfig().Return(o.safeSearch, nil)
 				cl.EXPECT().SafeBrowsing()
 				cl.EXPECT().ToggleSafeBrowsing(true)
 				err := w.syncGeneralSettings(o, rs, cl)
@@ -249,16 +320,16 @@ var _ = Describe("Sync", func() {
 		Context("syncConfigs", func() {
 			var (
 				o   *origin
-				qlc *types.QueryLogConfig
+				qlc *model.QueryLogConfig
-				sc  *types.IntervalConfig
+				sc  *model.StatsConfig
 			)
 			BeforeEach(func() {
 				o = &origin{
-					queryLogConfig: &types.QueryLogConfig{},
+					queryLogConfig: &model.QueryLogConfig{},
-					statsConfig:    &types.IntervalConfig{},
+					statsConfig:    &model.StatsConfig{},
 				}
-				qlc = &types.QueryLogConfig{}
+				qlc = &model.QueryLogConfig{}
-				sc = &types.IntervalConfig{}
+				sc = &model.StatsConfig{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
@@ -267,29 +338,31 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have QueryLogConfig changes", func() {
-				o.queryLogConfig.Interval = 123
+				var interval model.QueryLogConfigInterval = 123
+				o.queryLogConfig.Interval = &interval
 				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
-				cl.EXPECT().SetQueryLogConfig(false, 123.0, false)
+				cl.EXPECT().SetQueryLogConfig(&model.QueryLogConfig{AnonymizeClientIp: nil, Interval: &interval, Enabled: nil})
 				cl.EXPECT().StatsConfig().Return(sc, nil)
 				err := w.syncConfigs(o, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have StatsConfig changes", func() {
-				o.statsConfig.Interval = 123
+				var interval model.StatsConfigInterval = 123
+				o.statsConfig.Interval = &interval
 				cl.EXPECT().QueryLogConfig().Return(qlc, nil)
 				cl.EXPECT().StatsConfig().Return(sc, nil)
-				cl.EXPECT().SetStatsConfig(123.0)
+				cl.EXPECT().SetStatsConfig(&model.StatsConfig{Interval: &interval})
 				err := w.syncConfigs(o, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
 		Context("statusWithSetup", func() {
 			var (
-				status *types.Status
+				status *model.ServerStatus
 				inst   types.AdGuardInstance
 			)
 			BeforeEach(func() {
-				status = &types.Status{}
+				status = &model.ServerStatus{}
 				inst = types.AdGuardInstance{
 					AutoSetup: true,
 				}
@@ -318,34 +391,39 @@ var _ = Describe("Sync", func() {
 		})
 		Context("syncServices", func() {
 			var (
-				os types.Services
+				obs  *model.BlockedServicesArray
-				rs types.Services
+				rbs  *model.BlockedServicesArray
+				obss *model.BlockedServicesSchedule
 			)
 			BeforeEach(func() {
-				os = []string{"foo"}
+				obs = &model.BlockedServicesArray{"foo"}
-				rs = []string{"foo"}
+				rbs = &model.BlockedServicesArray{"foo"}
+				obss = &model.BlockedServicesSchedule{}
 			})
 			It("should have no changes", func() {
-				cl.EXPECT().Services().Return(rs, nil)
+				cl.EXPECT().BlockedServices().Return(rbs, nil)
-				err := w.syncServices(os, cl)
+				cl.EXPECT().BlockedServicesSchedule().Return(obss, nil)
+				err := w.syncServices(obs, obss, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
-			It("should have services changes", func() {
+			It("should have blockedServices changes", func() {
-				os = []string{"bar"}
+				obs = &model.BlockedServicesArray{"bar"}
-				cl.EXPECT().Services().Return(rs, nil)
+
-				cl.EXPECT().SetServices(os)
+				cl.EXPECT().BlockedServices().Return(rbs, nil)
-				err := w.syncServices(os, cl)
+				cl.EXPECT().BlockedServicesSchedule().Return(obss, nil)
+				cl.EXPECT().SetBlockedServices(obs)
+				err := w.syncServices(obs, obss, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 		})
 		Context("syncFilters", func() {
 			var (
-				of *types.FilteringStatus
+				of *model.FilterStatus
-				rf *types.FilteringStatus
+				rf *model.FilterStatus
 			)
 			BeforeEach(func() {
-				of = &types.FilteringStatus{}
+				of = &model.FilterStatus{}
-				rf = &types.FilteringStatus{}
+				rf = &model.FilterStatus{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().Filtering().Return(rf, nil)
@@ -359,7 +437,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changes user roles", func() {
-				of.UserRules = []string{"foo"}
+				of.UserRules = utils.Ptr([]string{"foo"})
 				cl.EXPECT().Filtering().Return(rf, nil)
 				cl.EXPECT().AddFilters(false)
 				cl.EXPECT().UpdateFilters(false)
@@ -372,8 +450,8 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changed filtering config", func() {
-				of.Enabled = true
+				of.Enabled = utils.Ptr(true)
-				of.Interval = 123
+				of.Interval = utils.Ptr(123)
 				cl.EXPECT().Filtering().Return(rf, nil)
 				cl.EXPECT().AddFilters(false)
 				cl.EXPECT().UpdateFilters(false)
@@ -381,7 +459,7 @@ var _ = Describe("Sync", func() {
 				cl.EXPECT().AddFilters(true)
 				cl.EXPECT().UpdateFilters(true)
 				cl.EXPECT().DeleteFilters(true)
-				cl.EXPECT().ToggleFiltering(of.Enabled, of.Interval)
+				cl.EXPECT().ToggleFiltering(*of.Enabled, *of.Interval)
 				err := w.syncFilters(of, cl)
 				Ω(err).ShouldNot(HaveOccurred())
 			})
@@ -389,16 +467,16 @@ var _ = Describe("Sync", func() {
 
 		Context("syncDNS", func() {
 			var (
-				oal *types.AccessList
+				oal *model.AccessList
-				ral *types.AccessList
+				ral *model.AccessList
-				odc *types.DNSConfig
+				odc *model.DNSConfig
-				rdc *types.DNSConfig
+				rdc *model.DNSConfig
 			)
 			BeforeEach(func() {
-				oal = &types.AccessList{}
+				oal = &model.AccessList{}
-				ral = &types.AccessList{}
+				ral = &model.AccessList{}
-				odc = &types.DNSConfig{}
+				odc = &model.DNSConfig{}
-				rdc = &types.DNSConfig{}
+				rdc = &model.DNSConfig{}
 			})
 			It("should have no changes", func() {
 				cl.EXPECT().AccessList().Return(ral, nil)
@@ -407,7 +485,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have access list changes", func() {
-				ral.BlockedHosts = []string{"foo"}
+				ral.BlockedHosts = utils.Ptr([]string{"foo"})
 				cl.EXPECT().AccessList().Return(ral, nil)
 				cl.EXPECT().DNSConfig().Return(rdc, nil)
 				cl.EXPECT().SetAccessList(oal)
@@ -415,7 +493,7 @@ var _ = Describe("Sync", func() {
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have dns config changes", func() {
-				rdc.Bootstraps = []string{"foo"}
+				rdc.BootstrapDns = utils.Ptr([]string{"foo"})
 				cl.EXPECT().AccessList().Return(ral, nil)
 				cl.EXPECT().DNSConfig().Return(rdc, nil)
 				cl.EXPECT().SetDNSConfig(odc)
@@ -426,41 +504,55 @@ var _ = Describe("Sync", func() {
 
 		Context("syncDHCPServer", func() {
 			var (
-				osc *types.DHCPServerConfig
+				osc *model.DhcpStatus
-				rsc *types.DHCPServerConfig
+				rsc *model.DhcpStatus
 			)
 			BeforeEach(func() {
-				osc = &types.DHCPServerConfig{}
+				osc = &model.DhcpStatus{V4: &model.DhcpConfigV4{
-				rsc = &types.DHCPServerConfig{}
+					GatewayIp:  utils.Ptr("1.2.3.4"),
+					RangeStart: utils.Ptr("1.2.3.5"),
+					RangeEnd:   utils.Ptr("1.2.3.6"),
+					SubnetMask: utils.Ptr("255.255.255.0"),
+				}}
+				rsc = &model.DhcpStatus{}
 				w.cfg.Features.DHCP.StaticLeases = false
 			})
 			It("should have no changes", func() {
-				cl.EXPECT().DHCPServerConfig().Return(rsc, nil)
+				rsc.V4 = osc.V4
+				cl.EXPECT().DhcpConfig().Return(rsc, nil)
 				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{})
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should have changes", func() {
-				rsc.Enabled = true
+				rsc.Enabled = utils.Ptr(true)
-				cl.EXPECT().DHCPServerConfig().Return(rsc, nil)
+				cl.EXPECT().DhcpConfig().Return(rsc, nil)
-				cl.EXPECT().SetDHCPServerConfig(osc)
+				cl.EXPECT().SetDhcpConfig(osc)
 				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{})
 				Ω(err).ShouldNot(HaveOccurred())
 			})
 			It("should use replica interface name", func() {
-				cl.EXPECT().DHCPServerConfig().Return(rsc, nil)
+				cl.EXPECT().DhcpConfig().Return(rsc, nil)
 				oscClone := osc.Clone()
-				oscClone.InterfaceName = "foo"
+				oscClone.InterfaceName = utils.Ptr("foo")
-				cl.EXPECT().SetDHCPServerConfig(oscClone)
+				cl.EXPECT().SetDhcpConfig(oscClone)
 				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{InterfaceName: "foo"})
 				Ω(err).ShouldNot(HaveOccurred())
 			})
+			It("should enable the target dhcp server", func() {
+				cl.EXPECT().DhcpConfig().Return(rsc, nil)
+				oscClone := osc.Clone()
+				oscClone.Enabled = utils.Ptr(true)
+				cl.EXPECT().SetDhcpConfig(oscClone)
+				err := w.syncDHCPServer(osc, cl, types.AdGuardInstance{DHCPServerEnabled: &boolTrue})
+				Ω(err).ShouldNot(HaveOccurred())
+			})
 		})
 
 		Context("sync", func() {
 			BeforeEach(func() {
 				w.cfg = &types.Config{
 					Origin:  types.AdGuardInstance{},
-					Replica: types.AdGuardInstance{URL: "foo"},
+					Replica: &types.AdGuardInstance{URL: "foo"},
 					Features: types.Features{
 						DHCP: types.DHCP{
 							ServerConfig: true,
@@ -483,76 +575,131 @@ var _ = Describe("Sync", func() {
 			It("should have no changes", func() {
 				// origin
 				cl.EXPECT().Host()
-				cl.EXPECT().Status().Return(&types.Status{Version: minAghVersion}, nil)
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil)
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil)
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
 				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().RewriteList().Return(&types.RewriteEntries{}, nil)
+				cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil)
-				cl.EXPECT().Services()
+				cl.EXPECT().BlockedServices()
-				cl.EXPECT().Filtering().Return(&types.FilteringStatus{}, nil)
+				cl.EXPECT().BlockedServicesSchedule()
-				cl.EXPECT().Clients().Return(&types.Clients{}, nil)
+				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
-				cl.EXPECT().QueryLogConfig().Return(&types.QueryLogConfig{}, nil)
+				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
-				cl.EXPECT().StatsConfig().Return(&types.IntervalConfig{}, nil)
+				cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil)
-				cl.EXPECT().AccessList().Return(&types.AccessList{}, nil)
+				cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil)
-				cl.EXPECT().DNSConfig().Return(&types.DNSConfig{}, nil)
+				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
-				cl.EXPECT().DHCPServerConfig().Return(&types.DHCPServerConfig{}, nil)
+				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
+				cl.EXPECT().DhcpConfig().Return(&model.DhcpStatus{}, nil)
 
 				// replica
 				cl.EXPECT().Host()
-				cl.EXPECT().Status().Return(&types.Status{Version: minAghVersion}, nil)
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil)
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil)
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
 				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().QueryLogConfig().Return(&types.QueryLogConfig{}, nil)
+				cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil)
-				cl.EXPECT().StatsConfig().Return(&types.IntervalConfig{}, nil)
+				cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil)
-				cl.EXPECT().RewriteList().Return(&types.RewriteEntries{}, nil)
+				cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil)
 				cl.EXPECT().AddRewriteEntries()
 				cl.EXPECT().DeleteRewriteEntries()
-				cl.EXPECT().Filtering().Return(&types.FilteringStatus{}, nil)
+				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
 				cl.EXPECT().AddFilters(false)
 				cl.EXPECT().UpdateFilters(false)
 				cl.EXPECT().DeleteFilters(false)
 				cl.EXPECT().AddFilters(true)
 				cl.EXPECT().UpdateFilters(true)
 				cl.EXPECT().DeleteFilters(true)
-				cl.EXPECT().Services()
+				cl.EXPECT().BlockedServices()
-				cl.EXPECT().Clients().Return(&types.Clients{}, nil)
+				cl.EXPECT().BlockedServicesSchedule()
+				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
 				cl.EXPECT().AddClients()
 				cl.EXPECT().UpdateClients()
 				cl.EXPECT().DeleteClients()
-				cl.EXPECT().AccessList().Return(&types.AccessList{}, nil)
+				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
-				cl.EXPECT().DNSConfig().Return(&types.DNSConfig{}, nil)
+				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
-				cl.EXPECT().DHCPServerConfig().Return(&types.DHCPServerConfig{}, nil)
+				cl.EXPECT().DhcpConfig().Return(&model.DhcpStatus{}, nil)
 				cl.EXPECT().AddDHCPStaticLeases().Return(nil)
 				cl.EXPECT().DeleteDHCPStaticLeases().Return(nil)
 				w.sync()
 			})
+			It("should not sync DHCP", func() {
+				w.cfg.Features.DHCP.ServerConfig = false
+				w.cfg.Features.DHCP.StaticLeases = false
+				// origin
+				cl.EXPECT().Host()
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil)
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil)
+				cl.EXPECT().Parental()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil)
+				cl.EXPECT().BlockedServices()
+				cl.EXPECT().BlockedServicesSchedule()
+				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
+				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
+				cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil)
+				cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil)
+				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
+				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
+
+				// replica
+				cl.EXPECT().Host()
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil)
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil)
+				cl.EXPECT().Parental()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
+				cl.EXPECT().SafeBrowsing()
+				cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil)
+				cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil)
+				cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil)
+				cl.EXPECT().AddRewriteEntries()
+				cl.EXPECT().DeleteRewriteEntries()
+				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
+				cl.EXPECT().AddFilters(false)
+				cl.EXPECT().UpdateFilters(false)
+				cl.EXPECT().DeleteFilters(false)
+				cl.EXPECT().AddFilters(true)
+				cl.EXPECT().UpdateFilters(true)
+				cl.EXPECT().DeleteFilters(true)
+				cl.EXPECT().BlockedServices()
+				cl.EXPECT().BlockedServicesSchedule()
+				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
+				cl.EXPECT().AddClients()
+				cl.EXPECT().UpdateClients()
+				cl.EXPECT().DeleteClients()
+				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
+				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
+				w.sync()
+			})
 			It("origin version is too small", func() {
 				// origin
 				cl.EXPECT().Host()
-				cl.EXPECT().Status().Return(&types.Status{Version: "v0.106.9"}, nil)
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: "v0.106.9"}, nil)
 				w.sync()
 			})
 			It("replica version is too small", func() {
 				// origin
 				cl.EXPECT().Host()
-				cl.EXPECT().Status().Return(&types.Status{Version: minAghVersion}, nil)
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: versions.MinAgh}, nil)
+				cl.EXPECT().ProfileInfo().Return(&model.ProfileInfo{}, nil)
 				cl.EXPECT().Parental()
-				cl.EXPECT().SafeSearch()
+				cl.EXPECT().SafeSearchConfig().Return(&model.SafeSearchConfig{}, nil)
 				cl.EXPECT().SafeBrowsing()
-				cl.EXPECT().RewriteList().Return(&types.RewriteEntries{}, nil)
+				cl.EXPECT().RewriteList().Return(&model.RewriteEntries{}, nil)
-				cl.EXPECT().Services()
+				cl.EXPECT().BlockedServices()
-				cl.EXPECT().Filtering().Return(&types.FilteringStatus{}, nil)
+				cl.EXPECT().BlockedServicesSchedule()
-				cl.EXPECT().Clients().Return(&types.Clients{}, nil)
+				cl.EXPECT().Filtering().Return(&model.FilterStatus{}, nil)
-				cl.EXPECT().QueryLogConfig().Return(&types.QueryLogConfig{}, nil)
+				cl.EXPECT().Clients().Return(&model.Clients{}, nil)
-				cl.EXPECT().StatsConfig().Return(&types.IntervalConfig{}, nil)
+				cl.EXPECT().QueryLogConfig().Return(&model.QueryLogConfig{}, nil)
-				cl.EXPECT().AccessList().Return(&types.AccessList{}, nil)
+				cl.EXPECT().StatsConfig().Return(&model.StatsConfig{}, nil)
-				cl.EXPECT().DNSConfig().Return(&types.DNSConfig{}, nil)
+				cl.EXPECT().AccessList().Return(&model.AccessList{}, nil)
-				cl.EXPECT().DHCPServerConfig().Return(&types.DHCPServerConfig{}, nil)
+				cl.EXPECT().DNSConfig().Return(&model.DNSConfig{}, nil)
+				cl.EXPECT().DhcpConfig().Return(&model.DhcpStatus{}, nil)
 
 				// replica
 				cl.EXPECT().Host()
-				cl.EXPECT().Status().Return(&types.Status{Version: "v0.106.9"}, nil)
+				cl.EXPECT().Status().Return(&model.ServerStatus{Version: "v0.106.9"}, nil)
 				w.sync()
 			})
 		})

pkg/types/deepcopy_generated.go

@@ -5,47 +5,54 @@
 
 package types
 
-import (
-	net "net"
-)
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DNSConfig) DeepCopyInto(out *DNSConfig) {
+func (in *AdGuardInstance) DeepCopyInto(out *AdGuardInstance) {
 	*out = *in
-	if in.Upstreams != nil {
+	if in.DHCPServerEnabled != nil {
-		in, out := &in.Upstreams, &out.Upstreams
+		in, out := &in.DHCPServerEnabled, &out.DHCPServerEnabled
-		*out = make([]string, len(*in))
+		*out = new(bool)
-		copy(*out, *in)
+		**out = **in
-	}
-	if in.Bootstraps != nil {
-		in, out := &in.Bootstraps, &out.Bootstraps
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-	if in.BlockingIPv4 != nil {
-		in, out := &in.BlockingIPv4, &out.BlockingIPv4
-		*out = make(net.IP, len(*in))
-		copy(*out, *in)
-	}
-	if in.BlockingIPv6 != nil {
-		in, out := &in.BlockingIPv6, &out.BlockingIPv6
-		*out = make(net.IP, len(*in))
-		copy(*out, *in)
-	}
-	if in.LocalPTRUpstreams != nil {
-		in, out := &in.LocalPTRUpstreams, &out.LocalPTRUpstreams
-		*out = make([]string, len(*in))
-		copy(*out, *in)
 	}
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DNSConfig.
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AdGuardInstance.
-func (in *DNSConfig) DeepCopy() *DNSConfig {
+func (in *AdGuardInstance) DeepCopy() *AdGuardInstance {
 	if in == nil {
 		return nil
 	}
-	out := new(DNSConfig)
+	out := new(AdGuardInstance)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Config) DeepCopyInto(out *Config) {
+	*out = *in
+	in.Origin.DeepCopyInto(&out.Origin)
+	if in.Replica != nil {
+		in, out := &in.Replica, &out.Replica
+		*out = new(AdGuardInstance)
+		(*in).DeepCopyInto(*out)
+	}
+	if in.Replicas != nil {
+		in, out := &in.Replicas, &out.Replicas
+		*out = make([]AdGuardInstance, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+	out.API = in.API
+	out.Features = in.Features
+	return
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config.
+func (in *Config) DeepCopy() *Config {
+	if in == nil {
+		return nil
+	}
+	out := new(Config)
 	in.DeepCopyInto(out)
 	return out
 }

pkg/types/dhcp.go

@@ -1,89 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-	"net"
-	"time"
-
-	"github.com/jinzhu/copier"
-)
-
-// DHCPServerConfig dhcp server config
-type DHCPServerConfig struct {
-	V4            *V4ServerConfJSON `json:"v4"`
-	V6            *V6ServerConfJSON `json:"v6"`
-	InterfaceName string            `json:"interface_name"`
-	Enabled       bool              `json:"enabled"`
-
-	Leases       Leases `json:"leases,omitempty"`
-	StaticLeases Leases `json:"static_leases,omitempty"`
-}
-
-// Clone the config
-func (c *DHCPServerConfig) Clone() *DHCPServerConfig {
-	clone := &DHCPServerConfig{}
-	_ = copier.Copy(c, clone)
-	return clone
-}
-
-// Equals dhcp server config equal check
-func (c *DHCPServerConfig) Equals(o *DHCPServerConfig) bool {
-	a, _ := json.Marshal(c)
-	b, _ := json.Marshal(o)
-	return string(a) == string(b)
-}
-
-// V4ServerConfJSON v4 server conf
-type V4ServerConfJSON struct {
-	GatewayIP     net.IP `json:"gateway_ip"`
-	SubnetMask    net.IP `json:"subnet_mask"`
-	RangeStart    net.IP `json:"range_start"`
-	RangeEnd      net.IP `json:"range_end"`
-	LeaseDuration uint32 `json:"lease_duration"`
-}
-
-// V6ServerConfJSON v6 server conf
-type V6ServerConfJSON struct {
-	RangeStart    net.IP `json:"range_start"`
-	RangeEnd      net.IP `json:"range_end"`
-	LeaseDuration uint32 `json:"lease_duration"`
-}
-
-// Leases slice of leases type
-type Leases []Lease
-
-// Merge the leases
-func (l Leases) Merge(other Leases) ([]Lease, []Lease) {
-	current := make(map[string]Lease)
-
-	var adds Leases
-	var removes Leases
-	for _, le := range l {
-		current[le.HWAddr] = le
-	}
-
-	for _, le := range other {
-		if _, ok := current[le.HWAddr]; ok {
-			delete(current, le.HWAddr)
-		} else {
-			adds = append(adds, le)
-		}
-	}
-
-	for _, rr := range current {
-		removes = append(removes, rr)
-	}
-
-	return adds, removes
-}
-
-// Lease contains the necessary information about a DHCP lease
-type Lease struct {
-	HWAddr   string `json:"mac"`
-	IP       net.IP `json:"ip"`
-	Hostname string `json:"hostname"`
-
-	// Lease expiration time
-	// 1: static lease
-	Expiry time.Time `json:"expires"`
-}

pkg/types/dns.go

@@ -1,71 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-	"net"
-	"sort"
-)
-
-// DNSConfig dns config
-// +k8s:deepcopy-gen=true
-type DNSConfig struct {
-	Upstreams     []string `json:"upstream_dns,omitempty"`
-	UpstreamsFile string   `json:"upstream_dns_file"`
-	Bootstraps    []string `json:"bootstrap_dns,omitempty"`
-
-	ProtectionEnabled bool     `json:"protection_enabled"`
-	RateLimit         uint32   `json:"ratelimit"`
-	BlockingMode      string   `json:"blocking_mode,omitempty"`
-	BlockingIPv4      net.IP   `json:"blocking_ipv4,omitempty"`
-	BlockingIPv6      net.IP   `json:"blocking_ipv6"`
-	EDNSCSEnabled     bool     `json:"edns_cs_enabled"`
-	DNSSECEnabled     bool     `json:"dnssec_enabled"`
-	DisableIPv6       bool     `json:"disable_ipv6"`
-	UpstreamMode      string   `json:"upstream_mode,omitempty"`
-	CacheSize         uint32   `json:"cache_size"`
-	CacheMinTTL       uint32   `json:"cache_ttl_min"`
-	CacheMaxTTL       uint32   `json:"cache_ttl_max"`
-	CacheOptimistic   bool     `json:"cache_optimistic"`
-	ResolveClients    bool     `json:"resolve_clients"`
-	LocalPTRUpstreams []string `json:"local_ptr_upstreams,omitempty"`
-}
-
-// Equals dns config equal check
-func (c *DNSConfig) Equals(o *DNSConfig) bool {
-	cc := c.DeepCopy()
-	oo := o.DeepCopy()
-	cc.Sort()
-	oo.Sort()
-
-	a, _ := json.Marshal(cc)
-	b, _ := json.Marshal(oo)
-	return string(a) == string(b)
-}
-
-// Sort sort dns config
-func (c *DNSConfig) Sort() {
-	sort.Strings(c.Upstreams)
-	sort.Strings(c.Bootstraps)
-	sort.Strings(c.LocalPTRUpstreams)
-}
-
-// AccessList access list
-type AccessList struct {
-	AllowedClients    []string `json:"allowed_clients"`
-	DisallowedClients []string `json:"disallowed_clients"`
-	BlockedHosts      []string `json:"blocked_hosts"`
-}
-
-// Equals access list equal check
-func (al *AccessList) Equals(o *AccessList) bool {
-	return equals(al.AllowedClients, o.AllowedClients) &&
-		equals(al.DisallowedClients, o.DisallowedClients) &&
-		equals(al.BlockedHosts, o.BlockedHosts)
-}
-
-// Sort sort access list
-func (al *AccessList) Sort() {
-	sort.Strings(al.AllowedClients)
-	sort.Strings(al.DisallowedClients)
-	sort.Strings(al.BlockedHosts)
-}

pkg/types/features.go

@@ -60,7 +60,7 @@ func (f *Features) LogDisabled(l *zap.SugaredLogger) {
 		features = append(features, "ClientSettings")
 	}
 	if !f.Services {
-		features = append(features, "Services")
+		features = append(features, "BlockedServices")
 	}
 	if !f.Filters {
 		features = append(features, "Filters")

pkg/types/types.go

@@ -1,10 +1,9 @@
 package types
 
 import (
-	"encoding/json"
 	"fmt"
-	"sort"
+
-	"strings"
+	"go.uber.org/zap"
 )
 
 const (
@@ -13,9 +12,10 @@ const (
 )
 
 // Config application configuration struct
+// +k8s:deepcopy-gen=true
 type Config struct {
 	Origin     AdGuardInstance   `json:"origin" yaml:"origin"`
-	Replica    AdGuardInstance   `json:"replica,omitempty" yaml:"replica,omitempty"`
+	Replica    *AdGuardInstance  `json:"replica,omitempty" yaml:"replica,omitempty"`
 	Replicas   []AdGuardInstance `json:"replicas,omitempty" yaml:"replicas,omitempty"`
 	Cron       string            `json:"cron,omitempty" yaml:"cron,omitempty"`
 	RunOnStart bool              `json:"runOnStart,omitempty" yaml:"runOnStart,omitempty"`
@@ -34,8 +34,8 @@ type API struct {
 // UniqueReplicas get unique replication instances
 func (cfg *Config) UniqueReplicas() []AdGuardInstance {
 	dedup := make(map[string]AdGuardInstance)
-	if cfg.Replica.URL != "" {
+	if cfg.Replica != nil && cfg.Replica.URL != "" {
-		dedup[cfg.Replica.Key()] = cfg.Replica
+		dedup[cfg.Replica.Key()] = *cfg.Replica
 	}
 	for _, replica := range cfg.Replicas {
 		if replica.URL != "" {
@@ -53,15 +53,35 @@ func (cfg *Config) UniqueReplicas() []AdGuardInstance {
 	return r
 }
 
+// Log the current config
+func (cfg *Config) Log(l *zap.SugaredLogger) {
+	c := cfg.DeepCopy()
+	c.Origin.Mask()
+	if c.Replica != nil {
+		if c.Replica.URL == "" {
+			c.Replica = nil
+		} else {
+			c.Replica.Mask()
+		}
+	}
+	for i := range c.Replicas {
+		c.Replicas[i].Mask()
+	}
+	l.With("config", c).Debug("Using config")
+}
+
 // AdGuardInstance AdguardHome config instance
+// +k8s:deepcopy-gen=true
 type AdGuardInstance struct {
 	URL                string `json:"url" yaml:"url"`
 	APIPath            string `json:"apiPath,omitempty" yaml:"apiPath,omitempty"`
 	Username           string `json:"username,omitempty" yaml:"username,omitempty"`
 	Password           string `json:"password,omitempty" yaml:"password,omitempty"`
+	Cookie             string `json:"cookie,omitempty" yaml:"cookie,omitempty"`
 	InsecureSkipVerify bool   `json:"insecureSkipVerify" yaml:"insecureSkipVerify"`
 	AutoSetup          bool   `json:"autoSetup" yaml:"autoSetup"`
 	InterfaceName      string `json:"interfaceName" yaml:"interfaceName"`
+	DHCPServerEnabled  *bool  `json:"dhcpServerEnabled,omitempty" yaml:"dhcpServerEnabled,omitempty"`
 }
 
 // Key AdGuardInstance key
@@ -69,295 +89,24 @@ func (i *AdGuardInstance) Key() string {
 	return fmt.Sprintf("%s#%s", i.URL, i.APIPath)
 }
 
+// Mask maks username and password
+func (i *AdGuardInstance) Mask() {
+	i.Username = mask(i.Username)
+	i.Password = mask(i.Password)
+}
+
+func mask(s string) string {
+	if s == "" {
+		return "***"
+	}
+	return fmt.Sprintf("%v***%v", string(s[0]), string(s[len(s)-1]))
+}
+
 // Protection API struct
 type Protection struct {
 	ProtectionEnabled bool `json:"protection_enabled"`
 }
 
-// Status API struct
-type Status struct {
-	Protection
-	DNSAddresses  []string `json:"dns_addresses"`
-	DNSPort       int      `json:"dns_port"`
-	HTTPPort      int      `json:"http_port"`
-	DhcpAvailable bool     `json:"dhcp_available"`
-	Running       bool     `json:"running"`
-	Version       string   `json:"version"`
-	Language      string   `json:"language"`
-}
-
-// RewriteEntries list of RewriteEntry
-type RewriteEntries []RewriteEntry
-
-// Merge RewriteEntries
-func (rwe *RewriteEntries) Merge(other *RewriteEntries) (RewriteEntries, RewriteEntries, RewriteEntries) {
-	current := make(map[string]RewriteEntry)
-
-	var adds RewriteEntries
-	var removes RewriteEntries
-	var duplicates RewriteEntries
-	processed := make(map[string]bool)
-	for _, rr := range *rwe {
-		if _, ok := processed[rr.Key()]; !ok {
-			current[rr.Key()] = rr
-			processed[rr.Key()] = true
-		} else {
-			// remove duplicate
-			removes = append(removes, rr)
-		}
-	}
-
-	for _, rr := range *other {
-		if _, ok := current[rr.Key()]; ok {
-			delete(current, rr.Key())
-		} else {
-			if _, ok := processed[rr.Key()]; !ok {
-				adds = append(adds, rr)
-				processed[rr.Key()] = true
-			} else {
-				//	skip duplicate
-				duplicates = append(duplicates, rr)
-			}
-		}
-	}
-
-	for _, rr := range current {
-		removes = append(removes, rr)
-	}
-
-	return adds, removes, duplicates
-}
-
-// RewriteEntry API struct
-type RewriteEntry struct {
-	Domain string `json:"domain"`
-	Answer string `json:"answer"`
-}
-
-// Key RewriteEntry key
-func (re *RewriteEntry) Key() string {
-	return fmt.Sprintf("%s#%s", re.Domain, re.Answer)
-}
-
-// Filters list of Filter
-type Filters []Filter
-
-// Merge merge Filters
-func (f Filters) Merge(other Filters) (Filters, Filters, Filters) {
-	current := make(map[string]Filter)
-
-	var adds Filters
-	var updates Filters
-	var removes Filters
-	for _, f := range f {
-		current[f.URL] = f
-	}
-
-	for i := range other {
-		rr := other[i]
-		if c, ok := current[rr.URL]; ok {
-			if !c.Equals(&rr) {
-				updates = append(updates, rr)
-			}
-			delete(current, rr.URL)
-		} else {
-			adds = append(adds, rr)
-		}
-	}
-
-	for _, rr := range current {
-		removes = append(removes, rr)
-	}
-
-	return adds, updates, removes
-}
-
-// Filter API struct
-type Filter struct {
-	ID         int    `json:"id"`
-	Enabled    bool   `json:"enabled"`
-	URL        string `json:"url"`  // needed for add
-	Name       string `json:"name"` // needed for add
-	RulesCount int    `json:"rules_count"`
-	Whitelist  bool   `json:"whitelist"` // needed for add
-}
-
-// Equals Filter equal check
-func (f *Filter) Equals(o *Filter) bool {
-	return f.Enabled == o.Enabled && f.URL == o.URL && f.Name == o.Name
-}
-
-// FilterUpdate  API struct
-type FilterUpdate struct {
-	URL       string `json:"url"`
-	Data      Filter `json:"data"`
-	Whitelist bool   `json:"whitelist"`
-}
-
-// FilteringStatus API struct
-type FilteringStatus struct {
-	FilteringConfig
-	Filters          Filters   `json:"filters"`
-	WhitelistFilters Filters   `json:"whitelist_filters"`
-	UserRules        UserRules `json:"user_rules"`
-}
-
-// UserRules API struct
-type UserRules []string
-
-// String toString of Users
-func (ur UserRules) String() string {
-	return strings.Join(ur, "\n")
-}
-
-// EnableConfig API struct
-type EnableConfig struct {
-	Enabled bool `json:"enabled"`
-}
-
-// IntervalConfig API struct
-type IntervalConfig struct {
-	Interval float64 `json:"interval"`
-}
-
-// FilteringConfig API struct
-type FilteringConfig struct {
-	EnableConfig
-	IntervalConfig
-}
-
-// QueryLogConfig API struct
-type QueryLogConfig struct {
-	EnableConfig
-	IntervalConfig
-	AnonymizeClientIP bool `json:"anonymize_client_ip"`
-}
-
-// Equals QueryLogConfig equal check
-func (qlc *QueryLogConfig) Equals(o *QueryLogConfig) bool {
-	return qlc.Enabled == o.Enabled && qlc.AnonymizeClientIP == o.AnonymizeClientIP && qlc.Interval == o.Interval
-}
-
-// RefreshFilter API struct
-type RefreshFilter struct {
-	Whitelist bool `json:"whitelist"`
-}
-
-// Services API struct
-type Services []string
-
-// Sort sort Services
-func (s Services) Sort() {
-	sort.Strings(s)
-}
-
-// Equals Services equal check
-func (s Services) Equals(o Services) bool {
-	s.Sort()
-	o.Sort()
-	return equals(s, o)
-}
-
-// Clients API struct
-type Clients struct {
-	Clients     []Client `json:"clients"`
-	AutoClients []struct {
-		IP        string   `json:"ip"`
-		Name      string   `json:"name"`
-		Source    string   `json:"source"`
-		WhoisInfo struct{} `json:"whois_info"`
-	} `json:"auto_clients"`
-	SupportedTags []string `json:"supported_tags"`
-}
-
-// Client API struct
-type Client struct {
-	Ids             []string `json:"ids,omitempty"`
-	Tags            []string `json:"tags,omitempty"`
-	BlockedServices []string `json:"blocked_services,omitempty"`
-	Upstreams       []string `json:"upstreams,omitempty"`
-
-	UseGlobalSettings        bool   `json:"use_global_settings"`
-	UseGlobalBlockedServices bool   `json:"use_global_blocked_services"`
-	Name                     string `json:"name"`
-	FilteringEnabled         bool   `json:"filtering_enabled"`
-	ParentalEnabled          bool   `json:"parental_enabled"`
-	SafesearchEnabled        bool   `json:"safesearch_enabled"`
-	SafebrowsingEnabled      bool   `json:"safebrowsing_enabled"`
-	Disallowed               bool   `json:"disallowed"`
-	DisallowedRule           string `json:"disallowed_rule"`
-}
-
-// Sort sort clients
-func (cl *Client) Sort() {
-	sort.Strings(cl.Ids)
-	sort.Strings(cl.Tags)
-	sort.Strings(cl.BlockedServices)
-	sort.Strings(cl.Upstreams)
-}
-
-// Equals Clients equal check
-func (cl *Client) Equals(o *Client) bool {
-	cl.Sort()
-	o.Sort()
-
-	a, _ := json.Marshal(cl)
-	b, _ := json.Marshal(o)
-	return string(a) == string(b)
-}
-
-// Merge merge Clients
-func (clients *Clients) Merge(other *Clients) ([]Client, []Client, []Client) {
-	current := make(map[string]Client)
-	for _, client := range clients.Clients {
-		current[client.Name] = client
-	}
-
-	expected := make(map[string]Client)
-	for _, client := range other.Clients {
-		expected[client.Name] = client
-	}
-
-	var adds []Client
-	var removes []Client
-	var updates []Client
-
-	for _, cl := range expected {
-		if oc, ok := current[cl.Name]; ok {
-			if !cl.Equals(&oc) {
-				updates = append(updates, cl)
-			}
-			delete(current, cl.Name)
-		} else {
-			adds = append(adds, cl)
-		}
-	}
-
-	for _, rr := range current {
-		removes = append(removes, rr)
-	}
-
-	return adds, updates, removes
-}
-
-// ClientUpdate API struct
-type ClientUpdate struct {
-	Name string `json:"name"`
-	Data Client `json:"data"`
-}
-
-func equals(a []string, b []string) bool {
-	if len(a) != len(b) {
-		return false
-	}
-	for i, v := range a {
-		if v != b[i] {
-			return false
-		}
-	}
-	return true
-}
-
 // InstallConfig AdguardHome install config
 type InstallConfig struct {
 	Web      InstallPort `json:"web"`

pkg/types/types_test.go

@@ -1,342 +0,0 @@
-package types_test
-
-import (
-	"encoding/json"
-	"io/ioutil"
-
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/google/uuid"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Types", func() {
-	var (
-		url     string
-		apiPath string
-	)
-	BeforeEach(func() {
-		url = "https://" + uuid.NewString()
-		apiPath = "/" + uuid.NewString()
-	})
-
-	Context("FilteringStatus", func() {
-		It("should correctly parse json", func() {
-			b, err := ioutil.ReadFile("../..//testdata/filtering-status.json")
-			fs := &types.FilteringStatus{}
-			Ω(err).ShouldNot(HaveOccurred())
-			err = json.Unmarshal(b, fs)
-			Ω(err).ShouldNot(HaveOccurred())
-		})
-	})
-
-	Context("Filters", func() {
-		Context("Merge", func() {
-			var (
-				originFilters  types.Filters
-				replicaFilters types.Filters
-			)
-			BeforeEach(func() {
-				originFilters = types.Filters{}
-				replicaFilters = types.Filters{}
-			})
-
-			It("should add a missing filter", func() {
-				originFilters = append(originFilters, types.Filter{URL: url})
-				a, u, d := replicaFilters.Merge(originFilters)
-				Ω(a).Should(HaveLen(1))
-				Ω(u).Should(BeEmpty())
-				Ω(d).Should(BeEmpty())
-
-				Ω(a[0].URL).Should(Equal(url))
-			})
-
-			It("should remove additional filter", func() {
-				replicaFilters = append(replicaFilters, types.Filter{URL: url})
-				a, u, d := replicaFilters.Merge(originFilters)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(BeEmpty())
-				Ω(d).Should(HaveLen(1))
-
-				Ω(d[0].URL).Should(Equal(url))
-			})
-
-			It("should update existing filter when enabled differs", func() {
-				enabled := true
-				originFilters = append(originFilters, types.Filter{URL: url, Enabled: enabled})
-				replicaFilters = append(replicaFilters, types.Filter{URL: url, Enabled: !enabled})
-				a, u, d := replicaFilters.Merge(originFilters)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(HaveLen(1))
-				Ω(d).Should(BeEmpty())
-
-				Ω(u[0].Enabled).Should(Equal(enabled))
-			})
-
-			It("should update existing filter when name differs", func() {
-				name1 := uuid.NewString()
-				name2 := uuid.NewString()
-				originFilters = append(originFilters, types.Filter{URL: url, Name: name1})
-				replicaFilters = append(replicaFilters, types.Filter{URL: url, Name: name2})
-				a, u, d := replicaFilters.Merge(originFilters)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(HaveLen(1))
-				Ω(d).Should(BeEmpty())
-
-				Ω(u[0].Name).Should(Equal(name1))
-			})
-
-			It("should have no changes", func() {
-				originFilters = append(originFilters, types.Filter{URL: url})
-				replicaFilters = append(replicaFilters, types.Filter{URL: url})
-				a, u, d := replicaFilters.Merge(originFilters)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(BeEmpty())
-				Ω(d).Should(BeEmpty())
-			})
-		})
-	})
-	Context("AdGuardInstance", func() {
-		It("should build a key with url and api apiPath", func() {
-			i := &types.AdGuardInstance{URL: url, APIPath: apiPath}
-			Ω(i.Key()).Should(Equal(url + "#" + apiPath))
-		})
-	})
-	Context("RewriteEntry", func() {
-		It("should build a key with url and api apiPath", func() {
-			domain := uuid.NewString()
-			answer := uuid.NewString()
-			re := &types.RewriteEntry{Domain: domain, Answer: answer}
-			Ω(re.Key()).Should(Equal(domain + "#" + answer))
-		})
-	})
-	Context("QueryLogConfig", func() {
-		Context("Equal", func() {
-			var (
-				a *types.QueryLogConfig
-				b *types.QueryLogConfig
-			)
-			BeforeEach(func() {
-				a = &types.QueryLogConfig{}
-				b = &types.QueryLogConfig{}
-			})
-			It("should be equal", func() {
-				a.Enabled = true
-				a.Interval = 1
-				a.AnonymizeClientIP = true
-				b.Enabled = true
-				b.Interval = 1
-				b.AnonymizeClientIP = true
-				Ω(a.Equals(b)).Should(BeTrue())
-			})
-			It("should not be equal when enabled differs", func() {
-				a.Enabled = true
-				b.Enabled = false
-				Ω(a.Equals(b)).ShouldNot(BeTrue())
-			})
-			It("should not be equal when interval differs", func() {
-				a.Interval = 1
-				b.Interval = 2
-				Ω(a.Equals(b)).ShouldNot(BeTrue())
-			})
-			It("should not be equal when anonymizeClientIP differs", func() {
-				a.AnonymizeClientIP = true
-				b.AnonymizeClientIP = false
-				Ω(a.Equals(b)).ShouldNot(BeTrue())
-			})
-		})
-	})
-	Context("RewriteEntries", func() {
-		Context("Merge", func() {
-			var (
-				originRE  types.RewriteEntries
-				replicaRE types.RewriteEntries
-				domain    string
-			)
-			BeforeEach(func() {
-				originRE = types.RewriteEntries{}
-				replicaRE = types.RewriteEntries{}
-				domain = uuid.NewString()
-			})
-
-			It("should add a missing rewrite entry", func() {
-				originRE = append(originRE, types.RewriteEntry{Domain: domain})
-				a, r, d := replicaRE.Merge(&originRE)
-				Ω(a).Should(HaveLen(1))
-				Ω(r).Should(BeEmpty())
-				Ω(d).Should(BeEmpty())
-
-				Ω(a[0].Domain).Should(Equal(domain))
-			})
-
-			It("should remove additional ewrite entry", func() {
-				replicaRE = append(replicaRE, types.RewriteEntry{Domain: domain})
-				a, r, d := replicaRE.Merge(&originRE)
-				Ω(a).Should(BeEmpty())
-				Ω(r).Should(HaveLen(1))
-				Ω(d).Should(BeEmpty())
-
-				Ω(r[0].Domain).Should(Equal(domain))
-			})
-
-			It("should have no changes", func() {
-				originRE = append(originRE, types.RewriteEntry{Domain: domain})
-				replicaRE = append(replicaRE, types.RewriteEntry{Domain: domain})
-				a, r, d := replicaRE.Merge(&originRE)
-				Ω(a).Should(BeEmpty())
-				Ω(r).Should(BeEmpty())
-				Ω(d).Should(BeEmpty())
-			})
-
-			It("should remove target duplicate", func() {
-				originRE = append(originRE, types.RewriteEntry{Domain: domain})
-				replicaRE = append(replicaRE, types.RewriteEntry{Domain: domain})
-				replicaRE = append(replicaRE, types.RewriteEntry{Domain: domain})
-				a, r, d := replicaRE.Merge(&originRE)
-				Ω(a).Should(BeEmpty())
-				Ω(r).Should(HaveLen(1))
-				Ω(d).Should(BeEmpty())
-			})
-
-			It("should remove target duplicate", func() {
-				originRE = append(originRE, types.RewriteEntry{Domain: domain})
-				originRE = append(originRE, types.RewriteEntry{Domain: domain})
-				replicaRE = append(replicaRE, types.RewriteEntry{Domain: domain})
-				a, r, d := replicaRE.Merge(&originRE)
-				Ω(a).Should(BeEmpty())
-				Ω(r).Should(BeEmpty())
-				Ω(d).Should(HaveLen(1))
-			})
-		})
-	})
-	Context("UserRules", func() {
-		It("should join the rules correctly", func() {
-			r1 := uuid.NewString()
-			r2 := uuid.NewString()
-			ur := types.UserRules([]string{r1, r2})
-			Ω(ur.String()).Should(Equal(r1 + "\n" + r2))
-		})
-	})
-	Context("Config", func() {
-		var cfg *types.Config
-		BeforeEach(func() {
-			cfg = &types.Config{}
-		})
-		Context("UniqueReplicas", func() {
-			It("should be empty if noting defined", func() {
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(BeEmpty())
-			})
-			It("should be empty if replica url is not set", func() {
-				cfg.Replica = types.AdGuardInstance{URL: ""}
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(BeEmpty())
-			})
-			It("should be empty if replicas url is not set", func() {
-				cfg.Replicas = []types.AdGuardInstance{{URL: ""}}
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(BeEmpty())
-			})
-			It("should return only one replica if same url and apiPath", func() {
-				cfg.Replica = types.AdGuardInstance{URL: url, APIPath: apiPath}
-				cfg.Replicas = []types.AdGuardInstance{{URL: url, APIPath: apiPath}, {URL: url, APIPath: apiPath}}
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(HaveLen(1))
-			})
-			It("should return 3 one replicas if urls are different", func() {
-				cfg.Replica = types.AdGuardInstance{URL: url, APIPath: apiPath}
-				cfg.Replicas = []types.AdGuardInstance{{URL: url + "1", APIPath: apiPath}, {URL: url, APIPath: apiPath + "1"}}
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(HaveLen(3))
-			})
-			It("should set default api apiPath if not set", func() {
-				cfg.Replica = types.AdGuardInstance{URL: url}
-				cfg.Replicas = []types.AdGuardInstance{{URL: url + "1"}}
-				r := cfg.UniqueReplicas()
-				Ω(r).Should(HaveLen(2))
-				Ω(r[0].APIPath).Should(Equal(types.DefaultAPIPath))
-				Ω(r[1].APIPath).Should(Equal(types.DefaultAPIPath))
-			})
-		})
-	})
-
-	Context("Clients", func() {
-		Context("Merge", func() {
-			var (
-				originClients  *types.Clients
-				replicaClients types.Clients
-				name           string
-			)
-			BeforeEach(func() {
-				originClients = &types.Clients{}
-				replicaClients = types.Clients{}
-				name = uuid.NewString()
-			})
-
-			It("should add a missing client", func() {
-				originClients.Clients = append(originClients.Clients, types.Client{Name: name})
-				a, u, d := replicaClients.Merge(originClients)
-				Ω(a).Should(HaveLen(1))
-				Ω(u).Should(BeEmpty())
-				Ω(d).Should(BeEmpty())
-
-				Ω(a[0].Name).Should(Equal(name))
-			})
-
-			It("should remove additional client", func() {
-				replicaClients.Clients = append(replicaClients.Clients, types.Client{Name: name})
-				a, u, d := replicaClients.Merge(originClients)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(BeEmpty())
-				Ω(d).Should(HaveLen(1))
-
-				Ω(d[0].Name).Should(Equal(name))
-			})
-
-			It("should update existing client when name differs", func() {
-				disallowed := true
-				originClients.Clients = append(originClients.Clients, types.Client{Name: name, Disallowed: disallowed})
-				replicaClients.Clients = append(replicaClients.Clients, types.Client{Name: name, Disallowed: !disallowed})
-				a, u, d := replicaClients.Merge(originClients)
-				Ω(a).Should(BeEmpty())
-				Ω(u).Should(HaveLen(1))
-				Ω(d).Should(BeEmpty())
-
-				Ω(u[0].Disallowed).Should(Equal(disallowed))
-			})
-		})
-	})
-	Context("Services", func() {
-		Context("Equals", func() {
-			It("should be equal", func() {
-				s1 := types.Services([]string{"a", "b"})
-				s2 := types.Services([]string{"b", "a"})
-				Ω(s1.Equals(s2)).Should(BeTrue())
-			})
-			It("should not be equal different values", func() {
-				s1 := types.Services([]string{"a", "b"})
-				s2 := types.Services([]string{"B", "a"})
-				Ω(s1.Equals(s2)).ShouldNot(BeTrue())
-			})
-			It("should not be equal different length", func() {
-				s1 := types.Services([]string{"a", "b"})
-				s2 := types.Services([]string{"b", "a", "c"})
-				Ω(s1.Equals(s2)).ShouldNot(BeTrue())
-			})
-		})
-	})
-	Context("DNSConfig", func() {
-		Context("Equals", func() {
-			It("should be equal", func() {
-				dc1 := &types.DNSConfig{Upstreams: []string{"a"}}
-				dc2 := &types.DNSConfig{Upstreams: []string{"a"}}
-				Ω(dc1.Equals(dc2)).Should(BeTrue())
-			})
-			It("should not be equal", func() {
-				dc1 := &types.DNSConfig{Upstreams: []string{"a"}}
-				dc2 := &types.DNSConfig{Upstreams: []string{"b"}}
-				Ω(dc1.Equals(dc2)).ShouldNot(BeTrue())
-			})
-		})
-	})
-})

pkg/utils/clone.go

@@ -0,0 +1,15 @@
+package utils
+
+import "encoding/json"
+
+func Clone[I interface{}](in I, out I) I {
+	b, _ := json.Marshal(in)
+	_ = json.Unmarshal(b, out)
+	return out
+}
+
+func JsonEquals(a interface{}, b interface{}) bool {
+	ja, _ := json.Marshal(a)
+	jb, _ := json.Marshal(b)
+	return string(ja) == string(jb)
+}

pkg/utils/ptr.go

@@ -0,0 +1,14 @@
+package utils
+
+import "fmt"
+
+func Ptr[I interface{}](i I) *I {
+	return &i
+}
+
+func PtrToString[I interface{}](i *I) string {
+	if i == nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", i)
+}

pkg/versions/versions.go

@@ -0,0 +1,23 @@
+package versions
+
+import "golang.org/x/mod/semver"
+
+const (
+	// MinAgh minimal adguardhome version
+	MinAgh = "v0.107.40"
+)
+
+func IsNewerThan(v1 string, v2 string) bool {
+	return semver.Compare(sanitize(v1), sanitize(v2)) == 1
+}
+
+func IsSame(v1 string, v2 string) bool {
+	return semver.Compare(sanitize(v1), sanitize(v2)) == 0
+}
+
+func sanitize(v string) string {
+	if v == "" || v[0] == 'v' {
+		return v
+	}
+	return "v" + v
+}

pkg/versions/versions_suite_test.go

@@ -1,4 +1,4 @@
-package types_test
+package versions_test
 
 import (
 	"testing"

pkg/versions/versions_test.go

@@ -0,0 +1,24 @@
+package versions_test
+
+import (
+	"github.com/bakito/adguardhome-sync/pkg/versions"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Versions", func() {
+	Context("IsNewerThan", func() {
+		It("should correctly parse json", func() {
+			Ω(versions.IsNewerThan("v0.106.10", "v0.106.9")).Should(BeTrue())
+			Ω(versions.IsNewerThan("v0.106.9", "v0.106.10")).Should(BeFalse())
+			Ω(versions.IsNewerThan("v0.106.10", "0.106.9")).Should(BeTrue())
+			Ω(versions.IsNewerThan("v0.106.9", "0.106.10")).Should(BeFalse())
+		})
+	})
+	Context("IsSame", func() {
+		It("should be the same version", func() {
+			Ω(versions.IsSame("v0.106.9", "v0.106.9")).Should(BeTrue())
+			Ω(versions.IsSame("0.106.9", "v0.106.9")).Should(BeTrue())
+		})
+	})
+})

testdata/blockedservicesschedule-get.json

@@ -0,0 +1,22 @@
+{
+  "schedule": {
+    "time_zone": "Europe/Zurich",
+    "tue": {
+      "start": 0,
+      "end": 86340000
+    },
+    "thu": {
+      "start": 0,
+      "end": 86340000
+    },
+    "sat": {
+      "start": 0,
+      "end": 35940000
+    }
+  },
+  "ids": [
+    "9gag",
+    "dailymotion",
+    "disneyplus"
+  ]
+}

testdata/e2e/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

testdata/e2e/Chart.yaml

@@ -0,0 +1,8 @@
+apiVersion: v2
+name: agh-e2e
+description: adguardhome sync test charts
+type: application
+
+version: 0.1.0
+
+appVersion: "1.16.0"

testdata/e2e/bin/build-image.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+docker build -f Dockerfile --build-arg VERSION=e2e-tests -t localhost:5001/adguardhome-sync:e2e .
+docker push  localhost:5001/adguardhome-sync:e2e

testdata/e2e/bin/install-chart.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+kubectl config set-context --current --namespace=agh-e2e
+
+if [[ $(helm list --no-headers -n agh-e2e | grep agh-e2e | wc -l) == "1" ]]; then
+  helm delete agh-e2e -n agh-e2e --wait
+fi
+helm install agh-e2e testdata/e2e -n agh-e2e --create-namespace

testdata/e2e/bin/read-latest-replica-config.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+  echo "## AdGuardHome.yaml of latest replica" >> $GITHUB_STEP_SUMMARY
+  echo '```' >> $GITHUB_STEP_SUMMARY
+  kubectl exec adguardhome-replica-latest -- cat /opt/adguardhome/conf/AdGuardHome.yaml >> $GITHUB_STEP_SUMMARY
+  echo '```' >> $GITHUB_STEP_SUMMARY

testdata/e2e/bin/show-origin-logs.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+echo "## Pod adguardhome-origin logs" >> $GITHUB_STEP_SUMMARY
+echo '```' >> $GITHUB_STEP_SUMMARY
+kubectl logs adguardhome-origin >> $GITHUB_STEP_SUMMARY
+echo '```' >> $GITHUB_STEP_SUMMARY

testdata/e2e/bin/show-replica-logs.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+for pod in $(kubectl get pods -l bakito.net/adguardhome-sync=replica -o name); do
+  echo "## Pod ${pod} logs" >> $GITHUB_STEP_SUMMARY
+  echo '```' >> $GITHUB_STEP_SUMMARY
+  LOGS=$(kubectl logs ${pod})
+  # ignore certain errors
+  LOGS=$(echo -e "${LOGS}" | grep -v -e "error.* deleting filter .* no such file or directory" )
+  # https://github.com/AdguardTeam/AdGuardHome/issues/4944
+  LOGS=$(echo -e "${LOGS}" | grep -v -e "error.* creating dhcpv4 srv")
+  echo -e "${LOGS}" >> $GITHUB_STEP_SUMMARY
+  ERRORS=$(echo -e "${LOGS}"} | grep '\[error\]' | wc -l)
+  echo '```' >> $GITHUB_STEP_SUMMARY
+  echo "Found ${ERRORS} error(s) in ${pod} log" >> $GITHUB_STEP_SUMMARY
+  echo "----------------------------------------------" >> $GITHUB_STEP_SUMMARY
+
+done

testdata/e2e/bin/show-sync-logs.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+echo "## Pod adguardhome-sync logs" >> $GITHUB_STEP_SUMMARY
+echo '```' >> $GITHUB_STEP_SUMMARY
+kubectl logs adguardhome-sync  >> $GITHUB_STEP_SUMMARY
+echo '```' >> $GITHUB_STEP_SUMMARY
+ERRORS=$(kubectl logs adguardhome-sync | grep Error | wc -l)
+echo "Found ${ERRORS} error(s) in adguardhome-sync log";  >> $GITHUB_STEP_SUMMARY
+if [[ "${ERRORS}" != "0" ]]; then exit 1; fi

testdata/e2e/bin/wait-for-agh-pods.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+echo "wait for adguardhome pods"
+for pod in $(kubectl get pods -l bakito.net/adguardhome-sync -o name); do
+  kubectl wait --for condition=Ready ${pod} --timeout=30s
+done

testdata/e2e/bin/wait-for-sync.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+kubectl wait --for=jsonpath='{.status.phase}'=Succeeded pod/adguardhome-sync --timeout=1m

testdata/e2e/resources/AdGuardHome.yaml

@@ -0,0 +1,206 @@
+http:
+  pprof:
+    port: 6060
+    enabled: false
+  address: 0.0.0.0:3000
+  session_ttl: 720h
+users:
+  - name: username
+    password: $2a$10$yrrX.EvDpUUnZxr74u6euOMeF6dPFd/mEyohDq1LkpH76JyeObPBm
+auth_attempts: 5
+block_auth_min: 15
+http_proxy: ""
+language: en
+theme: auto
+dns:
+  bind_hosts:
+    - 0.0.0.0
+  port: 53
+  anonymize_client_ip: false
+  ratelimit: 20
+  ratelimit_whitelist: [ ]
+  refuse_any: true
+  upstream_dns:
+    - https://dns10.quad9.net/dns-query
+  upstream_dns_file: ""
+  bootstrap_dns:
+    - 1.1.1.1:53
+  fallback_dns: [ ]
+  all_servers: false
+  fastest_addr: false
+  fastest_timeout: 1s
+  allowed_clients: [ ]
+  disallowed_clients: [ ]
+  blocked_hosts:
+    - version.bind
+    - id.server
+    - hostname.bind
+  trusted_proxies:
+    - 127.0.0.0/8
+    - ::1/128
+  cache_size: 4194304
+  cache_ttl_min: 0
+  cache_ttl_max: 0
+  cache_optimistic: true
+  bogus_nxdomain: [ ]
+  aaaa_disabled: false
+  enable_dnssec: false
+  edns_client_subnet:
+    custom_ip: ""
+    enabled: false
+    use_custom: false
+  max_goroutines: 300
+  handle_ddr: true
+  ipset: [ ]
+  ipset_file: ""
+  bootstrap_prefer_ipv6: false
+  upstream_timeout: 10s
+  private_networks: [ ]
+  use_private_ptr_resolvers: true
+  local_ptr_upstreams: [ ]
+  use_dns64: false
+  dns64_prefixes: [ ]
+  serve_http3: false
+  use_http3_upstreams: false
+tls:
+  enabled: false
+  server_name: ""
+  force_https: false
+  port_https: 443
+  port_dns_over_tls: 853
+  port_dns_over_quic: 853
+  port_dnscrypt: 0
+  dnscrypt_config_file: ""
+  allow_unencrypted_doh: false
+  certificate_chain: ""
+  private_key: ""
+  certificate_path: ""
+  private_key_path: ""
+  strict_sni_check: false
+querylog:
+  ignored: [ ]
+  interval: 6h
+  size_memory: 1000
+  enabled: true
+  file_enabled: true
+statistics:
+  ignored: [ ]
+  interval: 24h
+  enabled: true
+filters:
+  - enabled: true
+    url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
+    name: AdGuard DNS filter
+    id: 1
+  - enabled: true
+    url: https://adaway.org/hosts.txt
+    name: AdAway Default Blocklist
+    id: 2
+whitelist_filters: [ ]
+user_rules:
+  - '||metrics2.data.hicloud.com^$important'
+  - '||www.curiouscorrespondence.com^$important'
+  - '||bluewizard.com^$important'
+  - '||facebook.com^$important'
+dhcp:
+  enabled: false
+  interface_name: eth0
+  local_domain_name: lan
+  dhcpv4:
+    gateway_ip: 1.2.3.4
+    subnet_mask: 255.255.0.0
+    range_start: 1.2.3.5
+    range_end: 1.2.3.56
+    lease_duration: 86400
+    icmp_timeout_msec: 1000
+    options: [ ]
+  dhcpv6:
+    range_start: ""
+    lease_duration: 86400
+    ra_slaac_only: false
+    ra_allow_slaac: false
+filtering:
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_services:
+    schedule:
+      time_zone: Europe/Zurich
+      tue:
+        start: 0s
+        end: 23h59m
+      thu:
+        start: 0s
+        end: 23h59m
+      sat:
+        start: 0s
+        end: 9h59m
+    ids:
+      - 9gag
+      - dailymotion
+      - disneyplus
+  protection_disabled_until: null
+  safe_search:
+    enabled: true
+    bing: true
+    duckduckgo: true
+    google: true
+    pixabay: true
+    yandex: true
+    youtube: true
+  blocking_mode: default
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  rewrites: [ ]
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  filters_update_interval: 24
+  blocked_response_ttl: 10
+  filtering_enabled: true
+  parental_enabled: true
+  safebrowsing_enabled: true
+  protection_enabled: true
+clients:
+  runtime_sources:
+    whois: true
+    arp: true
+    rdns: true
+    dhcp: true
+    hosts: true
+  persistent:
+    - name: Device 1
+      tags:
+        - device_1
+      ids:
+        - 2.2.2.2
+      blocked_services:
+        schedule:
+          time_zone: Europe/Zurich
+        ids:
+          - facebook
+          - mail_ru
+          - qq
+          - vk
+          - ok
+      upstreams: [ ]
+      use_global_settings: true
+      filtering_enabled: false
+      parental_enabled: false
+      safebrowsing_enabled: false
+      use_global_blocked_services: false
+      ignore_querylog: false
+      ignore_statistics: false
+log:
+  file: ""
+  max_backups: 0
+  max_size: 100
+  max_age: 3
+  compress: false
+  local_time: false
+  verbose: false
+os:
+  group: ""
+  user: ""
+  rlimit_nofile: 0
+schema_version: 27

testdata/e2e/templates/NOTES.txt

@@ -0,0 +1,4 @@
+Installed adguardhome-sync end-2-end test with {{ len .Values.replica.versions }} replica instances.
+{{- range $_, $version := .Values.replica.versions }}
+  - {{ $version }}
+{{- end }}

testdata/e2e/templates/configmap-origin.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: origin-conf
+  namespace: {{ .Release.Namespace }}
+data:
+  AdGuardHome.yaml: |
+  {{- .Files.Get "resources/AdGuardHome.yaml" | nindent 4 }}

testdata/e2e/templates/configmap-sync.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sync-conf
+  namespace: {{ .Release.Namespace }}
+data:
+  API_PORT: '0'
+  LOG_LEVEL: 'info'
+  ORIGIN_URL: 'http://service-origin.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+  ORIGIN_PASSWORD: 'password'
+  ORIGIN_USERNAME: 'username'
+  {{ range $i,$version := .Values.replica.versions }}
+  REPLICA{{ $i }}_AUTOSETUP: 'true'
+  REPLICA{{ $i }}_URL: 'http://service-replica-{{ $version | toString | replace "." "-" }}.{{ $.Release.Namespace }}.svc.cluster.local:3000'
+  REPLICA{{ $i }}_PASSWORD: 'password'
+  REPLICA{{ $i }}_USERNAME: 'username'
+{{- end }}

testdata/e2e/templates/pod-adguardhome-origin.yaml

@@ -0,0 +1,37 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: adguardhome-origin
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: adguardhome-origin
+    bakito.net/adguardhome-sync: origin
+spec:
+  volumes:
+    - name: configmap
+      configMap:
+        name: origin-conf
+    - name: conf
+      emptyDir: { }
+
+  initContainers:
+    - name: init
+      image: busybox
+      volumeMounts:
+        - mountPath: /opt/adguardhome/configmap
+          name: configmap
+        - mountPath: /opt/adguardhome/conf
+          name: conf
+      command:
+        - cp
+        - /opt/adguardhome/configmap/AdGuardHome.yaml
+        - /opt/adguardhome/conf
+
+  containers:
+    - name: adguardhome
+      image: adguard/adguardhome:latest
+      volumeMounts:
+        - mountPath: /opt/adguardhome/conf
+          name: conf
+      ports:
+        - containerPort: 3000

testdata/e2e/templates/pod-adguardhome-replica.yaml

@@ -0,0 +1,17 @@
+{{ range $_, $version := .Values.replica.versions }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: adguardhome-replica-{{ $version | toString | replace "." "-" }}
+  namespace: {{ $.Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: adguardhome-replica-{{ $version | toString | replace "." "-" }}
+    bakito.net/adguardhome-sync: replica
+spec:
+  containers:
+    - name: adguardhome
+      image: "adguard/adguardhome:{{ $version }}"
+      ports:
+        - containerPort: 3000
+---
+{{- end }}

testdata/e2e/templates/pod-adguardhome-sync.yaml

@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: adguardhome-sync
+  namespace: {{ $.Release.Namespace }}
+spec:
+  serviceAccountName: agh-e2e
+  initContainers:
+    - name: wait-for-others
+      image: bitnami/kubectl:1.24
+      command:
+        - /bin/bash
+        - -c
+        - |
+          {{- .Files.Get "bin/wait-for-agh-pods.sh" | nindent 10}}
+  containers:
+    - name: adguardhome-sync
+      image: localhost:5001/adguardhome-sync:e2e
+      command:
+        - /opt/go/adguardhome-sync
+        - run
+      envFrom:
+        - configMapRef:
+            name: sync-conf
+  restartPolicy: Never

testdata/e2e/templates/rbac.yaml

@@ -0,0 +1,30 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: agh-e2e
+  namespace: {{ .Release.Namespace }}
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: agh-e2e
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups: [ "" ]
+    resources: [ "pods" ]
+    verbs: [ "get", "watch", "list" ]
+---
+
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: agh-e2e
+  namespace: {{ .Release.Namespace }}
+subjects:
+  - kind: ServiceAccount
+    name: agh-e2e
+roleRef:
+  kind: Role
+  name: agh-e2e
+  apiGroup: rbac.authorization.k8s.io

testdata/e2e/templates/service-origin.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-origin
+  namespace: {{ $.Release.Namespace }}
+spec:
+  selector:
+    app.kubernetes.io/name: adguardhome-origin
+  ports:
+    - protocol: TCP
+      port: 3000
+      targetPort: 3000

testdata/e2e/templates/service-replica.yaml

@@ -0,0 +1,14 @@
+{{ range $i ,$version := .Values.replica.versions }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-replica-{{ $version | toString | replace "." "-" }}
+spec:
+  selector:
+    app.kubernetes.io/name: adguardhome-replica-{{ $version | toString | replace "." "-" }}
+  ports:
+    - protocol: TCP
+      port: 3000
+      targetPort: 3000
+---
+{{- end }}

testdata/e2e/values.yaml

@@ -0,0 +1,4 @@
+replica:
+  versions:
+    - v0.107.40
+    - latest

testdata/filtering-status.json

@@ -7,8 +7,7 @@
       "enabled": true,
       "url": "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
       "name": "AdGuard DNS filter",
-      "rules_count": 37330,
+      "rules_count": 37330
-      "last_updated": ""
     },
     {
       "id": 1616956421,
@@ -24,4 +23,4 @@
     "||metrics2.data.hicloud.com^$important",
     ""
   ]
-}
+}