github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10954 from dmcgowan/update-typeurl-2.2.2

Browse Source 
Update typeurl to v2.2.2
This commit is contained in:
Samuel Karp 2024-11-05 07:10:43 +00:00 committed by GitHub
commit 6369206870
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -27,7 +27,7 @@ require (
github.com/containerd/platforms v1.0.0-rc.0 github.com/containerd/platforms v1.0.0-rc.0
github.com/containerd/plugin v1.0.0 github.com/containerd/plugin v1.0.0
github.com/containerd/ttrpc v1.2.6 github.com/containerd/ttrpc v1.2.6
github.com/containerd/typeurl/v2 v2.2.1 github.com/containerd/typeurl/v2 v2.2.2
github.com/containerd/zfs/v2 v2.0.0-rc.0 github.com/containerd/zfs/v2 v2.0.0-rc.0
github.com/containernetworking/cni v1.2.3 github.com/containernetworking/cni v1.2.3
github.com/containernetworking/plugins v1.5.1 github.com/containernetworking/plugins v1.5.1

4
go.sum
View File

@ -698,8 +698,8 @@ github.com/containerd/plugin v1.0.0/go.mod h1:hQfJe5nmWfImiqT1q8Si3jLv3ynMUIBB47
github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak= github.com/containerd/ttrpc v1.2.2/go.mod h1:sIT6l32Ph/H9cvnJsfXM5drIVzTr5A2flTf1G5tYZak=
github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4= github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4=
github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o= github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
github.com/containerd/typeurl/v2 v2.2.1 h1:/X1Kgcz4sKS/NTKQvvRS0pEVpUYqmPTwGQontm9pl0w= github.com/containerd/typeurl/v2 v2.2.2 h1:3jN/k2ysKuPCsln5Qv8bzR9cxal8XjkxPogJfSNO31k=
github.com/containerd/typeurl/v2 v2.2.1/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk= github.com/containerd/typeurl/v2 v2.2.2/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
github.com/containerd/zfs/v2 v2.0.0-rc.0 h1:0dRlgpoaepW7HuovtcvYQMF7NlpceQVdn7+3Udeth4M= github.com/containerd/zfs/v2 v2.0.0-rc.0 h1:0dRlgpoaepW7HuovtcvYQMF7NlpceQVdn7+3Udeth4M=
github.com/containerd/zfs/v2 v2.0.0-rc.0/go.mod h1:g36g/XCEGDRxUXIFdM3oWAEvmTvhfz/eKWElqg4Secw= github.com/containerd/zfs/v2 v2.0.0-rc.0/go.mod h1:g36g/XCEGDRxUXIFdM3oWAEvmTvhfz/eKWElqg4Secw=
github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM= github.com/containernetworking/cni v1.2.3 h1:hhOcjNVUQTnzdRJ6alC5XF+wd9mfGIUaj8FuJbEslXM=

14
vendor/github.com/containerd/typeurl/v2/types.go generated vendored
View File

@ -284,16 +284,14 @@ func getTypeByUrl(url string) (reflect.Type, error) {
mu.RUnlock() mu.RUnlock()
mt, err := protoregistry.GlobalTypes.FindMessageByURL(url) mt, err := protoregistry.GlobalTypes.FindMessageByURL(url)
if err != nil { if err != nil {
e := protoregistry.NotFound if errors.Is(err, protoregistry.NotFound) {
if !errors.Is(err, e) { for _, h := range handlers {
return nil, fmt.Errorf("type with url %s: %w", url, ErrNotFound) if t := h.GetType(url); t != nil {
} return t, nil
}
for _, h := range handlers {
if t := h.GetType(url); t != nil {
return t, nil
} }
} }
return nil, fmt.Errorf("type with url %s: %w", url, ErrNotFound)
} }
empty := mt.New().Interface() empty := mt.New().Interface()
return reflect.TypeOf(empty).Elem(), nil return reflect.TypeOf(empty).Elem(), nil

2
vendor/modules.txt vendored
View File

@ -194,7 +194,7 @@ github.com/containerd/plugin/registry
# github.com/containerd/ttrpc v1.2.6 # github.com/containerd/ttrpc v1.2.6
## explicit; go 1.19 ## explicit; go 1.19
github.com/containerd/ttrpc github.com/containerd/ttrpc
# github.com/containerd/typeurl/v2 v2.2.1 # github.com/containerd/typeurl/v2 v2.2.2
## explicit; go 1.21 ## explicit; go 1.21
github.com/containerd/typeurl/v2 github.com/containerd/typeurl/v2
# github.com/containerd/zfs/v2 v2.0.0-rc.0 # github.com/containerd/zfs/v2 v2.0.0-rc.0