Skip to content

Commit

Permalink
[engine] Accept None for optional args to ctx.emit.finding
Browse files Browse the repository at this point in the history
This will enable simpler integration with certain linting tools that
emit output that then needs to be translated to shac's finding schema.
E.g. some linting tools emit JSON output that omits empty fields, or
sets their values to null, so it's handy to be able to do `replacements
= output.get("replacements")` and have it "just work" even if
`replacements` is not set or is null.

Change-Id: I53ffcb3fb4d64081a13cc55f72343c9eff0eef9f
Reviewed-on: https://fuchsia-review.googlesource.com/c/shac-project/shac/+/929632
Commit-Queue: Auto-Submit <[email protected]>
Fuchsia-Auto-Submit: Oliver Newman <[email protected]>
Reviewed-by: Anthony Fandrianto <[email protected]>
  • Loading branch information
orn688 authored and CQ Bot committed Oct 10, 2023
1 parent b0fc661 commit cf17230
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 6 deletions.
14 changes: 14 additions & 0 deletions internal/engine/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2102,6 +2102,20 @@ func TestTestDataEmit(t *testing.T) {
nil,
"a check failed",
},
{
"ctx-emit-finding-none.star",
[]finding{
{
Check: "cb",
Level: Error,
Message: "bad code",
Root: root,
File: "file.txt",
},
},
nil,
"a check failed",
},
{
"ctx-emit-finding.star",
[]finding{
Expand Down
14 changes: 9 additions & 5 deletions internal/engine/runtime_ctx_emit.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,15 @@ func ctxEmitFinding(ctx context.Context, s *shacState, name string, args starlar
"level", &arglevel,
"message?", &argmessage,
"filepath?", &argfilepath,
"line?", &argline,
"col?", &argcol,
"end_line?", &argendLine,
"end_col?", &argendCol,
"replacements?", &argreplacements,
// The following arguments all use ?? so that None is interpreted the
// same as the argument being unset. This makes it easier to implement
// checks that run tools that emit JSON output that may contain null
// fields.
"line??", &argline,
"col??", &argcol,
"end_line??", &argendLine,
"end_col??", &argendCol,
"replacements??", &argreplacements,
); err != nil {
return err
}
Expand Down
27 changes: 27 additions & 0 deletions internal/engine/testdata/emit/ctx-emit-finding-none.star
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Copyright 2023 The Shac Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

def cb(ctx):
ctx.emit.finding(
level = "error",
message = "bad code",
filepath = "file.txt",
line = None,
col = None,
end_line = None,
end_col = None,
replacements = None,
)

shac.register_check(cb)
2 changes: 1 addition & 1 deletion internal/engine/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var (
// Version is the current tool version.
//
// TODO(maruel): Add proper version, preferably from git tag.
Version = shacVersion{0, 1, 13}
Version = shacVersion{0, 1, 14}
)

func (v shacVersion) String() string {
Expand Down

0 comments on commit cf17230

Please sign in to comment.