Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
shawn-hurley committed Mar 11, 2024
1 parent a18830d commit 151d1ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/demo-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: run demo image and ensure violations output unchanged
run: |
podman run -v $(pwd)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(pwd)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --dep-output-file=demo-dep-output.yaml
podman run --entrypoint /usr/bin/konveyor-analyzer -v $(pwd)/demo-dep-output.yaml:/analyzer-lsp/demo-dep-output.yaml:Z -v $(pwd)/demo-output.yaml:/analyzer-lsp/output.yaml:Z localhost/testing:latest --dep-output-file=demo-dep-output.yaml
diff \
<(yq -P 'sort_keys(..)' -o=props <(git show HEAD:demo-output.yaml)) \
<(yq -P 'sort_keys(..)' -o=props <(cat demo-output.yaml))
Expand Down
6 changes: 4 additions & 2 deletions cmd/analyzer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,9 @@ func AnalysisCmd() *cobra.Command {
rulesets := eng.RunRules(ctx, ruleSets, selectors...)
engineSpan.End()
wg.Wait()
depSpan.End()
if depSpan != nil {
depSpan.End()
}
eng.Stop()

for _, provider := range needProviders {
Expand Down Expand Up @@ -265,7 +267,7 @@ func AnalysisCmd() *cobra.Command {
rootCmd.Flags().IntVar(&contextLines, "context-lines", 10, "When violation occurs, A part of source code is added to the output, So this flag configures the number of source code lines to be printed to the output.")
rootCmd.Flags().StringVar(&getOpenAPISpec, "get-openapi-spec", "", "Get the openAPI spec for the rulesets, rules and provider capabilities and put in file passed in.")
rootCmd.Flags().BoolVar(&treeOutput, "tree", false, "output dependencies as a tree")
rootCmd.Flags().StringVar(&depOutputFile, "dep-output-file", "", "path to output file")
rootCmd.Flags().StringVar(&depOutputFile, "dep-output-file", "", "path to dependency output file")

return rootCmd
}
Expand Down

0 comments on commit 151d1ea

Please sign in to comment.