knative
/
serving
mirror of https://github.com/knative/serving.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to latest dependencies (#15840) 

bumping knative.dev/networking 5ce28a2...f1b08e6:
  > f1b08e6 upgrade to latest dependencies (# 1054)
  > 0d887a8 bump to golangci yaml v2 (# 1057)
  > a46e5f4 bump to golangci yaml v2 (# 1056)
bumping gomodules.xyz/jsonpatch/v2 17d7994...ffbac60:
  > ffbac60 Merge pull request # 40 from lacroixthomas/bugfixes/fix-lossy-in64
  > 4c723fc fix: handle lossy int64
bumping knative.dev/pkg b9bfb45...a8e20d9:
  > a8e20d9 Bump gomodules.xyz/jsonpatch/v2 from 2.4.0 to 2.5.0 (# 3154)
  > 7b91ff1 update .golangci.yaml to v2 (# 3167)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
Knative Automation 2025-04-13 22:46:15 -04:00 committed by GitHub
parent 3d830a0420
commit 44559d5264
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -35,8 +35,8 @@ require (
k8s.io/utils v0.0.0-20241210054802-24370beab758
knative.dev/caching v0.0.0-20250411014313-7889830edd1f
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa
sigs.k8s.io/yaml v1.4.0
)
@ -145,7 +145,7 @@ require (
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/tools v0.31.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
google.golang.org/protobuf v1.36.6 // indirect

12
go.sum
View File

@ -800,8 +800,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0=
gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE=
gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
@ -960,10 +960,10 @@ knative.dev/caching v0.0.0-20250411014313-7889830edd1f h1:srWl6vy0o7pqiwhB2j68Jk
knative.dev/caching v0.0.0-20250411014313-7889830edd1f/go.mod h1:QkaFb1+ywj3x9nPgwz7iqab3XiCLngfTg9kKUv118zA=
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775 h1:UstB8/aowofYFHjLyZdPh1K7qB9BCx+lP1WuiCspYRE=
knative.dev/hack v0.0.0-20250331013814-c577ed9f7775/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f h1:ZF5EnxQ143E3N4tWrEzB23Ri6F8MXFXEYTvwyOqeAow=
knative.dev/networking v0.0.0-20250331014822-5ce28a23124f/go.mod h1:1+ZaT0rv4BHCqjz0Jdtc/wkj47soAkHH1cfbq3fpmIg=
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367 h1:g9g6oBDmg952q66ozO05j7CDDykDsBbJbWqfDPZlxG8=
knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367/go.mod h1:mGbAft598EkpysGkFqP6p4GVu6pGVuAsxHjdJk5wY00=
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f h1:x1kpIezFHPUqIOUVbT2foQFrLtdwK9krzs4OfLyY5R4=
knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f/go.mod h1:rjkDjuJfuA64ABptp9QZjWgOWkdRhuz2dP8KUIbE+PQ=
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa h1:nQpAhhXxSFQ8ZK/D6cF3l354J2XPNMHmswwVZWMx+Ac=
knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa/go.mod h1:IRDz/ZbQXmPFg/CHZRTdZgsljmfP7PMv9yY0iEsp03Q=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=

17
vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go vendored
View File

@ -70,12 +70,14 @@ func CreatePatch(a, b []byte) ([]Operation, error) {
}
var aI interface{}
var bI interface{}
err := json.Unmarshal(a, &aI)
if err != nil {
aDec := json.NewDecoder(bytes.NewReader(a))
aDec.UseNumber()
if err := aDec.Decode(&aI); err != nil {
return nil, errBadJSONDoc
}
err = json.Unmarshal(b, &bI)
if err != nil {
bDec := json.NewDecoder(bytes.NewReader(b))
bDec.UseNumber()
if err := bDec.Decode(&bI); err != nil {
return nil, errBadJSONDoc
}
return handleValues(aI, bI, "", []Operation{})
@ -94,6 +96,11 @@ func matchesValue(av, bv interface{}) bool {
if ok && bt == at {
return true
}
case json.Number:
bt, ok := bv.(json.Number)
if ok && bt == at {
return true
}
case float64:
bt, ok := bv.(float64)
if ok && bt == at {
@ -212,7 +219,7 @@ func handleValues(av, bv interface{}, p string, patch []Operation) ([]Operation,
if err != nil {
return nil, err
}
case string, float64, bool:
case string, float64, bool, json.Number:
if !matchesValue(av, bv) {
patch = append(patch, NewOperation("replace", p, bv))
}

6
vendor/modules.txt vendored
View File

@ -705,7 +705,7 @@ golang.org/x/tools/internal/stdlib
golang.org/x/tools/internal/typeparams
golang.org/x/tools/internal/typesinternal
golang.org/x/tools/internal/versions
# gomodules.xyz/jsonpatch/v2 v2.4.0
# gomodules.xyz/jsonpatch/v2 v2.5.0
## explicit; go 1.20
gomodules.xyz/jsonpatch/v2
# google.golang.org/api v0.198.0
@ -1423,7 +1423,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
# knative.dev/hack v0.0.0-20250331013814-c577ed9f7775
## explicit; go 1.21
knative.dev/hack
# knative.dev/networking v0.0.0-20250331014822-5ce28a23124f
# knative.dev/networking v0.0.0-20250411212114-f1b08e6cfc7f
## explicit; go 1.23.0
knative.dev/networking/config
knative.dev/networking/pkg
@ -1462,7 +1462,7 @@ knative.dev/networking/pkg/http/stats
knative.dev/networking/pkg/ingress
knative.dev/networking/pkg/k8s
knative.dev/networking/pkg/prober
# knative.dev/pkg v0.0.0-20250411024212-b9bfb4527367
# knative.dev/pkg v0.0.0-20250411133814-a8e20d9db3aa
## explicit; go 1.23.0
knative.dev/pkg/apiextensions/storageversion
knative.dev/pkg/apiextensions/storageversion/cmd/migrate