builder-next: Don't return error from exported callback

vvoland · vvoland · commit bce76d486e08 · 2024-07-02T12:34:51.000+02:00
This is only a callback that notifies about event so there is no way to
react to the error.

Signed-off-by: Paweł Gronowski &lt;pawel.gronowski@docker.com&gt;
diff --git a/builder/builder-next/exporter/wrapper.go b/builder/builder-next/exporter/wrapper.go
@@ -11,7 +11,7 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-type ImageExportedByBuildkit = func(ctx context.Context, id string, desc ocispec.Descriptor) error
+type ImageExportedByBuildkit = func(ctx context.Context, id string, desc ocispec.Descriptor)
 
 // Wraps the containerimage exporter's Resolve method to apply moby-specific
 // overrides to the exporter attributes.
diff --git a/daemon/build.go b/daemon/build.go
@@ -10,7 +10,6 @@ import (
 // This is used to log the image creation event for untagged images.
 // When no tag is given, buildkit doesn't call the image service so it has no
 // way of knowing the image was created.
-func (daemon *Daemon) ImageExportedByBuildkit(ctx context.Context, id string, desc ocispec.Descriptor) error {
+func (daemon *Daemon) ImageExportedByBuildkit(ctx context.Context, id string, desc ocispec.Descriptor) {
 	daemon.imageService.LogImageEvent(id, id, "create")
-	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`12`	`12`	`)`
`13`	`13`
`14`		`-type ImageExportedByBuildkit = func(ctx context.Context, id string, desc ocispec.Descriptor) error`
	`14`	`+type ImageExportedByBuildkit = func(ctx context.Context, id string, desc ocispec.Descriptor)`
`15`	`15`
`16`	`16`	`// Wraps the containerimage exporter's Resolve method to apply moby-specific`
`17`	`17`	`// overrides to the exporter attributes.`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`// This is used to log the image creation event for untagged images.`
`11`	`11`	`// When no tag is given, buildkit doesn't call the image service so it has no`
`12`	`12`	`// way of knowing the image was created.`
`13`		`-func (daemon *Daemon) ImageExportedByBuildkit(ctx context.Context, id string, desc ocispec.Descriptor) error {`
	`13`	`+func (daemon *Daemon) ImageExportedByBuildkit(ctx context.Context, id string, desc ocispec.Descriptor) {`
`14`	`14`	`daemon.imageService.LogImageEvent(id, id, "create")`
`15`		`- return nil`
`16`	`15`	`}`