Merge branch 'branches/rudder/8.0'

Normation · Nov 23, 2023 · 3d542ea · 3d542ea
2 parents 68e1a1a + b99c56b
commit 3d542ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/policies/rudderc/src/backends/windows.rs b/policies/rudderc/src/backends/windows.rs
@@ -52,7 +52,7 @@ impl Backend for Windows {
 #[template(path = "technique.ps1.askama", escape = "none")]
 struct TechniqueTemplate<'a> {
     id: &'a str,
-    has_modules: bool,
+    has_resources: bool,
     parameters: Vec<Parameter>,
     methods: Vec<WindowsMethod>,
 }
@@ -236,7 +236,7 @@ impl Windows {
 
         let technique = TechniqueTemplate {
             id: &src.id.to_string(),
-            has_modules: !Windows::list_resources(resources)?.is_empty(),
+            has_resources: !Windows::list_resources(resources)?.is_empty(),
             parameters: src.params,
             methods,
         };

diff --git a/policies/rudderc/templates/technique.ps1.askama b/policies/rudderc/templates/technique.ps1.askama
@@ -21,8 +21,8 @@ function {{ id|dsc_case }} {
     $reportIdBase = $reportId.Substring(0, $reportId.Length - 1)
     $localContext = New-Object -TypeName "Rudder.Context" -ArgumentList @($techniqueName)
     $localContext.Merge($system_classes)
-{% if has_modules %}
-    $modules_dir = $PSScriptRoot + "\modules"
+{% if has_resources %}
+    $resources_dir = $PSScriptRoot + "\resources"
 {% endif %}
 
 {% for m in methods %}

diff --git a/policies/rudderc/tests/cases/general/ntp/technique.ps1 b/policies/rudderc/tests/cases/general/ntp/technique.ps1
@@ -19,7 +19,7 @@
     $localContext = New-Object -TypeName "Rudder.Context" -ArgumentList @($techniqueName)
     $localContext.Merge($system_classes)
 
-    $modules_dir = $PSScriptRoot + "\modules"
+    $resources_dir = $PSScriptRoot + "\resources"