Skip to content

Commit 0b1d137

Browse files
committed
Fixed #27260: Use ir.Libpod.NewArtifactEvent
Signed-off-by: ByoungUk Lee <[email protected]>
1 parent 8b52888 commit 0b1d137

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

pkg/domain/infra/abi/artifact.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"os"
1111
"time"
1212

13+
"github.com/containers/podman/v5/libpod/events"
1314
"github.com/containers/podman/v5/pkg/domain/entities"
1415
"github.com/containers/podman/v5/pkg/libartifact/types"
1516
"github.com/opencontainers/go-digest"
@@ -87,6 +88,7 @@ func (ir *ImageEngine) ArtifactPull(ctx context.Context, name string, opts entit
8788
return nil, err
8889
}
8990

91+
ir.Libpod.NewArtifactEvent(events.Pull, name, artifactDigest.String(), nil)
9092
return &entities.ArtifactPullReport{
9193
ArtifactDigest: &artifactDigest,
9294
}, nil
@@ -132,6 +134,7 @@ func (ir *ImageEngine) ArtifactRm(ctx context.Context, opts entities.ArtifactRem
132134
}
133135
return nil, err
134136
}
137+
ir.Libpod.NewArtifactEvent(events.Remove, "", namesOrDigest, nil)
135138
artifactDigests = append(artifactDigests, artifactDigest)
136139
}
137140
artifactRemoveReport := entities.ArtifactRemoveReport{
@@ -198,6 +201,7 @@ func (ir *ImageEngine) ArtifactPush(ctx context.Context, name string, opts entit
198201
return nil, err
199202
}
200203

204+
ir.Libpod.NewArtifactEvent(events.Push, name, artifactDigest.String(), nil)
201205
return &entities.ArtifactPushReport{
202206
ArtifactDigest: &artifactDigest,
203207
}, nil
@@ -228,6 +232,9 @@ func (ir *ImageEngine) ArtifactAdd(ctx context.Context, name string, artifactBlo
228232
if err != nil {
229233
return nil, err
230234
}
235+
ir.Libpod.NewArtifactEvent(events.Add, name, artifactDigest.String(), map[string]string{
236+
"files": fmt.Sprintf("%d", len(artifactBlobs)),
237+
})
231238
return &entities.ArtifactAddReport{
232239
ArtifactDigest: artifactDigest,
233240
}, nil
@@ -244,8 +251,13 @@ func (ir *ImageEngine) ArtifactExtract(ctx context.Context, name string, target
244251
Title: opts.Title,
245252
},
246253
}
247-
248-
return artStore.Extract(ctx, name, target, &extractOpt)
254+
if err := artStore.Extract(ctx, name, target, &extractOpt); err != nil {
255+
return err
256+
}
257+
ir.Libpod.NewArtifactEvent(events.Extract, name, opts.Digest, map[string]string{
258+
"target": target,
259+
})
260+
return nil
249261
}
250262

251263
func (ir *ImageEngine) ArtifactExtractTarStream(ctx context.Context, w io.Writer, name string, opts entities.ArtifactExtractOptions) error {
@@ -261,5 +273,11 @@ func (ir *ImageEngine) ArtifactExtractTarStream(ctx context.Context, w io.Writer
261273
ExcludeTitle: opts.ExcludeTitle,
262274
}
263275

264-
return artStore.ExtractTarStream(ctx, w, name, &extractOpt)
276+
if err = artStore.ExtractTarStream(ctx, w, name, &extractOpt); err != nil {
277+
return err
278+
}
279+
ir.Libpod.NewArtifactEvent(events.Extract, name, opts.Digest, map[string]string{
280+
"format": "tar-stream",
281+
})
282+
return nil
265283
}

0 commit comments

Comments
 (0)