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

Update fuzz contrib for updated image service

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2023-12-23 00:12:05 -08:00
parent 2a476d4214
commit 6041d4e60c
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/fuzz/builtins.go
View File

@ -25,6 +25,7 @@ import (
_ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/cri"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/streaming"

9
contrib/fuzz/cri_server_fuzzer.go
View File

@ -43,14 +43,15 @@ func FuzzCRIServer(data []byte) int {
defer client.Close() defer client.Close()
config := criconfig.Config{} config := criconfig.Config{}
imageConfig := criconfig.ImageConfig{}
imageService, err := images.NewService(config.ImageConfig, map[string]string{}, map[string]images.RuntimePlatform{}, client) imageService, err := images.NewService(imageConfig, &images.CRIImageServiceOptions{
Client: client,
})
if err != nil { if err != nil {
panic(err) panic(err)
} }
is := images.NewGRPCService(imageService)
c, rs, err := server.NewCRIService(config, &server.CRIServiceOptions{ c, rs, err := server.NewCRIService(config, &server.CRIServiceOptions{
ImageService: imageService, ImageService: imageService,
Client: client, Client: client,
@ -63,7 +64,7 @@ func FuzzCRIServer(data []byte) int {
return fuzzCRI(f, &service{ return fuzzCRI(f, &service{
CRIService: c, CRIService: c,
RuntimeServiceServer: rs, RuntimeServiceServer: rs,
ImageServiceServer: is, ImageServiceServer: imageService.GRPCService(),
}) })
} }