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

🐛 Handle missing containerless-deps #349

Merged
merged 3 commits into from
Oct 2, 2024
Merged

🐛 Handle missing containerless-deps #349

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d1a5bf
Handle missing containerless-deps
aufi Oct 2, 2024
7630c2a
Update .kantra subdirs validation
aufi Oct 2, 2024
36aba18
Update RulesetsLocation path from const
aufi Oct 2, 2024
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
16 changes: 15 additions & 1 deletion cmd/analyze-bin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,16 @@ func NewAnalyzeBinCmd(log logr.Logger) *cobra.Command {
}

func (b *analyzeBinCommand) Validate(ctx context.Context) error {
// Validate .kantra in home directory and its content (containerless)
requiredDirs := []string{b.homeKantraDir, filepath.Join(b.homeKantraDir, "rulesets"), filepath.Join(b.homeKantraDir, JavaBundlesLocation), filepath.Join(b.homeKantraDir, JDTLSBinLocation)}
for _, path := range requiredDirs {
if _, err := os.Stat(path); os.IsNotExist(err) {
b.log.Error(err, "cannot open required path, ensure that container-less dependencies are installed")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example error messages for missing rulesets:

ERRO[0000] cannot open required path, ensure that container-less dependencies are installed  error="stat /home/.../.kantra/rulesets: no such file or directory"

return err
}
}

// Print-only methods
if b.listSources || b.listTargets {
return nil
}
Expand Down Expand Up @@ -429,7 +439,11 @@ func (b *analyzeBinCommand) fetchLabels(ctx context.Context, listSources, listTa

func (b *analyzeBinCommand) walkRuleFilesForLabels(label string) ([]string, error) {
labelsSlice := []string{}
path := filepath.Join(b.homeKantraDir, RulesetsLocation)
path := filepath.Join(b.homeKantraDir, "rulesets")
aufi marked this conversation as resolved.
Show resolved Hide resolved
if _, err := os.Stat(path); os.IsNotExist(err) {
b.log.Error(err, "cannot open provided path")
return nil, err
}
err := filepath.WalkDir(path, walkRuleSets(path, label, &labelsSlice))
if err != nil {
return nil, err
Expand Down
Loading