Skip to content

Commit 7b2f734

Browse files
authored
Merge branch 'main' into scan_request_try2
2 parents 7e19674 + 37314fd commit 7b2f734

7 files changed

+160
-3
lines changed

semgrep_output_v1.atd

+5
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ type uuid = string wrap <ocaml module="ATD_string_wrap.Uuidm">
100100
(* RFC 3339 format *)
101101
type datetime = string wrap <ocaml module="ATD_string_wrap.Datetime">
102102

103+
type match_based_id = string wrap
104+
103105
(*****************************************************************************)
104106
(* Versioning *)
105107
(*****************************************************************************)
@@ -1624,12 +1626,15 @@ type parsing_stats = {
16241626
num_bytes: int;
16251627
}
16261628

1629+
16271630
(* Response by the backend to the CLI to the POST /complete *)
16281631
type ci_scan_complete_response <ocaml attr="deriving show"> = {
16291632
success: bool;
16301633
~app_block_override: bool;
16311634
(* only when app_block_override is true *)
16321635
~app_block_reason: string;
1636+
(* match_based_ids of findings that semgrep-app determined should cause the scan to block *)
1637+
~app_blocking_match_based_ids : match_based_id list;
16331638
}
16341639

16351640
(* ----------------------------- *)

semgrep_output_v1.jsonschema

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semgrep_output_v1.proto

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semgrep_output_v1.py

+24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semgrep_output_v1.ts

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semgrep_output_v1_j.ml

+87-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

semgrep_output_v1_j.mli

+24-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)