feat: update ipv6disc to v0.6.0 and restructure discovery config

Author: miguelangel-nubla

README.md

@@ -153,9 +153,10 @@ credentials:
   # ...
 
 # Optional: Discover hosts reading from network devices (pfSense, OPNsense, Mikrotik, etc.)
-discovery_plugins:
-  - type: mikrotik
-    params: mikrotik:192.168.88.1:8729,admin,password,true,
+discovery:
+  plugins:
+    - type: mikrotik
+      params: mikrotik:90s,192.168.88.1:8729,admin,password,true,
 ```
 
 ---

cmd/ipv6ddns/example.config.yaml

@@ -108,10 +108,13 @@ credentials:
       region: us-east-1
       hosted_zone_id: Z1234567890
       ttl: 1h
-discovery_plugins:
-- params: mikrotik:192.168.88.1:8729,admin,password,true,<optional>a1b2c3d4...
-  type: mikrotik
-- params: freebsd:pfsense.local,admin,,/path/to/id_rsa
-  type: freebsd
-- params: linux:[2001:db8::1]:2222,user,,/path/to/id_rsa
-  type: linux
+discovery:
+  listen: true
+  active: true
+  plugins:
+    - params: mikrotik:90s,192.168.88.1:8729,admin,password,true,<optional>a1b2c3d4...
+      type: mikrotik
+    - params: freebsd:90s,pfsense.local,admin,,/path/to/id_rsa
+      type: freebsd
+    - params: linux:90s,[2001:db8::1]:2222,user,,/path/to/id_rsa
+      type: linux

cmd/ipv6ddns/ipv6ddns.go

@@ -52,7 +52,7 @@ func main() {
 	rediscover := lifetime / 3
 	worker := ipv6ddns.NewWorker(sugar, rediscover, lifetime, config)
 
-	for _, pCfg := range config.Plugins {
+	for _, pCfg := range config.Discovery.Plugins {
 		p, err := plugins.Create(pCfg.Type, pCfg.Params, lifetime)
 		if err != nil {
 			sugar.Fatalf("can't create plugin %s: %s", pCfg.Type, err)

config/config.go

@@ -21,7 +21,13 @@ type Config struct {
 	BaseDir     string                `json:"-"`
 	Tasks       map[string]Task       `json:"tasks"`
 	Credentials map[string]Credential `json:"credentials"`
-	Plugins     []PluginConfig        `json:"discovery_plugins"`
+	Discovery   Discovery             `json:"discovery"`
+}
+
+type Discovery struct {
+	Listen  bool           `json:"listen"`
+	Active  bool           `json:"active"`
+	Plugins []PluginConfig `json:"plugins"`
 }
 
 type PluginConfig struct {
@@ -115,14 +121,17 @@ func (c *Config) PrettyPrint(prefix string, hideSensible bool) string {
 		}
 	}
 
-	if len(c.Plugins) > 0 {
-		result.WriteString(prefix + "    Discovery Plugins:\n")
-		for _, plugin := range c.Plugins {
-			result.WriteString(prefix + "        Type: " + plugin.Type + "\n")
+	result.WriteString(prefix + "    Discovery:\n")
+	result.WriteString(prefix + "        Listen: " + fmt.Sprintf("%t", c.Discovery.Listen) + "\n")
+	result.WriteString(prefix + "        Active: " + fmt.Sprintf("%t", c.Discovery.Active) + "\n")
+	if len(c.Discovery.Plugins) > 0 {
+		result.WriteString(prefix + "        Plugins:\n")
+		for _, plugin := range c.Discovery.Plugins {
+			result.WriteString(prefix + "            Type: " + plugin.Type + "\n")
 			if !hideSensible {
-				result.WriteString(prefix + "        Params: " + plugin.Params + "\n")
+				result.WriteString(prefix + "            Params: " + plugin.Params + "\n")
 			} else {
-				result.WriteString(prefix + "        Params: <sensible data hidden>\n")
+				result.WriteString(prefix + "            Params: <sensible data hidden>\n")
 			}
 		}
 	}

config/schema.json

@@ -99,24 +99,36 @@
                 "additionalProperties": false
             }
         },
-        "discovery_plugins": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "type": {
-                        "type": "string"
-                    },
-                    "params": {
-                        "type": "string"
-                    }
+        "discovery": {
+            "type": "object",
+            "properties": {
+                "listen": {
+                    "type": "boolean"
                 },
-                "required": [
-                    "type",
-                    "params"
-                ],
-                "additionalProperties": false
-            }
+                "active": {
+                    "type": "boolean"
+                },
+                "plugins": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "params": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "params"
+                        ],
+                        "additionalProperties": false
+                    }
+                }
+            },
+            "additionalProperties": false
         }
     },
     "required": [

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/cloudflare/cloudflare-go v0.116.0
 	github.com/go-routeros/routeros/v3 v3.0.1
 	github.com/google/uuid v1.6.0
-	github.com/miguelangel-nubla/ipv6disc v0.5.1
+	github.com/miguelangel-nubla/ipv6disc v0.6.0
 	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
 	github.com/oapi-codegen/runtime v1.1.2
 	github.com/xeipuuv/gojsonschema v1.2.0

go.sum

@@ -102,6 +102,8 @@ github.com/mdlayher/ndp v1.1.0 h1:QylGKGVtH60sKZUE88+IW5ila1Z/M9/OXhWdsVKuscs=
 github.com/mdlayher/ndp v1.1.0/go.mod h1:FmgESgemgjl38vuOIyAHWUUL6vQKA/pQNkvXdWsdQFM=
 github.com/miguelangel-nubla/ipv6disc v0.5.1 h1:SFzVM6WxYxWuVKpdobzN4sXyNQgsnaXvnqU7WJplJyQ=
 github.com/miguelangel-nubla/ipv6disc v0.5.1/go.mod h1:VMY3R/4vbaJ4vnbpont2nkjWZjoTFC7ovrJ2ga5dt3U=
+github.com/miguelangel-nubla/ipv6disc v0.6.0 h1:sxS0Z/ED78+ufiCqkYdlaPJ34ghanQGNIdZpkLJON4A=
+github.com/miguelangel-nubla/ipv6disc v0.6.0/go.mod h1:VMY3R/4vbaJ4vnbpont2nkjWZjoTFC7ovrJ2ga5dt3U=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=

worker.go

@@ -123,7 +123,7 @@ func (w *Worker) PrettyPrint(prefix string, hideSensible bool) string {
 func NewWorker(logger *zap.SugaredLogger, rediscover time.Duration, lifetime time.Duration, config config.Config) *Worker {
 	return &Worker{
 		State:      NewState(),
-		discWorker: ipv6disc.NewWorker(logger, rediscover, lifetime),
+		discWorker: ipv6disc.NewWorker(logger, rediscover, lifetime, config.Discovery.Listen, config.Discovery.Active),
 		logger:     logger,
 		config:     config,
 	}