Merge branch 'arch_23135/add_an_option_to_start_the_agent_in_verbose_…

…mode_pr' into branches/rudder/8.0

policies/rudderc/src/backends/unix/cfengine.rs

@@ -145,7 +145,12 @@ fn cfengine_canonify_condition(c: &str) -> String {
     }
 }
 
-pub fn cf_agent(input: &Path, params: &Path, lib_path: &Path) -> Result<RunLog> {
+pub fn cf_agent(
+    input: &Path,
+    params: &Path,
+    lib_path: &Path,
+    agent_verbose: bool,
+) -> Result<RunLog> {
     debug!("Running cf-agent on {}", input.display());
     // Use a dedicated workdir for each test
     // Required to run agents concurrently without trouble
@@ -164,6 +169,7 @@ pub fn cf_agent(input: &Path, params: &Path, lib_path: &Path) -> Result<RunLog>
     };
     let cmd = Command::new(Path::new(CF_BIN_DIR).join("cf-agent"))
         .args([
+            if agent_verbose { "--verbose" } else { "--info" },
             "--no-lock",
             "--workdir",
             &work_dir.path().to_string_lossy(),

policies/rudderc/src/cli.rs

@@ -72,6 +72,10 @@ pub enum Command {
 
         /// Filter tests cases
         filter: Option<String>,
+
+        /// Verbose agent
+        #[arg(long)]
+        agent_verbose: bool,
     },
 
     /// Build the method documentation

policies/rudderc/src/lib.rs

@@ -113,14 +113,19 @@ pub fn run(args: MainArgs) -> Result<()> {
                 store_ids,
             )
         }
-        Command::Test { library, filter } => {
+        Command::Test {
+            library,
+            filter,
+            agent_verbose,
+        } => {
             let library = check_libraries(library)?;
             action::build(library.as_slice(), input, target.as_path(), true, false)?;
             action::test(
                 target.join("technique.cf").as_path(),
                 Path::new(TESTS_DIR),
                 library.as_slice(),
                 filter,
+                agent_verbose,
             )
         }
         Command::Lib {
@@ -285,6 +290,7 @@ pub mod action {
         test_dir: &Path,
         libraries: &[PathBuf],
         filter: Option<String>,
+        agent_verbose: bool,
     ) -> Result<()> {
         // Run everything relatively to the test directory
         // Collect test cases
@@ -325,7 +331,12 @@ pub mod action {
             if libraries.len() > 1 {
                 bail!("Tests only support one library path containing a full 'ncf' library");
             }
-            let run_log = cf_agent(technique_file, case_path.as_path(), libraries[0].as_path())?;
+            let run_log = cf_agent(
+                technique_file,
+                case_path.as_path(),
+                libraries[0].as_path(),
+                agent_verbose,
+            )?;
             let report_file = Path::new(TARGET_DIR).join(case_path.with_extension("json"));
             create_dir_all(report_file.parent().unwrap())?;
             fs::write(&report_file, serde_json::to_string_pretty(&run_log)?)?;

policies/rudderc/tests/test.rs

@@ -36,6 +36,7 @@ fn test(filename: &str) {
         technique_dir.join("tests").as_path(),
         &[cwd.join(TEST_LIB)],
         None,
+        false,
     )
     .unwrap();
 }