Rename CPE template cond_package into platform_package

ComplianceAsCode · Dec 1, 2022 · 48ddab7 · 48ddab7
1 parent 43c49af
commit 48ddab7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/shared/applicability/package.yml b/shared/applicability/package.yml
@@ -2,9 +2,9 @@ name: "cpe:/a:{arg}"
 title: "Package {pkgname} is installed"
 bash_conditional: {{{ bash_pkg_conditional("{pkgname}") }}}
 ansible_conditional: {{{ ansible_pkg_conditional("{pkgname}") }}}
-check_id: cond_package_{arg}
+check_id: platform_package_{arg}
 template:
-  name: cond_package
+  name: platform_package
 args:
   ntp:
     pkgname: ntp

diff --git a/shared/templates/cond_package/oval.template b/shared/templates/cond_package/oval.template
diff --git a/shared/templates/platform_package/oval.template b/shared/templates/platform_package/oval.template
@@ -0,0 +1,11 @@
+<def-group>
+  <definition class="inventory" id="platform_{{{ _RULE_ID }}}"
+  version="1">
+    {{{ oval_metadata("The " + pkg_system|upper + " package " + PKGNAME + " should be installed.", affected_platforms=["multi_platform_all"]) }}}
+    <criteria>
+      <criterion comment="Package {{{ PKGNAME }}} is installed"
+      test_ref="platform_test_{{{ _RULE_ID }}}_installed" />
+    </criteria>
+  </definition>
+{{{ oval_test_package_installed(package=PKGNAME, test_id="platform_test_" + _RULE_ID + "_installed") }}}
+</def-group>
diff --git a/shared/templates/cond_package/template.yml → ...d/templates/platform_package/template.yml b/shared/templates/cond_package/template.yml → ...d/templates/platform_package/template.yml