indicate whether a suggestion was confident or not in the json schema

mozilla · Oct 31, 2022 · 7b6db24 · 7b6db24
1 parent d29a872
commit 7b6db24
Show file tree

Hide file tree

Showing 52 changed files with 747 additions and 372 deletions.
diff --git a/src/format.rs b/src/format.rs
@@ -644,6 +644,8 @@ pub struct JsonSuggestItem {
     pub suggested_criteria: Vec<CriteriaName>,
     /// The diff (or full version) we recommend auditing
     pub suggested_diff: DiffRecommendation,
+    /// Whether the suggestion is confident or a guess (de-emphasize guesses)
+    pub confident: bool,
 }
 
 /// A string of the form "package:version"

diff --git a/src/resolver.rs b/src/resolver.rs
@@ -2879,6 +2879,7 @@ impl<'a> ResolveReport<'a> {
                                 .map(|s| s.to_owned())
                                 .collect(),
                             suggested_diff: item.suggested_diff.clone(),
+                            confident: item.suggested_criteria.is_fully_confident(),
                         }
                     };
                     JsonReportConclusion::FailForVet(JsonReportFailForVet {

diff --git a/src/tests/snapshots/cargo_vet__tests__vet__builtin-complex-no-unaudited.json.snap b/src/tests/snapshots/cargo_vet__tests__vet__builtin-complex-no-unaudited.json.snap
@@ -50,7 +50,8 @@ expression: json
             "raw": "+25",
             "count": 25
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "third-core",
@@ -65,7 +66,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "thirdA",
@@ -80,7 +82,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "thirdAB",
@@ -95,7 +98,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       }
     ],
     "suggest_by_criteria": {
@@ -113,7 +117,8 @@ expression: json
               "raw": "+25",
               "count": 25
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "third-core",
@@ -128,7 +133,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "thirdA",
@@ -143,7 +149,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "thirdAB",
@@ -158,7 +165,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ]
     },

diff --git a/src/tests/snapshots/cargo_vet__tests__vet__builtin-cycle-unaudited.json.snap b/src/tests/snapshots/cargo_vet__tests__vet__builtin-cycle-unaudited.json.snap
@@ -36,7 +36,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "normal",
@@ -51,7 +52,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       }
     ],
     "suggest_by_criteria": {
@@ -69,7 +71,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ],
       "safe-to-run": [
@@ -86,7 +89,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ]
     },

diff --git a/src/tests/snapshots/cargo_vet__tests__vet__builtin-dev-detection-empty-deeper.json.snap b/src/tests/snapshots/cargo_vet__tests__vet__builtin-dev-detection-empty-deeper.json.snap
@@ -64,7 +64,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "dev-cycle-direct",
@@ -79,7 +80,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "normal",
@@ -94,7 +96,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "simple-dev",
@@ -109,7 +112,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "dev-cycle-indirect",
@@ -124,7 +128,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": false
       },
       {
         "name": "simple-dev-indirect",
@@ -139,7 +144,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": false
       }
     ],
     "suggest_by_criteria": {
@@ -157,7 +163,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "normal",
@@ -172,7 +179,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ],
       "safe-to-run": [
@@ -189,7 +197,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "simple-dev",
@@ -204,7 +213,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "dev-cycle-indirect",
@@ -219,7 +229,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": false
         },
         {
           "name": "simple-dev-indirect",
@@ -234,7 +245,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": false
         }
       ]
     },

diff --git a/src/tests/snapshots/cargo_vet__tests__vet__builtin-dev-detection-empty.json.snap b/src/tests/snapshots/cargo_vet__tests__vet__builtin-dev-detection-empty.json.snap
@@ -50,7 +50,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "dev-cycle-direct",
@@ -65,7 +66,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "normal",
@@ -80,7 +82,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "simple-dev",
@@ -95,7 +98,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       }
     ],
     "suggest_by_criteria": {
@@ -113,7 +117,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "normal",
@@ -128,7 +133,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ],
       "safe-to-run": [
@@ -145,7 +151,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         },
         {
           "name": "simple-dev",
@@ -160,7 +167,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ]
     },

diff --git a/src/tests/snapshots/cargo_vet__tests__vet__builtin-haunted-no-unaudited-deeper.json.snap b/src/tests/snapshots/cargo_vet__tests__vet__builtin-haunted-no-unaudited-deeper.json.snap
@@ -36,7 +36,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       },
       {
         "name": "third-normal",
@@ -51,7 +52,8 @@ expression: json
             "raw": "+100",
             "count": 100
           }
-        }
+        },
+        "confident": true
       }
     ],
     "suggest_by_criteria": {
@@ -69,7 +71,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ],
       "safe-to-run": [
@@ -86,7 +89,8 @@ expression: json
               "raw": "+100",
               "count": 100
             }
-          }
+          },
+          "confident": true
         }
       ]
     },