Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #20963: Add suport for report id reporting with Windows agent #4223

Merged
merged 1 commit into from
Mar 31, 2022
Merged

Fixes #20963: Add suport for report id reporting with Windows agent #4223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .../sources/rudder/rudder-core/src/main/scala/com/normation/rudder/ncf/TechniqueWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,9 @@ class DSCTechniqueWriter(

def naReport(method : GenericMethod, expectedReportingValue : String) =
s"""_rudder_common_report_na ${componentName} -componentKey ${expectedReportingValue} -message "Not applicable" ${genericParams}"""
for {


(for {

// First translate parameters to Dsc values
params <- ((call.parameters.toList).traverse {
Expand Down Expand Up @@ -863,7 +865,7 @@ class DSCTechniqueWriter(
} else {
s" ${naReport(method,classParameter)}" :: Nil
}
}
}).map(s""" $$reportId=$$reportIdBase+"${call.id}"""" :: _)
}

case block : MethodBlock =>
Expand Down Expand Up @@ -897,7 +899,7 @@ class DSCTechniqueWriter(
| [string]$$techniqueName,${parameters}
| [switch]$$auditOnly
| )
|
| $$reportIdBase = $$reportId.Substring(0,$$reportId.Length-1)
| $$local_classes = New-ClassContext
| $$resources_dir = $$PSScriptRoot + "\\resources"
|
Expand Down
4 changes: 3 additions & 1 deletion ...ources/configuration-repository/techniques/ncf_techniques/technique_any/1.0/technique.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
[string]$Version,
[switch]$auditOnly
)

$reportIdBase = $reportId.Substring(0,$reportId.Length-1)
$local_classes = New-ClassContext
$resources_dir = $PSScriptRoot + "\resources"

$reportId=$reportIdBase+"id"

$local_classes = Merge-ClassContext $local_classes $(Package-Install-Version -PackageName "$($node.properties[apache_package_name])" -PackageVersion "2.2.11" -componentName "Test component$&é)à\'`"" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")

}
4 changes: 3 additions & 1 deletion ...ources/configuration-repository/techniques/ncf_techniques/technique_any/2.0/technique.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
[string]$Version,
[switch]$auditOnly
)

$reportIdBase = $reportId.Substring(0,$reportId.Length-1)
$local_classes = New-ClassContext
$resources_dir = $PSScriptRoot + "\resources"

$reportId=$reportIdBase+"id"

$local_classes = Merge-ClassContext $local_classes $(Package-Install-Version -PackageName "$($node.properties[apache_package_name])" -PackageVersion "2.2.11" -componentName "Test component$&é)à\'`"" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")

}
12 changes: 11 additions & 1 deletion .../configuration-repository/techniques/ncf_techniques/technique_by_Rudder/1.0/technique.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,38 @@
[string]$TechniqueParameter,
[switch]$auditOnly
)

$reportIdBase = $reportId.Substring(0,$reportId.Length-1)
$local_classes = New-ClassContext
$resources_dir = $PSScriptRoot + "\resources"

$reportId=$reportIdBase+"id1"

$local_classes = Merge-ClassContext $local_classes $(Package-Install-Version -PackageName "$($node.properties[apache_package_name])" -PackageVersion "2.2.11" -componentName "Customized component" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")

$reportId=$reportIdBase+"id2"

$class = "windows"
if (Evaluate-Class $class $local_classes $system_classes) {
$local_classes = Merge-ClassContext $local_classes $(Command-Execution -Command "Write-Host `"testing special characters ` è &é 'à é `"" -componentName "Command execution" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")
} else {
_rudder_common_report_na -componentName "Command execution" -componentKey "Write-Host `"testing special characters ` è &é 'à é `"" -message "Not applicable" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly
}

$reportId=$reportIdBase+"id3"

$class = "package_install_version_" + $(Canonify-Class $($node.properties[apache_package_name])) + "_repaired"
if (Evaluate-Class $class $local_classes $system_classes) {
$local_classes = Merge-ClassContext $local_classes $(Service-Start -ServiceName "$($node.properties[apache_package_name])" -componentName "Customized component" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")
} else {
_rudder_common_report_na -componentName "Customized component" -componentKey "$($node.properties[apache_package_name])" -message "Not applicable" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly
}

$reportId=$reportIdBase+"id4"

_rudder_common_report_na -componentName "Package install" -componentKey "openssh-server" -message "Not applicable" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly

$reportId=$reportIdBase+"id5"

$class = "cfengine-community"
if (Evaluate-Class $class $local_classes $system_classes) {
$local_classes = Merge-ClassContext $local_classes $(Command-Execution -Command "/bin/echo `"testing special characters ` è &é 'à é `"\" -componentName "Command execution" -reportId $reportId -techniqueName $techniqueName -auditOnly:$auditOnly).get_item("classes")
Expand Down