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

Fix OCP4 and EKS SCAP validation #7982

Merged
merged 1 commit into from
Dec 9, 2021
Merged

Fix OCP4 and EKS SCAP validation #7982

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
2 changes: 1 addition & 1 deletion applications/openshift/general/resource_requests_quota_per_project/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<!-- Comparison -->
<!-- This verifies that the filtered namespaces are equal to the namespaces with resourcequota -->
<ind:variable_state id="state_elements_count_for_resource_requests_quota_per_project" version="1">
<ind:value var_ref="local_variable_counter_resource_requests_quotas_filtered_namespaces"/>
<ind:value datatype="int" var_ref="local_variable_counter_resource_requests_quotas_filtered_namespaces"/>
</ind:variable_state>

<!-- OCP data root declaration -->
Expand Down
2 changes: 1 addition & 1 deletion applications/openshift/networking/configure_network_policies_namespaces/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<!-- Comparison -->
<!-- This verifies that the filtered namespaces are equal to the namespaces with NetworkPolicies -->
<ind:variable_state id="state_elements_count_for_configure_network_policies_namespaces" version="1">
<ind:value var_ref="local_variable_counter_configure_network_policies_filtered_namespaces"/>
<ind:value datatype="int" var_ref="local_variable_counter_configure_network_policies_filtered_namespaces"/>
</ind:variable_state>

<!-- OCP data root declaration -->
Expand Down
4 changes: 3 additions & 1 deletion shared/templates/yamlfile_value/oval.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
<ind:yamlfilecontent_test id="test_{{{ rule_id }}}" check="all" check_existence="{{{ CHECK_EXISTENCE|default("only_one_exists") }}}"
{{{ {'comment': "In the file '" + FILEPATH + "' find only one object at path '" + YAMLPATH + "'."}|xmlattr }}} version="1">
<ind:object object_ref="object_{{{ rule_id }}}"/>
{{% if CHECK_EXISTENCE != "none_exist" %}}
<ind:state state_ref="state_{{{ rule_id }}}"/>
{{% endif %}}
</ind:yamlfilecontent_test>
{{% else %}}
<ind:variable_test id="test_{{{ rule_id }}}" check="all" check_existence="all_exist" comment="Variable test to check XCCDF variable" version="1">
Expand Down Expand Up @@ -101,7 +103,7 @@
</local_variable>

<ind:variable_state id="state_elements_count_for_{{{ rule_id }}}" version="1">
<ind:value var_ref="local_variable_counter_control_{{{ rule_id }}}"/>
<ind:value datatype="int" var_ref="local_variable_counter_control_{{{ rule_id }}}"/>
</ind:variable_state>
{{% endif %}}

Expand Down