Simplify generated augen bash expressions

[matejak]

Certain checks can be performed at expansion time rather than at execution time.

The datastream diff is a good helper to see what this fix is about.

[github-actions]

Start a new ephemeral environment with changes proposed in this pull request:

[github-actions]

This datastream diff is auto generated by the check Compare DS/Generate Diff

Click here to see the full diff

bash remediation for rule 'xccdf_org.ssgproject.content_rule_audit_rules_privileged_commands' differs:
--- old datastream
+++ new datastream
@@ -106,8 +106,8 @@
 # searched all of the files from /etc/audit/rules.d/*.rules location (since that audit rule can be defined
 # in any of those files and if not, we want it to be inserted only once into /etc/audit/rules.d/privileged.rules file)
 #
- elif [ "auditctl" == "auditctl" ] || [[ "auditctl" == "augenrules" && $count_of_inspected_files -eq "${#files_to_inspect[@]}" ]]
- then
+ 
+ else
 # Check if this sbinary wasn't already handled in some of the previous afile iterations
 # Return match only if whole sbinary definition matched (not in the case just prefix matched!!!)
 if [[ ! $(sed -ne "\|${sbinary}|p" <<< "${sbinaries_to_skip[*]}") ]]
@@ -224,8 +224,9 @@
 # searched all of the files from /etc/audit/rules.d/*.rules location (since that audit rule can be defined
 # in any of those files and if not, we want it to be inserted only once into /etc/audit/rules.d/privileged.rules file)
 #
- elif [ "augenrules" == "auditctl" ] || [[ "augenrules" == "augenrules" && $count_of_inspected_files -eq "${#files_to_inspect[@]}" ]]
+ elif [[ $count_of_inspected_files -eq "${#files_to_inspect[@]}" ]]
 then
+ 
 # Check if this sbinary wasn't already handled in some of the previous afile iterations
 # Return match only if whole sbinary definition matched (not in the case just prefix matched!!!)
 if [[ ! $(sed -ne "\|${sbinary}|p" <<< "${sbinaries_to_skip[*]}") ]]

[openshift-ci]

@matejak: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ocp4-e8	a3a9446	link	true	/test e2e-aws-ocp4-e8
ci/prow/e2e-aws-ocp4-moderate-node	a3a9446	link	true	/test e2e-aws-ocp4-moderate-node

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[jan-cerny]

The test scenarios pass locally, probably due to the container used in GH CI.