Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2026-10-16 23:35:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/azure: add refresh directive (#8614)

Browse Source 
Brings azure to parity with route53, which already exposes a refresh
directive to control how often zones are re-synced. azure currently
hardcodes this to 1 minute (Run calls h.run(ctx, time.Minute)) with no
way to change it, even though the internal run() method already takes
an arbitrary interval parameter - the plumbing exists, it just wasn't
exposed as a Corefile option.

Adds a refresh field to the Azure struct, threads it through New(), and
has Run() use h.refresh instead of the hardcoded value. Parses the
refresh directive in parse() mirroring route53's exact validation
(accepts a plain number as seconds or a duration string, must be
greater than 0).

Extends TestSetup with refresh coverage (valid duration, valid plain
number, missing arg, non-numeric, zero, negative). Verified it fails
without the setup.go change (unknown property error) and passes with
it.

Signed-off-by: stackedbyaradhya <aradhyaj736@gmail.com>
This commit is contained in:
Aradhya Jain
2026-10-09 07:18:10 +05:30
committed by GitHub
parent 538c3554bc
commit ef18404448
5 changed files with 72 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
plugin/azure/setup.go
View File

@@ -2,7 +2,9 @@ package azure
import (
"context"
"strconv"
"strings"
"time"
"github.com/coredns/caddy"
"github.com/coredns/coredns/core/dnsserver"
@@ -21,7 +23,7 @@ var log = clog.NewWithPlugin("azure")
func init() { plugin.Register("azure", setup) }
func setup(c *caddy.Controller) error {
env, keys, accessMap, fall, err := parse(c)
env, keys, accessMap, fall, refresh, err := parse(c)
if err != nil {
return plugin.Error("azure", err)
}
@@ -39,7 +41,7 @@ func setup(c *caddy.Controller) error {
return plugin.Error("azure", err)
}
h, err := New(ctx, publicDNSClient, privateDNSClient, keys, accessMap)
h, err := New(ctx, publicDNSClient, privateDNSClient, keys, accessMap, refresh)
if err != nil {
cancel()
return plugin.Error("azure", err)
@@ -59,12 +61,13 @@ func setup(c *caddy.Controller) error {
return nil
}
func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string, map[string]string, fall.F, error) {
func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string, map[string]string, fall.F, time.Duration, error) {
resourceGroupMapping := map[string][]string{}
accessMap := map[string]string{}
resourceGroupSet := map[string]struct{}{}
azureEnv := azurerest.PublicCloud
env := auth.EnvironmentSettings{Values: map[string]string{}}
refresh := time.Duration(1) * time.Minute // default update frequency to 1 minute
var fall fall.F
var access string
@@ -76,14 +79,14 @@ func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string,
for i := range args {
parts := strings.SplitN(args[i], ":", 2)
if len(parts) != 2 {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid resource group/zone: %q", args[i])
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("invalid resource group/zone: %q", args[i])
}
resourceGroup, zoneName := parts[0], parts[1]
if resourceGroup == "" || zoneName == "" {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid resource group/zone: %q", args[i])
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("invalid resource group/zone: %q", args[i])
}
if _, ok := resourceGroupSet[resourceGroup+zoneName]; ok {
return env, resourceGroupMapping, accessMap, fall, c.Errf("conflicting zone: %q", args[i])
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("conflicting zone: %q", args[i])
}
resourceGroupSet[resourceGroup+zoneName] = struct{}{}
@@ -96,52 +99,68 @@ func parse(c *caddy.Controller) (auth.EnvironmentSettings, map[string][]string,
switch c.Val() {
case "subscription":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
env.Values[auth.SubscriptionID] = c.Val()
case "tenant":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
env.Values[auth.TenantID] = c.Val()
case "client":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
env.Values[auth.ClientID] = c.Val()
case "secret":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
env.Values[auth.ClientSecret] = c.Val()
case "environment":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
var err error
if azureEnv, err = azurerest.EnvironmentFromName(c.Val()); err != nil {
return env, resourceGroupMapping, accessMap, fall, c.Errf("cannot set azure environment: %q", err.Error())
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("cannot set azure environment: %q", err.Error())
}
case "fallthrough":
fall.SetZonesFromArgs(c.RemainingArgs())
case "access":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, c.ArgErr()
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
access = c.Val()
if access != "public" && access != "private" {
return env, resourceGroupMapping, accessMap, fall, c.Errf("invalid access value: can be public/private, found: %s", access)
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("invalid access value: can be public/private, found: %s", access)
}
for _, k := range currentZoneKeys {
accessMap[k] = access
}
case "refresh":
if !c.NextArg() {
return env, resourceGroupMapping, accessMap, fall, refresh, c.ArgErr()
}
refreshStr := c.Val()
_, err := strconv.Atoi(refreshStr)
if err == nil {
refreshStr += "s"
}
refresh, err = time.ParseDuration(refreshStr)
if err != nil {
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("unable to parse duration: %v", err)
}
if refresh <= 0 {
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("refresh interval must be greater than 0: %q", refreshStr)
}
default:
return env, resourceGroupMapping, accessMap, fall, c.Errf("unknown property: %q", c.Val())
return env, resourceGroupMapping, accessMap, fall, refresh, c.Errf("unknown property: %q", c.Val())
}
}
}
env.Values[auth.Resource] = azureEnv.ResourceManagerEndpoint
env.Environment = azureEnv
return env, resourceGroupMapping, accessMap, fall, nil
return env, resourceGroupMapping, accessMap, fall, refresh, nil
}