Skip to content

Commit e1190e7

Browse files
authored
bug: fix compatibility with latest caddy (#32)
Caddy v2.7.0-beta introduces the ability to customize the sink logs. This comes at the cost of changing the way Go structs are initialized. This change updates our Caddy plugin to be compatible with the latest changes. Fixes #31
1 parent 96fff53 commit e1190e7

File tree

3 files changed

+319
-103
lines changed

3 files changed

+319
-103
lines changed

go.mod

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,119 @@
11
module github.com/caddyserver/nginx-adapter
22

3-
go 1.13
3+
go 1.20
44

55
require (
6-
github.com/caddyserver/caddy/v2 v2.5.3-0.20220713145230-c2bbe42fc355
6+
github.com/caddyserver/caddy/v2 v2.7.0-beta.2
77
github.com/caddyserver/ntlm-transport v0.1.2
88
github.com/hairyhenderson/go-which v0.2.0
99
)
10+
11+
require (
12+
filippo.io/edwards25519 v1.0.0 // indirect
13+
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
14+
github.com/BurntSushi/toml v1.3.2 // indirect
15+
github.com/Masterminds/goutils v1.1.1 // indirect
16+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
17+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
18+
github.com/Microsoft/go-winio v0.6.0 // indirect
19+
github.com/alecthomas/chroma/v2 v2.7.0 // indirect
20+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
21+
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/caddyserver/certmagic v0.18.2 // indirect
24+
github.com/cespare/xxhash v1.1.0 // indirect
25+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26+
github.com/chzyer/readline v1.5.1 // indirect
27+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
28+
github.com/dgraph-io/badger v1.6.2 // indirect
29+
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
30+
github.com/dgraph-io/ristretto v0.1.0 // indirect
31+
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
32+
github.com/dlclark/regexp2 v1.7.0 // indirect
33+
github.com/dustin/go-humanize v1.0.1 // indirect
34+
github.com/go-kit/kit v0.10.0 // indirect
35+
github.com/go-logfmt/logfmt v0.5.1 // indirect
36+
github.com/go-sql-driver/mysql v1.7.0 // indirect
37+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
38+
github.com/golang/glog v1.1.0 // indirect
39+
github.com/golang/mock v1.6.0 // indirect
40+
github.com/golang/protobuf v1.5.3 // indirect
41+
github.com/golang/snappy v0.0.4 // indirect
42+
github.com/google/cel-go v0.15.1 // indirect
43+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
44+
github.com/google/uuid v1.3.0 // indirect
45+
github.com/huandu/xstrings v1.3.3 // indirect
46+
github.com/imdario/mergo v0.3.12 // indirect
47+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
48+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
49+
github.com/jackc/pgconn v1.14.0 // indirect
50+
github.com/jackc/pgio v1.0.0 // indirect
51+
github.com/jackc/pgpassfile v1.0.0 // indirect
52+
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
53+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
54+
github.com/jackc/pgtype v1.14.0 // indirect
55+
github.com/jackc/pgx/v4 v4.18.0 // indirect
56+
github.com/klauspost/compress v1.16.6 // indirect
57+
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
58+
github.com/libdns/libdns v0.2.1 // indirect
59+
github.com/manifoldco/promptui v0.9.0 // indirect
60+
github.com/mastercactapus/proxyprotocol v0.0.4 // indirect
61+
github.com/mattn/go-colorable v0.1.8 // indirect
62+
github.com/mattn/go-isatty v0.0.16 // indirect
63+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
64+
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
65+
github.com/mholt/acmez v1.2.0 // indirect
66+
github.com/micromdm/scep/v2 v2.1.0 // indirect
67+
github.com/miekg/dns v1.1.55 // indirect
68+
github.com/mitchellh/copystructure v1.2.0 // indirect
69+
github.com/mitchellh/go-ps v1.0.0 // indirect
70+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
71+
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
72+
github.com/pkg/errors v0.9.1 // indirect
73+
github.com/prometheus/client_golang v1.14.0 // indirect
74+
github.com/prometheus/client_model v0.3.0 // indirect
75+
github.com/prometheus/common v0.37.0 // indirect
76+
github.com/prometheus/procfs v0.8.0 // indirect
77+
github.com/quic-go/qpack v0.4.0 // indirect
78+
github.com/quic-go/qtls-go1-19 v0.3.2 // indirect
79+
github.com/quic-go/qtls-go1-20 v0.2.2 // indirect
80+
github.com/quic-go/quic-go v0.36.0 // indirect
81+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
82+
github.com/shopspring/decimal v1.2.0 // indirect
83+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
84+
github.com/slackhq/nebula v1.6.1 // indirect
85+
github.com/smallstep/certificates v0.24.2 // indirect
86+
github.com/smallstep/nosql v0.6.0 // indirect
87+
github.com/smallstep/truststore v0.12.1 // indirect
88+
github.com/spf13/afero v1.3.3 // indirect
89+
github.com/spf13/cast v1.4.1 // indirect
90+
github.com/spf13/cobra v1.7.0 // indirect
91+
github.com/spf13/pflag v1.0.5 // indirect
92+
github.com/stoewer/go-strcase v1.2.0 // indirect
93+
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
94+
github.com/urfave/cli v1.22.13 // indirect
95+
github.com/yuin/goldmark v1.5.4 // indirect
96+
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87 // indirect
97+
go.etcd.io/bbolt v1.3.7 // indirect
98+
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
99+
go.step.sm/cli-utils v0.7.6 // indirect
100+
go.step.sm/crypto v0.30.0 // indirect
101+
go.step.sm/linkedca v0.19.1 // indirect
102+
go.uber.org/atomic v1.11.0 // indirect
103+
go.uber.org/multierr v1.11.0 // indirect
104+
go.uber.org/zap v1.24.0 // indirect
105+
golang.org/x/crypto v0.10.0 // indirect
106+
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
107+
golang.org/x/mod v0.11.0 // indirect
108+
golang.org/x/net v0.11.0 // indirect
109+
golang.org/x/sys v0.9.0 // indirect
110+
golang.org/x/term v0.9.0 // indirect
111+
golang.org/x/text v0.10.0 // indirect
112+
golang.org/x/tools v0.10.0 // indirect
113+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
114+
google.golang.org/grpc v1.55.0 // indirect
115+
google.golang.org/protobuf v1.30.0 // indirect
116+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
117+
gopkg.in/yaml.v3 v3.0.1 // indirect
118+
howett.net/plist v1.0.0 // indirect
119+
)

0 commit comments

Comments
 (0)