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>
This commit is contained in:
committed by
Bryan Frimin
parent
fff8319e07
commit
f844933b7d
@@ -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))
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user