add multi replica env support #4

.github/workflows/publish.yml

@@ -0,0 +1,44 @@
+name: quay
+
+on:
+  push:
+    branches: main
+  release:
+    types:
+      - published
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Quay
+        uses: docker/login-action@v1
+        with:
+          registry: quay.io
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Build and push ${{github.event.release.tag_name }}
+        id: docker_build_release
+        uses: docker/build-push-action@v2
+        if: ${{ github.event.release.tag_name != '' }}
+        with:
+          push: true
+          tags: quay.io/bakito/adguardhome-sync:latest,quay.io/bakito/adguardhome-sync:${{ github.event.release.tag_name }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          build-args: VERSION=${{ github.event.release.tag_name }}
+
+      - name: Build and push main
+        id: docker_build_main
+        uses: docker/build-push-action@v2
+        if: ${{ github.event.release.tag_name == '' }}
+        with:
+          push: true
+          tags: quay.io/bakito/adguardhome-sync:main
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          build-args: VERSION=main
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -0,0 +1,27 @@
+FROM docker.io/library/golang:1.16 as builder
+
+WORKDIR /go/src/app
+
+RUN apt-get update && apt-get install -y upx
+
+ARG VERSION=main
+ENV GOPROXY=https://goproxy.io \
+  GO111MODULE=on \
+  CGO_ENABLED=0 \
+  GOOS=linux
+
+ADD . /go/src/app/
+
+RUN go build -a -installsuffix cgo -ldflags="-w -s -X github.com/bakito/adguardhome-sync/version.Version=${VERSION}" -o adguardhome-sync . \
+  && upx -q adguardhome-sync
+
+# application image
+FROM scratch
+WORKDIR /opt/go
+
+LABEL maintainer="bakito <github@bakito.ch>"
+EXPOSE 8080
+ENTRYPOINT ["/opt/go/adguardhome-sync"]
+CMD ["run", "--config", "/config/adguardhome-sync.yaml"]
+COPY --from=builder /go/src/app/adguardhome-sync  /opt/go/adguardhome-sync
+USER 1001

README.md

@@ -40,6 +40,60 @@ adguardhome-sync run
 adguardhome-sync run --cron "*/10 * * * *"
 ```
 
+## docker cli
+
+```bash
+docker run -d \
+  --name=adguardhome-sync \
+  -p 8080:8080 \
+  -v /path/to/appdata/config/adguardhome-sync.yaml:/config/adguardhome-sync.yaml \
+  --restart unless-stopped \
+  quay.io/bakito/adguardhome-sync:latest
+```
+
+## docker compose
+
+### config file
+```yaml
+---
+version: "2.1"
+services:
+  adguardhome-sync:
+    image: quay.io/bakito/adguardhome-sync
+    container_name: adguardhome-sync
+    volumes:
+      - /path/to/appdata/config/adguardhome-sync.yaml:/config/adguardhome-sync.yaml
+    ports:
+      - 8080:8080
+    restart: unless-stopped
+```
+
+### env
+
+```yaml
+---
+version: "2.1"
+services:
+  adguardhome-sync:
+    image: quay.io/bakito/adguardhome-sync
+    container_name: adguardhome-sync
+    environment:
+      - ORIGIN_URL=https://192.168.1.2:3000
+      - ORIGIN_USERNAME=username
+      - ORIGIN_PASSWORD=password
+      - REPLICA_URL=http://192.168.1.3
+      - REPLICA_USERNAME=username
+      - REPLICA_PASSWORD=password
+      - REPLICA1_URL=http://192.168.1.4
+      - REPLICA1_USERNAME=username
+      - REPLICA1_PASSWORD=password
+      - REPLICA1_APIPATH=/some/path/control
+      - CRON=*/10 * * * * # run every 10 minutes
+    ports:
+      - 8080:8080
+    restart: unless-stopped
+```
+
 ### Config file
 
 location: $HOME/.adguardhome-sync.yaml

cmd/root.go

@@ -3,13 +3,13 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"regexp"
 	"strings"
 
 	"github.com/bakito/adguardhome-sync/pkg/log"
-
-	"github.com/spf13/cobra"
-
+	"github.com/bakito/adguardhome-sync/pkg/types"
 	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
@@ -31,11 +31,17 @@ const (
 	configReplicaUsername           = "replica.username"
 	configReplicaPassword           = "replica.password"
 	configReplicaInsecureSkipVerify = "replica.insecureSkipVerify"
+
+	envReplicasUsernameFormat           = "REPLICA%s_USERNAME"
+	envReplicasPasswordFormat           = "REPLICA%s_PASSWORD"
+	envReplicasAPIPathFormat            = "REPLICA%s_APIPATH"
+	envReplicasInsecureSkipVerifyFormat = "REPLICA%s_INSECURESKIPVERIFY"
 )
 
 var (
-	cfgFile string
-	logger  = log.GetLogger("root")
+	cfgFile               string
+	logger                = log.GetLogger("root")
+	envReplicasURLPattern = regexp.MustCompile(`^REPLICA(\d+)_URL=(.*)`)
 )
 
 // rootCmd represents the base command when called without any subcommands
@@ -83,13 +89,47 @@ func initConfig() {
 		// Search config in home directory with name ".adguardhome-sync" (without extension).
 		viper.AddConfigPath(home)
 		viper.SetConfigName(".adguardhome-sync")
-		viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
 	}
-
+	viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))
 	viper.AutomaticEnv() // read in environment variables that match
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
 		logger.Info("Using config file:", viper.ConfigFileUsed())
+	} else if cfgFile != "" {
+		fmt.Println(err)
+		os.Exit(1)
 	}
 }
+
+func getConfig() (*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()...)
+	}
+	return cfg, nil
+}
+
+// Manually collect replicas from env.
+func collectEnvReplicas() []types.AdGuardInstance {
+	var replicas []types.AdGuardInstance
+	for _, v := range os.Environ() {
+		if envReplicasURLPattern.MatchString(v) {
+			sm := envReplicasURLPattern.FindStringSubmatch(v)
+			re := types.AdGuardInstance{
+				URL:                sm[2],
+				Username:           os.Getenv(fmt.Sprintf(envReplicasUsernameFormat, sm[1])),
+				Password:           os.Getenv(fmt.Sprintf(envReplicasPasswordFormat, sm[1])),
+				APIPath:            os.Getenv(fmt.Sprintf(envReplicasAPIPathFormat, sm[1])),
+				InsecureSkipVerify: strings.EqualFold(os.Getenv(fmt.Sprintf(envReplicasInsecureSkipVerifyFormat, sm[1])), "true"),
+			}
+			replicas = append(replicas, re)
+		}
+	}
+
+	return replicas
+}

cmd/run.go

@@ -3,10 +3,8 @@ package cmd
 import (
 	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/sync"
-	"github.com/bakito/adguardhome-sync/pkg/types"
-	"github.com/spf13/viper"
-
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 // runCmd represents the run command
@@ -14,15 +12,15 @@ var doCmd = &cobra.Command{
 	Use:   "run",
 	Short: "Start a synchronisation from origin to replica",
 	Long:  `Synchronizes the configuration form an origin instance to a replica`,
-	Run: func(cmd *cobra.Command, args []string) {
+	RunE: func(cmd *cobra.Command, args []string) error {
 		logger = log.GetLogger("run")
-		cfg := &types.Config{}
-		if err := viper.Unmarshal(cfg); err != nil {
+		cfg, err := getConfig()
+		if err != nil {
 			logger.Error(err)
-			return
+			return err
 		}
 
-		sync.Sync(cfg)
+		return sync.Sync(cfg)
 	},
 }
 

go.mod

@@ -3,7 +3,7 @@ module github.com/bakito/adguardhome-sync
 go 1.16
 
 require (
-	github.com/go-resty/resty/v2 v2.5.0
+	github.com/go-resty/resty/v2 v2.4.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/onsi/ginkgo v1.16.0
 	github.com/onsi/gomega v1.11.0

go.sum

@@ -46,8 +46,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-resty/resty/v2 v2.5.0 h1:WFb5bD49/85PO7WgAjZ+/TJQ+Ty1XOcWEfD1zIFCM1c=
-github.com/go-resty/resty/v2 v2.5.0/go.mod h1:B88+xCTEwvfD94NOuE6GS1wMlnoKNY8eEiNizfNwOwA=
+github.com/go-resty/resty/v2 v2.4.0 h1:s6TItTLejEI+2mn98oijC5w/Rk2YU+OA6x0mnZN6r6k=
+github.com/go-resty/resty/v2 v2.4.0/go.mod h1:B88+xCTEwvfD94NOuE6GS1wMlnoKNY8eEiNizfNwOwA=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=

pkg/sync/http.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/bakito/adguardhome-sync/pkg/log"
+	"github.com/bakito/adguardhome-sync/version"
 )
 
 func (w *worker) handleSync(rw http.ResponseWriter, req *http.Request) {
@@ -61,7 +62,7 @@ func use(h http.HandlerFunc, middleware ...func(http.HandlerFunc) http.HandlerFu
 }
 
 func (w *worker) listenAndServe() {
-	l.With("port", w.cfg.API.Port).Info("Starting API server")
+	l.With("version", version.Version, "port", w.cfg.API.Port).Info("Starting API server")
 
 	ctx, cancel := context.WithCancel(context.Background())
 	mux := http.NewServeMux()

pkg/sync/sync.go

@@ -1,9 +1,12 @@
 package sync
 
 import (
+	"fmt"
+
 	"github.com/bakito/adguardhome-sync/pkg/client"
 	"github.com/bakito/adguardhome-sync/pkg/log"
 	"github.com/bakito/adguardhome-sync/pkg/types"
+	"github.com/bakito/adguardhome-sync/version"
 	"github.com/robfig/cron/v3"
 	"go.uber.org/zap"
 )
@@ -13,19 +16,28 @@ var (
 )
 
 // Sync config from origin to replica
-func Sync(cfg *types.Config) {
+func Sync(cfg *types.Config) error {
+
+	if cfg.Origin.URL == "" {
+		return fmt.Errorf("origin URL is required")
+	}
+
+	if len(cfg.UniqueReplicas()) == 0 {
+		return fmt.Errorf("no replicas configured")
+	}
+
 	w := &worker{
 		cfg: cfg,
 	}
 	if cfg.Cron != "" {
 		w.cron = cron.New()
-		cl := l.With("cron", cfg.Cron)
+		cl := l.With("version", version.Version, "cron", cfg.Cron)
 		_, err := w.cron.AddFunc(cfg.Cron, func() {
 			w.sync()
 		})
 		if err != nil {
 			cl.With("error", err).Error("Error during cron job setup")
-			return
+			return err
 		}
 		cl.Info("Setup cronjob")
 		if cfg.API.Port != 0 {
@@ -39,6 +51,7 @@ func Sync(cfg *types.Config) {
 	if cfg.API.Port != 0 {
 		w.listenAndServe()
 	}
+	return nil
 }
 
 type worker struct {

pkg/types/types.go

@@ -10,7 +10,7 @@ import (
 // Config application configuration struct
 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"`
 	API      API               `json:"api,omitempty" yaml:"api,omitempty"`
@@ -26,15 +26,20 @@ type API struct {
 // UniqueReplicas get unique replication instances
 func (cfg *Config) UniqueReplicas() []AdGuardInstance {
 	dedup := make(map[string]AdGuardInstance)
-	if cfg.Replica != nil {
-		dedup[cfg.Replica.Key()] = *cfg.Replica
+	if cfg.Replica.URL != "" {
+		dedup[cfg.Replica.Key()] = cfg.Replica
 	}
 	for _, replica := range cfg.Replicas {
-		dedup[replica.Key()] = replica
+		if replica.URL != "" {
+			dedup[replica.Key()] = replica
+		}
 	}
 
 	var r []AdGuardInstance
 	for _, replica := range dedup {
+		if replica.APIPath == "" {
+			replica.APIPath = "/control"
+		}
 		r = append(r, replica)
 	}
 	return r

pkg/types/types_test.go

@@ -2,9 +2,10 @@ package types_test
 
 import (
 	"encoding/json"
+	"io/ioutil"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 
 	"github.com/bakito/adguardhome-sync/pkg/types"
 )