Skip to content

Commit 07ac5aa

Browse files
committed
feat: add index and count to deploy
Signed-off-by: Allen Conlon <software@conlon.dev>
1 parent 295fb09 commit 07ac5aa

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/internal/packager/images/push.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
137137
}
138138
}()
139139
for img := range toPush {
140-
l.Info("pushing image", "name", img)
140+
l.Info("pushing image", "count", len(cfg.ImageList), "name", img)
141141
// If this is not a no checksum image push it for use with the Zarf agent
142142
if !cfg.NoChecksum {
143143
offlineNameCRC, err := transform.ImageTransformHost(registryRef.String(), img)

src/pkg/packager/layout/sbom.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ func generateSBOM(ctx context.Context, pkg v1alpha1.ZarfPackage, buildPath strin
6767
return err
6868
}
6969

70-
for _, refInfo := range images {
70+
for index, refInfo := range images {
7171
img, err := utils.LoadOCIImage(filepath.Join(buildPath, string(ImagesDir)), refInfo)
7272
if err != nil {
7373
return fmt.Errorf("failed to load OCI image: %w", err)
7474
}
75-
l.Info("creating image SBOM", "reference", refInfo.Reference)
75+
l.Info("creating image SBOM", "index", (index + 1), "count", len(images), "reference", refInfo.Reference)
7676
b, err := createImageSBOM(ctx, cachePath, outputPath, img, refInfo.Reference)
7777
if err != nil {
7878
return fmt.Errorf("failed to create image sbom: %w", err)
@@ -194,8 +194,8 @@ func createFileSBOM(ctx context.Context, component v1alpha1.ZarfComponent, outpu
194194
}
195195
catalog := pkg.NewCollection()
196196
relationships := []artifact.Relationship{}
197-
for _, sbomFile := range sbomFiles {
198-
l.Info("creating file SBOMs", "file", sbomFile)
197+
for index, sbomFile := range sbomFiles {
198+
l.Info("creating file SBOMs", "index", (index + 1), "count", len(sbomFiles), "file", sbomFile)
199199
fileSrc, err := filesource.NewFromPath(sbomFile)
200200
if err != nil {
201201
return nil, err

0 commit comments

Comments
 (0)