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.

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

Update analyzer dep & validation #398

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion cmd/analyze-bin.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ func (a *analyzeCommand) ValidateContainerless(ctx context.Context) error {
}

// Validate .kantra in home directory and its content (containerless)
requiredDirs := []string{a.kantraDir, filepath.Join(a.kantraDir, RulesetsLocation), filepath.Join(a.kantraDir, JavaBundlesLocation), filepath.Join(a.kantraDir, JDTLSBinLocation)}
requiredDirs := []string{a.kantraDir, filepath.Join(a.kantraDir, RulesetsLocation), filepath.Join(a.kantraDir, JavaBundlesLocation),
filepath.Join(a.kantraDir, JDTLSBinLocation), filepath.Join(a.kantraDir, "fernflower.jar")}
for _, path := range requiredDirs {
if _, err := os.Stat(path); os.IsNotExist(err) {
a.log.Error(err, "cannot open required path, ensure that container-less dependencies are installed")
Expand Down
2 changes: 1 addition & 1 deletion cmd/analyze.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func NewAnalyzeCmd(log logr.Logger) *cobra.Command {
if !cmd.Flags().Lookup("list-sources").Changed &&
!cmd.Flags().Lookup("list-targets").Changed &&
!cmd.Flags().Lookup("list-providers").Changed {
//cmd.MarkFlagRequired("input")
cmd.MarkFlagRequired("input")
cmd.MarkFlagRequired("output")
if err := cmd.ValidateRequiredFlags(); err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ require (
github.com/codingconcepts/env v0.0.0-20200821220118-a8fbf8d84482
github.com/fabianvf/windup-rulesets-yaml v0.5.3
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-20241121143855-40356f86d20e
github.com/konveyor/analyzer-lsp v0.6.0-beta.1.0.20241203211117-7b4c586939e8
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20241203211117-7b4c586939e8
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3
github.com/spf13/pflag v1.0.5 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konveyor/analyzer-lsp v0.5.3 h1:RPIcH5s5oQysfKz3o0rnK8pVmwp3MWpIdCheT1gklrw=
github.com/konveyor/analyzer-lsp v0.5.3/go.mod h1:Gqj6MRUA2Jjjw19tUguJB6Bqj4dLwZzb68FmAUok0ac=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20241121143855-40356f86d20e h1:uftzXgOWAxmrq4RAdg2dr66RloEDlBPmdYVPK5QXQuo=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20241121143855-40356f86d20e/go.mod h1:0OaNuH9HgJZbXPKmblcAfJ+4qyuS5Rc0dp3kmMvjtKk=
github.com/konveyor/analyzer-lsp v0.6.0-beta.1.0.20241203211117-7b4c586939e8 h1:xaOKsJ4AB17LnnsvNthrpScyaf73FMBPqoApOyQd5/k=
github.com/konveyor/analyzer-lsp v0.6.0-beta.1.0.20241203211117-7b4c586939e8/go.mod h1:l9XC3uazLba8yXoAFJWN7uBDju1s/g1Hc8TKBpE3B2U=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20241203211117-7b4c586939e8 h1:6GIfLM6Xh4EoFwHmgnBz8w0NlwZKBlVKyPrytp6p1GI=
github.com/konveyor/analyzer-lsp/external-providers/java-external-provider v0.0.0-20241203211117-7b4c586939e8/go.mod h1:0OaNuH9HgJZbXPKmblcAfJ+4qyuS5Rc0dp3kmMvjtKk=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
Expand Down
Loading