Fixed #27260 Use NewArtifactEvent by injecting dependency in NewArtifactStore

Signed-off-by: ByoungUk Lee <[email protected]>

Author: nimdrak

libpod/runtime.go

@@ -531,7 +531,15 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
 
 		// Using sync once value to only init the store exactly once and only when it will be actually be used.
 		runtime.ArtifactStore = sync.OnceValues(func() (*artStore.ArtifactStore, error) {
-			return artStore.NewArtifactStore(filepath.Join(runtime.storageConfig.GraphRoot, "artifacts"), runtime.SystemContext())
+			artifactEventCallBack := func(status, name, digest string, attributes map[string]string) {
+				eventStatus, err := events.StringToStatus(status)
+				if err != nil {
+					logrus.Errorf("Unknown artifact event status %q: %v", status, err)
+					return
+				}
+				runtime.NewArtifactEvent(eventStatus, name, digest, attributes)
+			}
+			return artStore.NewArtifactStore(filepath.Join(runtime.storageConfig.GraphRoot, "artifacts"), runtime.SystemContext(), artifactEventCallBack)
 		})
 	}
 

pkg/domain/infra/abi/artifact.go

@@ -10,7 +10,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/containers/podman/v5/libpod/events"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/opencontainers/go-digest"
 	"github.com/sirupsen/logrus"
@@ -87,8 +86,6 @@ func (ir *ImageEngine) ArtifactPull(ctx context.Context, name string, opts entit
 	if err != nil {
 		return nil, err
 	}
-
-	ir.Libpod.NewArtifactEvent(events.Pull, name, artifactDigest.String(), nil)
 	return &entities.ArtifactPullReport{
 		ArtifactDigest: &artifactDigest,
 	}, nil
@@ -134,7 +131,6 @@ func (ir *ImageEngine) ArtifactRm(ctx context.Context, opts entities.ArtifactRem
 			}
 			return nil, err
 		}
-		ir.Libpod.NewArtifactEvent(events.Remove, "", namesOrDigest, nil)
 		artifactDigests = append(artifactDigests, artifactDigest)
 	}
 	artifactRemoveReport := entities.ArtifactRemoveReport{
@@ -200,8 +196,6 @@ func (ir *ImageEngine) ArtifactPush(ctx context.Context, name string, opts entit
 	if err != nil {
 		return nil, err
 	}
-
-	ir.Libpod.NewArtifactEvent(events.Push, name, artifactDigest.String(), nil)
 	return &entities.ArtifactPushReport{
 		ArtifactDigest: &artifactDigest,
 	}, nil
@@ -232,9 +226,6 @@ func (ir *ImageEngine) ArtifactAdd(ctx context.Context, name string, artifactBlo
 	if err != nil {
 		return nil, err
 	}
-	ir.Libpod.NewArtifactEvent(events.Add, name, artifactDigest.String(), map[string]string{
-		"files": fmt.Sprintf("%d", len(artifactBlobs)),
-	})
 	return &entities.ArtifactAddReport{
 		ArtifactDigest: artifactDigest,
 	}, nil
@@ -251,13 +242,7 @@ func (ir *ImageEngine) ArtifactExtract(ctx context.Context, name string, target
 			Title:  opts.Title,
 		},
 	}
-	if err := artStore.Extract(ctx, name, target, &extractOpt); err != nil {
-		return err
-	}
-	ir.Libpod.NewArtifactEvent(events.Extract, name, opts.Digest, map[string]string{
-		"target": target,
-	})
-	return nil
+	return artStore.Extract(ctx, name, target, &extractOpt)
 }
 
 func (ir *ImageEngine) ArtifactExtractTarStream(ctx context.Context, w io.Writer, name string, opts entities.ArtifactExtractOptions) error {
@@ -272,12 +257,5 @@ func (ir *ImageEngine) ArtifactExtractTarStream(ctx context.Context, w io.Writer
 		},
 		ExcludeTitle: opts.ExcludeTitle,
 	}
-
-	if err = artStore.ExtractTarStream(ctx, w, name, &extractOpt); err != nil {
-		return err
-	}
-	ir.Libpod.NewArtifactEvent(events.Extract, name, opts.Digest, map[string]string{
-		"format": "tar-stream",
-	})
-	return nil
+	return artStore.ExtractTarStream(ctx, w, name, &extractOpt)
 }