From fd5e11764b6492309d1a065a8bba445e6e3270c5 Mon Sep 17 00:00:00 2001 From: Sandor Szuecs Date: Sun, 29 Jun 2025 12:12:22 +0200 Subject: [PATCH] fix: zonefinder used a quoted version of %s, but we should use %q instead change: test message to fit %q Signed-off-by: Sandor Szuecs --- provider/zonefinder.go | 10 +++++----- provider/zonefinder_test.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/provider/zonefinder.go b/provider/zonefinder.go index a81f997b3..a47060bc4 100644 --- a/provider/zonefinder.go +++ b/provider/zonefinder.go @@ -43,19 +43,19 @@ func (z ZoneIDName) Add(zoneID, zoneName string) { // ensures compatibility with such use cases. func (z ZoneIDName) FindZone(hostname string) (suitableZoneID, suitableZoneName string) { var name string - domain_labels := strings.Split(hostname, ".") - for i, label := range domain_labels { + domainLabels := strings.Split(hostname, ".") + for i, label := range domainLabels { if strings.Contains(label, "_") { continue } convertedLabel, err := idna.Lookup.ToUnicode(label) if err != nil { - log.Warnf("Failed to convert label '%s' of hostname '%s' to its Unicode form: %v", label, hostname, err) + log.Warnf("Failed to convert label %q of hostname %q to its Unicode form: %v", label, hostname, err) convertedLabel = label } - domain_labels[i] = convertedLabel + domainLabels[i] = convertedLabel } - name = strings.Join(domain_labels, ".") + name = strings.Join(domainLabels, ".") for zoneID, zoneName := range z { if name == zoneName || strings.HasSuffix(name, "."+zoneName) { diff --git a/provider/zonefinder_test.go b/provider/zonefinder_test.go index b5afb047f..dccfe5adb 100644 --- a/provider/zonefinder_test.go +++ b/provider/zonefinder_test.go @@ -80,5 +80,5 @@ func TestZoneIDName(t *testing.T) { hook := testutils.LogsUnderTestWithLogLevel(log.WarnLevel, t) _, _ = z.FindZone("???") - testutils.TestHelperLogContains("Failed to convert label '???' of hostname '???' to its Unicode form: idna: disallowed rune U+003F", hook, t) + testutils.TestHelperLogContains("Failed to convert label \"???\" of hostname \"???\" to its Unicode form: idna: disallowed rune U+003F", hook, t) }