From 3a3eb77e8eac1c91fa679dcd1c7757e89fa93c3a Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 10 Feb 2026 17:52:06 +0100 Subject: [PATCH] chore: user agent --- acme/api/internal/sender/sender.go | 9 ++++----- acme/api/internal/sender/sender_test.go | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/acme/api/internal/sender/sender.go b/acme/api/internal/sender/sender.go index 4495bdd88..f9949a7cc 100644 --- a/acme/api/internal/sender/sender.go +++ b/acme/api/internal/sender/sender.go @@ -32,7 +32,7 @@ func NewDoer(client *http.Client, userAgent string) *Doer { return &Doer{ httpClient: client, - userAgent: userAgent, + userAgent: formatUserAgent(userAgent), } } @@ -75,7 +75,7 @@ func (d *Doer) newRequest(ctx context.Context, method, uri string, body io.Reade return nil, fmt.Errorf("failed to create request: %w", err) } - req.Header.Set("User-Agent", d.formatUserAgent()) + req.Header.Set("User-Agent", d.userAgent) for _, opt := range opts { err = opt(req) @@ -115,9 +115,8 @@ func (d *Doer) do(req *http.Request, response any) (*http.Response, error) { } // formatUserAgent builds and returns the User-Agent string to use in requests. -func (d *Doer) formatUserAgent() string { - ua := fmt.Sprintf("%s %s (%s; %s; %s)", d.userAgent, ourUserAgent, ourUserAgentComment, runtime.GOOS, runtime.GOARCH) - return strings.TrimSpace(ua) +func formatUserAgent(userAgent string) string { + return strings.TrimSpace(fmt.Sprintf("%s %s (%s; %s; %s)", userAgent, ourUserAgent, ourUserAgentComment, runtime.GOOS, runtime.GOARCH)) } func checkError(req *http.Request, resp *http.Response) error { diff --git a/acme/api/internal/sender/sender_test.go b/acme/api/internal/sender/sender_test.go index f4e199472..3c077b8cf 100644 --- a/acme/api/internal/sender/sender_test.go +++ b/acme/api/internal/sender/sender_test.go @@ -58,11 +58,10 @@ func TestDo_UserAgentOnAllHTTPMethod(t *testing.T) { } } -func TestDo_CustomUserAgent(t *testing.T) { +func Test_formatUserAgent(t *testing.T) { customUA := "MyApp/1.2.3" - doer := NewDoer(http.DefaultClient, customUA) - ua := doer.formatUserAgent() + ua := formatUserAgent(customUA) assert.Contains(t, ua, ourUserAgent) assert.Contains(t, ua, customUA)