From f844933b7d1ab8f46156b65b1ed128424fb15adc Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Fri, 24 Jul 2026 20:57:44 +0000
Subject: [PATCH] Fix wsl blank lines in DNS check paths

Separate cancel calls, error checks, and declarations so
golangci wsl_v5 accepts the cuddling rules.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>

Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
---
 pkg/certmanager/provision_worker.go | 2 ++
 pkg/dnsclient/caa.go                | 2 ++
 pkg/dnsclient/checks_test.go        | 8 ++++++++
 3 files changed, 12 insertions(+)

diff --git a/pkg/certmanager/provision_worker.go b/pkg/certmanager/provision_worker.go
index 7f0e78c7c..a04eace43 100644
--- a/pkg/certmanager/provision_worker.go
+++ b/pkg/certmanager/provision_worker.go
@@ -208,7 +208,9 @@ func (h *beginChallengeHandler) Process(ctx context.Context, certificate coredat
 
 		cnameCtx, cnameCancel := context.WithTimeout(dnsCtx, dnsExchangeTimeout)
 		err := h.dnsClient.CheckCNAME(cnameCtx, certificate.Hostname, h.cnameTarget)
+
 		cnameCancel()
+
 		if err != nil {
 			h.acmeService.metrics.observeStep(provisionPhaseDNSCheck, provisionResultDNSError, dnsStarted)
 			h.recordSpanError(dnsSpan, err, classifyProvisioningError(err))
diff --git a/pkg/dnsclient/caa.go b/pkg/dnsclient/caa.go
index d5c3f69d4..a11878a9b 100644
--- a/pkg/dnsclient/caa.go
+++ b/pkg/dnsclient/caa.go
@@ -47,7 +47,9 @@ func (c *Client) CheckCAA(ctx context.Context, hostname, permittedIssuer string)
 		// child name cannot starve the parent lookup that holds the policy.
 		queryCtx, cancel := c.withExchangeTimeout(ctx)
 		resp, err := c.query(queryCtx, msg)
+
 		cancel()
+
 		if err != nil {
 			return fmt.Errorf("cannot exchange dns message for caa records: %w", err)
 		}
diff --git a/pkg/dnsclient/checks_test.go b/pkg/dnsclient/checks_test.go
index ded61922d..ce7eb6f6d 100644
--- a/pkg/dnsclient/checks_test.go
+++ b/pkg/dnsclient/checks_test.go
@@ -72,6 +72,7 @@ func TestCheckCNAME(t *testing.T) {
 		t.Parallel()
 
 		var networks []string
+
 		client := &Client{
 			exchange: func(_ context.Context, msg *dns.Msg, network string) (*dns.Msg, error) {
 				networks = append(networks, network)
@@ -181,6 +182,7 @@ func TestCheckTXT(t *testing.T) {
 		t.Parallel()
 
 		var networks []string
+
 		client := &Client{
 			exchange: func(_ context.Context, _ *dns.Msg, network string) (*dns.Msg, error) {
 				networks = append(networks, network)
@@ -341,6 +343,7 @@ func TestCheckCAA(t *testing.T) {
 		t.Parallel()
 
 		var networks []string
+
 		client := &Client{
 			exchange: func(_ context.Context, msg *dns.Msg, network string) (*dns.Msg, error) {
 				networks = append(networks, network)
@@ -411,10 +414,12 @@ func TestCheckCAA(t *testing.T) {
 		t.Parallel()
 
 		var queried []string
+
 		client := &Client{
 			exchange: func(_ context.Context, msg *dns.Msg, _ string) (*dns.Msg, error) {
 				name := msg.Question[0].Header().Name
 				queried = append(queried, name)
+
 				if name != "example.com." {
 					return &dns.Msg{MsgHeader: dns.MsgHeader{Rcode: dns.RcodeSuccess}}, nil
 				}
@@ -439,10 +444,12 @@ func TestCheckCAA(t *testing.T) {
 		t.Parallel()
 
 		var queried []string
+
 		client := &Client{
 			exchange: func(_ context.Context, msg *dns.Msg, _ string) (*dns.Msg, error) {
 				name := msg.Question[0].Header().Name
 				queried = append(queried, name)
+
 				if name == "trust.example.com." {
 					return &dns.Msg{MsgHeader: dns.MsgHeader{Rcode: dns.RcodeSuccess}}, nil
 				}
@@ -490,6 +497,7 @@ func TestCheckCAA(t *testing.T) {
 		t.Parallel()
 
 		var deadlines []time.Time
+
 		client := &Client{
 			ExchangeTimeout: 2 * time.Second,
 			exchange: func(ctx context.Context, msg *dns.Msg, _ string) (*dns.Msg, error) {