From 833f100d6a0228b657099006a4e35b009db7d09b Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 5 Mar 2026 18:02:45 +0100 Subject: [PATCH] chore(ari): use doer instead of raw HTTP client --- acme/api/certificate_renewal.go | 16 ++-------------- acme/api/certificate_renewal_test.go | 6 ++---- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/acme/api/certificate_renewal.go b/acme/api/certificate_renewal.go index 57d2049ef..24f3d524c 100644 --- a/acme/api/certificate_renewal.go +++ b/acme/api/certificate_renewal.go @@ -5,10 +5,8 @@ import ( "crypto/x509" "encoding/asn1" "encoding/base64" - "encoding/json" "errors" "fmt" - "net/http" "github.com/go-acme/lego/v5/acme" ) @@ -32,25 +30,15 @@ func (c *CertificateService) GetRenewalInfo(ctx context.Context, certID string) return nil, errors.New("renewalInfo[get]: 'certID' cannot be empty") } - req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.core.GetDirectory().RenewalInfo+"/"+certID, nil) - if err != nil { - return nil, err - } + info := new(acme.ExtendedRenewalInfo) - resp, err := c.core.HTTPClient.Do(req) + resp, err := c.core.doer.Get(ctx, c.core.GetDirectory().RenewalInfo+"/"+certID, info) if err != nil { return nil, err } defer func() { _ = resp.Body.Close() }() - info := new(acme.ExtendedRenewalInfo) - - err = json.NewDecoder(resp.Body).Decode(info) - if err != nil { - return nil, err - } - if retry := resp.Header.Get("Retry-After"); retry != "" { info.RetryAfter, err = ParseRetryAfter(retry) if err != nil { diff --git a/acme/api/certificate_renewal_test.go b/acme/api/certificate_renewal_test.go index 634828569..401345e55 100644 --- a/acme/api/certificate_renewal_test.go +++ b/acme/api/certificate_renewal_test.go @@ -50,8 +50,7 @@ func TestCertificateService_GetRenewalInfo(t *testing.T) { "end": "2020-03-17T18:21:09Z" }, "explanationUrl": "https://aricapable.ca.example/docs/renewal-advice/" - } - }`). + }`). WithHeader("Content-Type", "application/json"). WithHeader("Retry-After", "21600")). BuildHTTPS(t) @@ -83,8 +82,7 @@ func TestCertificateService_GetRenewalInfo_retryAfter(t *testing.T) { "end": "2020-03-17T18:21:09Z" }, "explanationUrl": "https://aricapable.ca.example/docs/renewal-advice/" - } - }`). + }`). WithHeader("Content-Type", "application/json"). WithHeader("Retry-After", time.Now().UTC().Add(6*time.Hour).Format(time.RFC1123))). BuildHTTPS(t)