Skip to content

Commit

Permalink
udpate java provider
Browse files Browse the repository at this point in the history
Signed-off-by: Emily McMullan <[email protected]>
  • Loading branch information
eemcmullan committed Oct 2, 2024
1 parent ac5f7cd commit 5418b60
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmd/analyze-bin.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func NewAnalyzeBinCmd(log logr.Logger) *cobra.Command {
needProviders := map[string]provider.InternalProviderClient{}

if analyzeBinCmd.enableDefaultRulesets {
analyzeBinCmd.rules = append(analyzeBinCmd.rules, filepath.Join(analyzeBinCmd.homeKantraDir, RulesetsLocation))
analyzeBinCmd.rules = append(analyzeBinCmd.rules, filepath.Join(analyzeBinCmd.homeKantraDir, "rulesets"))
}
for _, f := range analyzeBinCmd.rules {
internRuleSet, internNeedProviders, err := parser.LoadRules(f)
Expand Down Expand Up @@ -429,7 +429,7 @@ 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")
err := filepath.WalkDir(path, walkRuleSets(path, label, &labelsSlice))
if err != nil {
return nil, err
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ require (
github.com/codingconcepts/env v0.0.0-20200821220118-a8fbf8d84482
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/konveyor/analyzer-lsp v0.5.3
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240926004552-328558364c2f
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240930182605-8f5ccf72040d
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/exp v0.0.0-20230725093048-515e97ebf090
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240925163006-aa4d8cacbcc9/go.mod h1:O7Bh3ECVCvRdsDv2qR8UG5S3so4PXmI7PrYrrm78YIY=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240926004552-328558364c2f h1:0jj9ayb1qpMP8wu+LdF+2jSHZN5JeGVP69iJqaYPpYA=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240926004552-328558364c2f/go.mod h1:O7Bh3ECVCvRdsDv2qR8UG5S3so4PXmI7PrYrrm78YIY=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240930182605-8f5ccf72040d h1:zCaOFmnO4MNPS3L6bZ4+nYdy+twgkgbxDSeZaz9N4fw=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20240930182605-8f5ccf72040d/go.mod h1:O7Bh3ECVCvRdsDv2qR8UG5S3so4PXmI7PrYrrm78YIY=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
Expand Down

0 comments on commit 5418b60

Please sign in to comment.