Fixes #23581: Missing NA report on Windows for methods only compatibl…

…e with Unix
Normation · Oct 16, 2023 · 93b3d33 · 93b3d33
1 parent 0b0284d
commit 93b3d33
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/policies/rudderc/src/backends/windows.rs b/policies/rudderc/src/backends/windows.rs
@@ -5,7 +5,7 @@ use std::path::Path;
 
 use anyhow::{bail, Result};
 use askama::Template;
-use rudder_commons::Escaping;
+use rudder_commons::{methods::method::Agent, Escaping};
 
 use super::Backend;
 use crate::ir::{
@@ -132,6 +132,7 @@ struct WindowsMethod {
     condition: Option<String>,
     args: Vec<(String, String, Escaping)>,
     name: String,
+    is_supported: bool,
 }
 
 fn method_call(m: Method, condition: Condition) -> Result<WindowsMethod> {
@@ -164,6 +165,8 @@ fn method_call(m: Method, condition: Condition) -> Result<WindowsMethod> {
     // We want a stable output
     args.sort();
 
+    let is_supported = m.info.unwrap().agent_support.contains(&Agent::Dsc);
+
     Ok(WindowsMethod {
         id: m.id.to_string(),
         class_prefix: m.info.as_ref().unwrap().class_prefix.clone(),
@@ -178,6 +181,7 @@ fn method_call(m: Method, condition: Condition) -> Result<WindowsMethod> {
         },
         args,
         name: filters::dsc_case(&m.info.as_ref().unwrap().bundle_name).unwrap(),
+        is_supported,
     })
 }
 

diff --git a/policies/rudderc/templates/technique.ps1.askama b/policies/rudderc/templates/technique.ps1.askama
@@ -37,6 +37,7 @@ function {{ id|dsc_case }} {
         DisableReporting = ${{ m.disable_reporting }}
         TechniqueName = $techniqueName
     }
+  {%- if m.is_supported %}
     {% match m.condition %}
     {%- when Some with (cond) %}
     $class = {{ cond|canonify_condition }}
@@ -62,6 +63,9 @@ function {{ id|dsc_case }} {
     $methodContext = Compute-Method-Call @reportParams -MethodCall $call
     $localContext.merge($methodContext)
     {% endmatch %}
+  {%- else %}
+    Rudder-Report-NA @reportParams
+  {%- endif %}
 {% endfor %}
 
     EndTechniqueCall -Name $techniqueName

diff --git a/policies/rudderc/tests/cases/general/long_method_param_name/technique.ps1 b/policies/rudderc/tests/cases/general/long_method_param_name/technique.ps1
@@ -29,16 +29,7 @@
         DisableReporting = $false
         TechniqueName = $techniqueName
     }
-
-    $methodParams = @{
-        Condition = "it_generates_properly"
-        ReportMessage = "This should be ReportMessage"
-
-    }
-    $call = Report-If-Condition @methodParams -PolicyMode $policyMode
-    $methodContext = Compute-Method-Call @reportParams -MethodCall $call
-    $localContext.merge($methodContext)
-
+    Rudder-Report-NA @reportParams
 
 
     EndTechniqueCall -Name $techniqueName

diff --git a/policies/rudderc/tests/lib/common/30_generic_methods/package_present.cf b/policies/rudderc/tests/lib/common/30_generic_methods/package_present.cf
@@ -33,6 +33,7 @@
 #
 # @class_prefix package_present
 # @class_parameter name
+# @agent_support = ["cfengine-community", "dsc"]
 # This line should be ignored
 
 bundle agent package_present(name, version, architecture, provider)

diff --git a/policies/rudderc/tests/lib/common/30_generic_methods/package_present.yml b/policies/rudderc/tests/lib/common/30_generic_methods/package_present.yml
@@ -13,6 +13,7 @@ bundle_args:
   - provider
 agent_support:
   - cfengine-community
+  - dsc
 parameter:
   - name: name
     description: "Name of the package, or path to a local package"