diff options
| author | Matthew Holt <[email protected]> | 2024-12-19 12:17:02 -0700 |
|---|---|---|
| committer | Matthew Holt <[email protected]> | 2024-12-19 12:17:07 -0700 |
| commit | ed1c594cdbddf89829eaf1174f414028577b432d (patch) | |
| tree | 917b260acf9d1a9851134cf90a6386017875a73f /caddytest/integration/acme_test.go | |
| parent | 66c80caf236e2d98e61bf1bc8bb062d7b8c25430 (diff) | |
| download | caddy-ed1c594cdbddf89829eaf1174f414028577b432d.tar.gz caddy-ed1c594cdbddf89829eaf1174f414028577b432d.zip | |
go.mod: Upgrade ACMEz to v3; and upgrade CertMagic
Diffstat (limited to 'caddytest/integration/acme_test.go')
| -rw-r--r-- | caddytest/integration/acme_test.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/caddytest/integration/acme_test.go b/caddytest/integration/acme_test.go index ceacd1db0..d7e4c296d 100644 --- a/caddytest/integration/acme_test.go +++ b/caddytest/integration/acme_test.go @@ -6,6 +6,7 @@ import ( "crypto/elliptic" "crypto/rand" "fmt" + "log/slog" "net" "net/http" "strings" @@ -13,10 +14,11 @@ import ( "github.com/caddyserver/caddy/v2" "github.com/caddyserver/caddy/v2/caddytest" - "github.com/mholt/acmez/v2" - "github.com/mholt/acmez/v2/acme" + "github.com/mholt/acmez/v3" + "github.com/mholt/acmez/v3/acme" smallstepacme "github.com/smallstep/certificates/acme" "go.uber.org/zap" + "go.uber.org/zap/exp/zapslog" ) const acmeChallengePort = 9081 @@ -48,7 +50,7 @@ func TestACMEServerWithDefaults(t *testing.T) { Client: &acme.Client{ Directory: "https://acme.localhost:9443/acme/local/directory", HTTPClient: tester.Client, - Logger: logger, + Logger: slog.New(zapslog.NewHandler(logger.Core())), }, ChallengeSolvers: map[string]acmez.Solver{ acme.ChallengeTypeHTTP01: &naiveHTTPSolver{logger: logger}, @@ -117,7 +119,7 @@ func TestACMEServerWithMismatchedChallenges(t *testing.T) { Client: &acme.Client{ Directory: "https://acme.localhost:9443/acme/local/directory", HTTPClient: tester.Client, - Logger: logger, + Logger: slog.New(zapslog.NewHandler(logger.Core())), }, ChallengeSolvers: map[string]acmez.Solver{ acme.ChallengeTypeHTTP01: &naiveHTTPSolver{logger: logger}, |