Revert "Temporary: artificially disable v2 config parsing in all binaries (but not within unit tests)"

jasonforal · jasonforal · commit be42306114f9 · 2026-03-05T17:25:08.000-05:00
This reverts commit f95139e.
diff --git a/crates/bins/src/bin/datadog_static_analyzer_server/ide/configuration_file/static_analysis_config_file.rs b/crates/bins/src/bin/datadog_static_analyzer_server/ide/configuration_file/static_analysis_config_file.rs
@@ -3,8 +3,8 @@ use super::error::ConfigFileError;
 use indexmap::IndexMap;
 use itertools::Itertools;
 use kernel::config::common::{
-    parse_any_schema_yaml, parse_only_v1_yaml, ConfigError, PathConfig, PathPattern, RuleConfig,
-    RulesetConfig, WithVersion,
+    parse_any_schema_yaml, ConfigError, PathConfig, PathPattern, RuleConfig, RulesetConfig,
+    WithVersion,
 };
 use kernel::config::file_v1::config_file_to_yaml;
 use kernel::config::{file_v1, file_v2};
@@ -47,12 +47,7 @@ impl TryFrom<String> for StaticAnalysisConfigFile {
         if content.trim().is_empty() {
             return Ok(Self::default());
         }
-        let parsed = if cfg!(test) {
-            parse_any_schema_yaml(&content)
-        } else {
-            parse_only_v1_yaml(&content)
-        };
-        let parsed = parsed.map_err(|err| {
+        let parsed = parse_any_schema_yaml(&content).map_err(|err| {
             match err {
                 // Artificially represent this as a "parse" error for backwards compatibility.
                 ConfigError::UnsupportedSchema(_) => ConfigFileError::Parser {
diff --git a/crates/cli/src/config_file.rs b/crates/cli/src/config_file.rs
@@ -5,9 +5,7 @@ use crate::datadog_utils::{
 };
 use crate::git_utils::get_repository_url;
 use anyhow::{anyhow, Context};
-use kernel::config::common::{
-    parse_any_schema_yaml, parse_only_v1_yaml, ConfigMethod, WithVersion,
-};
+use kernel::config::common::{parse_any_schema_yaml, ConfigMethod, WithVersion};
 use kernel::config::file_v2;
 use kernel::utils::{decode_base64_string, encode_base64_string};
 use std::path::Path;
@@ -53,13 +51,7 @@ pub fn get_config(
     let local_file_contents = read_config_file(path)?;
     let local_yaml = local_file_contents
         .as_ref()
-        .map(|c| {
-            if cfg!(test) {
-                parse_any_schema_yaml(c)
-            } else {
-                parse_only_v1_yaml(c)
-            }
-        })
+        .map(|c| parse_any_schema_yaml(c))
         .transpose()?;
     let local_config: Option<file_v2::ConfigFile> = local_yaml.map(|v| match v {
         WithVersion::V1(v1) => file_v2::YamlConfigFile::from(v1).into(),
diff --git a/crates/static-analysis-kernel/src/config/common.rs b/crates/static-analysis-kernel/src/config/common.rs
@@ -314,19 +314,6 @@ pub fn parse_any_schema_yaml(
     }
 }
 
-/// Like [`parse_any_schema_yaml`], except only ever returns a [`WithVersion::V1`].
-///
-/// # Note
-/// This is a temporary function used to artificially disable v2 support within the static analyzer.
-/// When the Datadog backend implements v2 support, this will be removed.
-pub fn parse_only_v1_yaml(
-    config_contents: &str,
-) -> Result<WithVersion<file_v1::YamlConfigFile, file_v2::YamlConfigFile>, ConfigError> {
-    file_v1::parse_yaml(config_contents)
-        .map(WithVersion::V1)
-        .map_err(ConfigError::Parse)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -404,21 +391,4 @@ schema-version: v2
             ));
         }
     }
-
-    /// See [`parse_only_v1_yaml`] for documentation.
-    #[test]
-    fn parse_v1_yaml_v1_only() {
-        // language=yaml
-        let v1 = "\
-schema-version: v1
-rulesets:
-  - java-security
-";
-        // language=yaml
-        let v2 = "\
-schema-version: v2
-";
-        assert!(matches!(parse_only_v1_yaml(v2), Err(ConfigError::Parse(_))));
-        assert!(matches!(parse_only_v1_yaml(v1), Ok(WithVersion::V1(_))));
-    }
 }
diff --git a/crates/static-analysis-server/src/request.rs b/crates/static-analysis-server/src/request.rs
@@ -8,7 +8,7 @@ use crate::model::violation::ServerViolation;
 use common::analysis_options::AnalysisOptions;
 use kernel::analysis::analyze::analyze_with;
 use kernel::analysis::ddsa_lib::JsRuntime;
-use kernel::config::common::{parse_any_schema_yaml, parse_only_v1_yaml, WithVersion};
+use kernel::config::common::{parse_any_schema_yaml, WithVersion};
 use kernel::config::file_v2;
 use kernel::model::rule::RuleInternal;
 use kernel::rule_config::RuleConfigProvider;
@@ -29,12 +29,7 @@ pub fn process_analysis_request<T: Borrow<RuleInternal>>(
     let configuration = if let Some(config_b64) = request.configuration_base64 {
         let config =
             decode_base64_string(config_b64).map_err(|_| ERROR_CONFIGURATION_NOT_BASE64)?;
-        let parsed = if cfg!(test) {
-            parse_any_schema_yaml(&config)
-        } else {
-            parse_only_v1_yaml(&config)
-        };
-        let v2_yaml = parsed
+        let v2_yaml = parse_any_schema_yaml(&config)
             .map(|v| match v {
                 WithVersion::V1(yaml) => file_v2::YamlConfigFile::from(yaml),
                 WithVersion::V2(yaml) => yaml,
