@marcel91200 / caddy Mirror · read-only / commits / df77f8bd
Fork 0

Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS

Mirrored from https://github.com/Slazee/caddy.git

Synced Nov 11, 04:45 UTC

chore(deps): bump cel-go and switch import to new url (#8030)

techknowlogick committed Sep 16, 2026 at 21:09 UTC df77f8bde1a8d00f6c7043291325dd6b1f82742e
8 files changed +30 -30
go.mod
+1 -1
@@ -3,6 +3,7 @@ module github.com/caddyserver/caddy/v2
3 go 1.25.1
4
5 require (
6 + cel.dev/cel-go v0.32.0
7 github.com/BurntSushi/toml v1.6.0
8 github.com/DeRuina/timberjack v1.4.5
9 github.com/KimMachineGun/automemlimit v1.0.0
@@ -15,7 +16,6 @@ require (
16 github.com/dunglas/go-urlpattern v1.0.0
17 github.com/dustin/go-humanize v1.0.1
18 github.com/go-chi/chi/v5 v5.3.1
18 - github.com/google/cel-go v0.29.2
19 github.com/google/uuid v1.6.0
20 github.com/klauspost/compress v1.19.0
21 github.com/klauspost/cpuid/v2 v2.4.0
go.sum
+2 -2
@@ -1,3 +1,5 @@
1 +cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk=
2 +cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU=
3 cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
4 cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
5 cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
@@ -173,8 +175,6 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
175 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
176 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
177 github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
176 -github.com/google/cel-go v0.29.2 h1:ZtDxkeiMmz0mxbKDYiNkE5Lk7V5edMRcaaDf2jX002k=
177 -github.com/google/cel-go v0.29.2/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8=
178 github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg=
179 github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745 h1:heyoXNxkRT155x4jTAiSv5BVSVkueifPUm+Q8LUXMRo=
180 github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745/go.mod h1:zN0wUQgV9LjwLZeFHnrAbQi8hzMVvEWePyk+MhPOk7k=
modules/caddyhttp/celmatcher.go
+11 -11
@@ -25,17 +25,17 @@ import (
25 "strings"
26 "time"
27
28 - "github.com/google/cel-go/cel"
29 - "github.com/google/cel-go/common"
30 - "github.com/google/cel-go/common/ast"
31 - "github.com/google/cel-go/common/operators"
32 - "github.com/google/cel-go/common/types"
33 - "github.com/google/cel-go/common/types/ref"
34 - "github.com/google/cel-go/common/types/traits"
35 - "github.com/google/cel-go/ext"
36 - "github.com/google/cel-go/interpreter"
37 - "github.com/google/cel-go/interpreter/functions"
38 - "github.com/google/cel-go/parser"
28 + "cel.dev/cel-go/cel"
29 + "cel.dev/cel-go/common"
30 + "cel.dev/cel-go/common/ast"
31 + "cel.dev/cel-go/common/operators"
32 + "cel.dev/cel-go/common/types"
33 + "cel.dev/cel-go/common/types/ref"
34 + "cel.dev/cel-go/common/types/traits"
35 + "cel.dev/cel-go/ext"
36 + "cel.dev/cel-go/interpreter"
37 + "cel.dev/cel-go/interpreter/functions"
38 + "cel.dev/cel-go/parser"
39 "go.uber.org/zap"
40
41 "github.com/caddyserver/caddy/v2"
modules/caddyhttp/fileserver/matcher.go
+7 -7
@@ -25,13 +25,13 @@ import (
25 "strconv"
26 "strings"
27
28 - "github.com/google/cel-go/cel"
29 - "github.com/google/cel-go/common"
30 - "github.com/google/cel-go/common/ast"
31 - "github.com/google/cel-go/common/operators"
32 - "github.com/google/cel-go/common/types"
33 - "github.com/google/cel-go/common/types/ref"
34 - "github.com/google/cel-go/parser"
28 + "cel.dev/cel-go/cel"
29 + "cel.dev/cel-go/common"
30 + "cel.dev/cel-go/common/ast"
31 + "cel.dev/cel-go/common/operators"
32 + "cel.dev/cel-go/common/types"
33 + "cel.dev/cel-go/common/types/ref"
34 + "cel.dev/cel-go/parser"
35 "go.uber.org/zap"
36 "go.uber.org/zap/zapcore"
37
modules/caddyhttp/ip_matchers.go
+2 -2
@@ -22,8 +22,8 @@ import (
22 "net/netip"
23 "strings"
24
25 - "github.com/google/cel-go/cel"
26 - "github.com/google/cel-go/common/types/ref"
25 + "cel.dev/cel-go/cel"
26 + "cel.dev/cel-go/common/types/ref"
27 "go.uber.org/zap"
28 "go.uber.org/zap/zapcore"
29
modules/caddyhttp/matchers.go
+3 -3
@@ -30,9 +30,9 @@ import (
30 "strconv"
31 "strings"
32
33 - "github.com/google/cel-go/cel"
34 - "github.com/google/cel-go/common/types"
35 - "github.com/google/cel-go/common/types/ref"
33 + "cel.dev/cel-go/cel"
34 + "cel.dev/cel-go/common/types"
35 + "cel.dev/cel-go/common/types/ref"
36 "golang.org/x/net/idna"
37
38 "github.com/caddyserver/caddy/v2"
modules/caddyhttp/urlpatternmatcher.go
+2 -2
@@ -6,9 +6,9 @@ import (
6 "net/url"
7 "strings"
8
9 + "cel.dev/cel-go/cel"
10 + "cel.dev/cel-go/common/types/ref"
11 "github.com/dunglas/go-urlpattern"
10 - "github.com/google/cel-go/cel"
11 - "github.com/google/cel-go/common/types/ref"
12
13 "github.com/caddyserver/caddy/v2"
14 "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
modules/caddyhttp/vars.go
+2 -2
@@ -21,8 +21,8 @@ import (
21 "reflect"
22 "strings"
23
24 - "github.com/google/cel-go/cel"
25 - "github.com/google/cel-go/common/types/ref"
24 + "cel.dev/cel-go/cel"
25 + "cel.dev/cel-go/common/types/ref"
26
27 "github.com/caddyserver/caddy/v2"
28 "github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"