Skip to content

Commit 4c76aee

Browse files
cargo fmt
1 parent d4a3190 commit 4c76aee

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

crates/bins/src/bin/datadog-export-rulesets.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ fn main() {
6262
let rulesets: Vec<RuleSet> = rulesets_names
6363
.iter()
6464
.map(|ruleset_name| {
65-
get_ruleset(ruleset_name, use_staging, include_testing_rules).expect("error when reading ruleset")
65+
get_ruleset(ruleset_name, use_staging, include_testing_rules)
66+
.expect("error when reading ruleset")
6667
})
6768
.collect();
6869

crates/bins/src/bin/datadog-static-analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ fn main() -> Result<()> {
386386
" - Datadog documentation: https://docs.datadoghq.com/code_analysis/static_analysis"
387387
);
388388
println!(" - Static analyzer repository on GitHub: https://github.com/DataDog/datadog-static-analyzer");
389-
let rulesets_from_api =
390-
get_all_default_rulesets(use_staging, include_testing_rules).expect("cannot get default rules");
389+
let rulesets_from_api = get_all_default_rulesets(use_staging, include_testing_rules)
390+
.expect("cannot get default rules");
391391

392392
rules.extend(rulesets_from_api.into_iter().flat_map(|v| v.rules.clone()));
393393
} else {

crates/cli/src/datadog_utils.rs

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ const DEFAULT_RULESETS_LANGUAGES: &[&str] = &[
3131
];
3232

3333
// Get all the rules from different rulesets from Datadog
34-
pub fn get_rules_from_rulesets(rulesets_name: &[String], use_staging: bool, include_testing_rules:bool) -> Result<Vec<Rule>> {
34+
pub fn get_rules_from_rulesets(
35+
rulesets_name: &[String],
36+
use_staging: bool,
37+
include_testing_rules: bool,
38+
) -> Result<Vec<Rule>> {
3539
let mut rules: Vec<Rule> = Vec::new();
3640
for ruleset_name in rulesets_name {
3741
rules.extend(get_ruleset(ruleset_name, use_staging, include_testing_rules)?.rules);
@@ -70,15 +74,19 @@ fn get_datadog_site(use_staging: bool) -> String {
7074
// get rules from one ruleset at datadog
7175
// it connects to the API using the DD_SITE, DD_APP_KEY and DD_API_KEY and retrieve
7276
// the rulesets. We then extract all the rulesets
73-
pub fn get_ruleset(ruleset_name: &str, use_staging: bool, include_testing_rules:bool) -> Result<RuleSet> {
77+
pub fn get_ruleset(
78+
ruleset_name: &str,
79+
use_staging: bool,
80+
include_testing_rules: bool,
81+
) -> Result<RuleSet> {
7482
let site = get_datadog_site(use_staging);
7583
let app_key = get_datadog_variable_value("APP_KEY");
7684
let api_key = get_datadog_variable_value("API_KEY");
7785

7886
let include_testing_rules_query_param_val = match include_testing_rules {
7987
true => "true",
80-
false => "false"
81-
};
88+
false => "false",
89+
};
8290

8391
let url = format!(
8492
"https://api.{}/api/v2/static-analysis/rulesets/{}?include_tests=false&include_testing_rules={:?}",
@@ -155,15 +163,22 @@ pub fn get_default_rulesets_name_for_language(
155163

156164
/// Get all the default rulesets available at DataDog. Take all the language
157165
/// from `DEFAULT_RULESETS_LANGAGES` and get their rulesets
158-
pub fn get_all_default_rulesets(use_staging: bool, include_testing_rules:bool) -> Result<Vec<RuleSet>> {
166+
pub fn get_all_default_rulesets(
167+
use_staging: bool,
168+
include_testing_rules: bool,
169+
) -> Result<Vec<RuleSet>> {
159170
let mut result: Vec<RuleSet> = vec![];
160171

161172
for language in DEFAULT_RULESETS_LANGUAGES {
162173
let ruleset_names =
163174
get_default_rulesets_name_for_language(language.to_string(), use_staging)?;
164175

165176
for ruleset_name in ruleset_names {
166-
result.push(get_ruleset(ruleset_name.as_str(), use_staging, include_testing_rules)?);
177+
result.push(get_ruleset(
178+
ruleset_name.as_str(),
179+
use_staging,
180+
include_testing_rules,
181+
)?);
167182
}
168183
}
169184
Ok(result)

crates/cli/src/sarif/sarif_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl IntoSarif for &Rule {
219219
tags.push(format!("CWE:{}", cwe));
220220
}
221221
if let Some(_is_testing) = self.is_testing {
222-
tags.push("DATADOG_TESTING:true".to_string());
222+
tags.push("DATADOG_TESTING:true".to_string());
223223
}
224224
let props = PropertyBagBuilder::default().tags(tags).build().unwrap();
225225
builder.properties(props);

0 commit comments

Comments
 (0)