Skip to content

Commit 6041d4e

Browse files
committed
Update fuzz contrib for updated image service
Signed-off-by: Derek McGowan <[email protected]>
1 parent 2a476d4 commit 6041d4e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

contrib/fuzz/builtins.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
_ "github.com/containerd/containerd/v2/metadata/plugin"
2626
_ "github.com/containerd/containerd/v2/pkg/cri"
2727
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
28+
_ "github.com/containerd/containerd/v2/plugins/cri/images"
2829
_ "github.com/containerd/containerd/v2/plugins/imageverifier"
2930
_ "github.com/containerd/containerd/v2/plugins/sandbox"
3031
_ "github.com/containerd/containerd/v2/plugins/streaming"

contrib/fuzz/cri_server_fuzzer.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ func FuzzCRIServer(data []byte) int {
4343
defer client.Close()
4444

4545
config := criconfig.Config{}
46+
imageConfig := criconfig.ImageConfig{}
4647

47-
imageService, err := images.NewService(config.ImageConfig, map[string]string{}, map[string]images.RuntimePlatform{}, client)
48+
imageService, err := images.NewService(imageConfig, &images.CRIImageServiceOptions{
49+
Client: client,
50+
})
4851
if err != nil {
4952
panic(err)
5053
}
5154

52-
is := images.NewGRPCService(imageService)
53-
5455
c, rs, err := server.NewCRIService(config, &server.CRIServiceOptions{
5556
ImageService: imageService,
5657
Client: client,
@@ -63,7 +64,7 @@ func FuzzCRIServer(data []byte) int {
6364
return fuzzCRI(f, &service{
6465
CRIService: c,
6566
RuntimeServiceServer: rs,
66-
ImageServiceServer: is,
67+
ImageServiceServer: imageService.GRPCService(),
6768
})
6869
}
6970

0 commit comments

Comments
 (0)