Skip to content

feat: add index and count to deploy #4170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add index and count to deploy #4170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/internal/packager/images/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func Push(ctx context.Context, cfg PushConfig) error {
}
}()
for img := range toPush {
l.Info("pushing image", "name", img)
l.Info("pushing image", "count", len(cfg.ImageList), "name", img)
// If this is not a no checksum image push it for use with the Zarf agent
if !cfg.NoChecksum {
offlineNameCRC, err := transform.ImageTransformHost(registryRef.String(), img)
Expand Down
8 changes: 4 additions & 4 deletions src/pkg/packager/layout/sbom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ func generateSBOM(ctx context.Context, pkg v1alpha1.ZarfPackage, buildPath strin
return err
}

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