Skip to content
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

save sbom to provided path inside of repo name under sub-path #82

Merged
merged 2 commits into from
Mar 13, 2025
Merged

save sbom to provided path inside of repo name under sub-path #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
599703a
save sbom to provided path inside of repo name under sub-path
viveksahu26 Mar 13, 2025
19da460
Merge branch 'main' into fix/folder_saving_dir
riteshnoronha Mar 13, 2025
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
4 changes: 2 additions & 2 deletions pkg/target/folder/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ func (f *FolderAdapter) ParseAndValidateParams(cmd *cobra.Command) error {

// Validate required flags
if len(missingFlags) > 0 {
return fmt.Errorf("missing input adapter required flags: %v\n\nUse 'sbommv transfer --help' for usage details.", missingFlags)
return fmt.Errorf("missing output adapter required flags: %v\n\nUse 'sbommv transfer --help' for usage details.", missingFlags)
}

// Validate incorrect flag usage
if len(invalidFlags) > 0 {
return fmt.Errorf("invalid input adapter flag usage:\n %s\n\nUse 'sbommv transfer --help' for correct usage.", strings.Join(invalidFlags, "\n "))
return fmt.Errorf("invalid output adapter flag usage:\n %s\n\nUse 'sbommv transfer --help' for correct usage.", strings.Join(invalidFlags, "\n "))
}

cfg := FolderConfig{
Expand Down
8 changes: 4 additions & 4 deletions pkg/target/folder/uploader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ func (u *SequentialUploader) Upload(ctx tcontext.TransferMetadata, config *Folde
return err
}

namespace := filepath.Base(sbom.Namespace)
if namespace == "" {
namespace = fmt.Sprintf("sbom_%s.json", uuid.New().String())
outputDir := config.FolderPath
if outputDir == "" {
outputDir = sbom.Namespace
}
outputDir := filepath.Join(config.FolderPath, namespace)

if err := os.MkdirAll(outputDir, 0o755); err != nil {
logger.LogError(ctx.Context, err, "Failed to create folder", "path", outputDir)
return err
Expand Down