Skip to content

Commit 36f3b89

Browse files
committed
core: resolve compatibility with v2.8.0
The logge-name-to-host map has changed in Caddy v2.8.0 from a one-to-one to one-to-many (taking a slice). This commit adapts to the change. Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>
1 parent 33ac0ff commit 36f3b89

File tree

3 files changed

+315
-196
lines changed

3 files changed

+315
-196
lines changed

go.mod

+68-60
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,51 @@
11
module github.com/caddyserver/nginx-adapter
22

3-
go 1.20
3+
go 1.21.0
4+
5+
toolchain go1.22.3
46

57
require (
6-
github.com/caddyserver/caddy/v2 v2.7.0
8+
github.com/caddyserver/caddy/v2 v2.8.0
79
github.com/caddyserver/ntlm-transport v0.1.2
810
github.com/hairyhenderson/go-which v0.2.0
911
)
1012

1113
require (
12-
filippo.io/edwards25519 v1.0.0 // indirect
14+
filippo.io/edwards25519 v1.1.0 // indirect
1315
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
1416
github.com/BurntSushi/toml v1.3.2 // indirect
1517
github.com/Masterminds/goutils v1.1.1 // indirect
1618
github.com/Masterminds/semver/v3 v3.2.0 // indirect
1719
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
1820
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/alecthomas/chroma/v2 v2.13.0 // indirect
22+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2123
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
2224
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/caddyserver/certmagic v0.19.2 // indirect
25+
github.com/caddyserver/certmagic v0.21.2 // indirect
26+
github.com/caddyserver/zerossl v0.1.3 // indirect
2427
github.com/cespare/xxhash v1.1.0 // indirect
2528
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2629
github.com/chzyer/readline v1.5.1 // indirect
27-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
30+
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
2831
github.com/dgraph-io/badger v1.6.2 // indirect
2932
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
3033
github.com/dgraph-io/ristretto v0.1.0 // indirect
3134
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
32-
github.com/dlclark/regexp2 v1.7.0 // indirect
35+
github.com/dlclark/regexp2 v1.11.0 // indirect
3336
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-jose/go-jose/v3 v3.0.3 // indirect
38+
github.com/go-kit/kit v0.13.0 // indirect
39+
github.com/go-kit/log v0.2.1 // indirect
40+
github.com/go-logfmt/logfmt v0.6.0 // indirect
41+
github.com/go-sql-driver/mysql v1.7.1 // indirect
3742
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
43+
github.com/golang/glog v1.2.0 // indirect
44+
github.com/golang/protobuf v1.5.4 // indirect
4145
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
46+
github.com/google/cel-go v0.20.1 // indirect
47+
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
48+
github.com/google/uuid v1.6.0 // indirect
4549
github.com/huandu/xstrings v1.3.3 // indirect
4650
github.com/imdario/mergo v0.3.12 // indirect
4751
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -52,68 +56,72 @@ require (
5256
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
5357
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
5458
github.com/jackc/pgtype v1.14.0 // indirect
55-
github.com/jackc/pgx/v4 v4.18.2 // indirect
56-
github.com/klauspost/compress v1.16.7 // indirect
57-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
58-
github.com/libdns/libdns v0.2.1 // indirect
59+
github.com/jackc/pgx/v4 v4.18.3 // indirect
60+
github.com/klauspost/compress v1.17.8 // indirect
61+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
62+
github.com/libdns/libdns v0.2.2 // indirect
5963
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/mattn/go-colorable v0.1.13 // indirect
65+
github.com/mattn/go-isatty v0.0.20 // indirect
6466
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
67+
github.com/mholt/acmez/v2 v2.0.1 // indirect
68+
github.com/miekg/dns v1.1.59 // indirect
6869
github.com/mitchellh/copystructure v1.2.0 // indirect
6970
github.com/mitchellh/go-ps v1.0.0 // indirect
7071
github.com/mitchellh/reflectwalk v1.0.2 // indirect
71-
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
72+
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
73+
github.com/pires/go-proxyproto v0.7.0 // indirect
7274
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
75+
github.com/prometheus/client_golang v1.19.1 // indirect
76+
github.com/prometheus/client_model v0.5.0 // indirect
77+
github.com/prometheus/common v0.48.0 // indirect
78+
github.com/prometheus/procfs v0.12.0 // indirect
7779
github.com/quic-go/qpack v0.4.0 // indirect
78-
github.com/quic-go/qtls-go1-20 v0.3.1 // indirect
79-
github.com/quic-go/quic-go v0.37.5 // indirect
80+
github.com/quic-go/quic-go v0.44.0 // indirect
81+
github.com/rs/xid v1.5.0 // indirect
8082
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8183
github.com/shopspring/decimal v1.2.0 // indirect
8284
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
8385
github.com/slackhq/nebula v1.6.1 // indirect
84-
github.com/smallstep/certificates v0.24.3-rc.5 // indirect
85-
github.com/smallstep/nosql v0.6.0 // indirect
86-
github.com/smallstep/truststore v0.12.1 // indirect
86+
github.com/smallstep/certificates v0.26.1 // indirect
87+
github.com/smallstep/nosql v0.6.1 // indirect
88+
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 // indirect
89+
github.com/smallstep/scep v0.0.0-20231024192529-aee96d7ad34d // indirect
90+
github.com/smallstep/truststore v0.13.0 // indirect
8791
github.com/spf13/afero v1.3.3 // indirect
8892
github.com/spf13/cast v1.4.1 // indirect
89-
github.com/spf13/cobra v1.7.0 // indirect
93+
github.com/spf13/cobra v1.8.0 // indirect
9094
github.com/spf13/pflag v1.0.5 // indirect
9195
github.com/stoewer/go-strcase v1.2.0 // indirect
92-
github.com/tailscale/tscert v0.0.0-20230509043813-4e9cb4f2b4ad // indirect
96+
github.com/tailscale/tscert v0.0.0-20240517230440-bbccfbf48933 // indirect
9397
github.com/urfave/cli v1.22.14 // indirect
94-
github.com/yuin/goldmark v1.5.5 // indirect
98+
github.com/yuin/goldmark v1.7.1 // indirect
9599
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc // indirect
96100
github.com/zeebo/blake3 v0.2.3 // 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.8.0 // indirect
100-
go.step.sm/crypto v0.33.0 // indirect
101-
go.step.sm/linkedca v0.20.0 // indirect
101+
go.etcd.io/bbolt v1.3.9 // indirect
102+
go.step.sm/cli-utils v0.9.0 // indirect
103+
go.step.sm/crypto v0.45.0 // indirect
104+
go.step.sm/linkedca v0.20.1 // indirect
105+
go.uber.org/automaxprocs v1.5.3 // indirect
106+
go.uber.org/mock v0.4.0 // indirect
102107
go.uber.org/multierr v1.11.0 // indirect
103-
go.uber.org/zap v1.25.0 // indirect
104-
golang.org/x/crypto v0.20.0 // indirect
105-
golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect
106-
golang.org/x/mod v0.11.0 // indirect
107-
golang.org/x/net v0.21.0 // indirect
108-
golang.org/x/sys v0.17.0 // indirect
109-
golang.org/x/term v0.17.0 // indirect
110-
golang.org/x/text v0.14.0 // indirect
111-
golang.org/x/tools v0.10.0 // indirect
112-
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
113-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
114-
google.golang.org/grpc v1.58.3 // indirect
115-
google.golang.org/protobuf v1.33.0 // indirect
116-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
108+
go.uber.org/zap v1.27.0 // indirect
109+
go.uber.org/zap/exp v0.2.0 // indirect
110+
golang.org/x/crypto v0.23.0 // indirect
111+
golang.org/x/crypto/x509roots/fallback v0.0.0-20240507223354-67b13616a595 // indirect
112+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
113+
golang.org/x/mod v0.17.0 // indirect
114+
golang.org/x/net v0.25.0 // indirect
115+
golang.org/x/sync v0.7.0 // indirect
116+
golang.org/x/sys v0.20.0 // indirect
117+
golang.org/x/term v0.20.0 // indirect
118+
golang.org/x/text v0.15.0 // indirect
119+
golang.org/x/time v0.5.0 // indirect
120+
golang.org/x/tools v0.21.0 // indirect
121+
google.golang.org/genproto/googleapis/api v0.0.0-20240506185236-b8a5c65736ae // indirect
122+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
123+
google.golang.org/grpc v1.63.2 // indirect
124+
google.golang.org/protobuf v1.34.1 // indirect
117125
gopkg.in/yaml.v3 v3.0.1 // indirect
118126
howett.net/plist v1.0.0 // indirect
119127
)

0 commit comments

Comments
 (0)