From c7b9760f4082d971e100d0dbb06125d2fb04ed52 Mon Sep 17 00:00:00 2001 From: chenk Date: Thu, 3 Aug 2023 16:38:06 +0300 Subject: [PATCH] fix: updated audit command (#120) * fix: updated audit command Signed-off-by: chenk * fix: updated audit command Signed-off-by: chenk --------- Signed-off-by: chenk --- check/bench.go | 2 -- check/check.go | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/check/bench.go b/check/bench.go index 9555e97..f1dea82 100644 --- a/check/bench.go +++ b/check/bench.go @@ -115,7 +115,6 @@ func (b *bench) extractAllAudits(controls *Controls) (err error) { } check.auditer = audit check.customConfigs = controls.customConfigs - check.OsTypeCommand = check.Audit } else { for _, subCheck := range check.SubChecks { if audit, err = b.convertAuditToRegisteredType(subCheck.AuditType, subCheck.Audit); err != nil { @@ -123,7 +122,6 @@ func (b *bench) extractAllAudits(controls *Controls) (err error) { } subCheck.auditer = audit subCheck.customConfigs = controls.customConfigs - check.OsTypeCommand = check.Audit } } } diff --git a/check/check.go b/check/check.go index f45d0c0..7df842b 100644 --- a/check/check.go +++ b/check/check.go @@ -82,7 +82,6 @@ type BaseCheck struct { Constraints map[string][]string `yaml:"constraints"` auditer Auditer customConfigs []interface{} - OsTypeCommand interface{} `json:"-"` } // SubCheck additional check to be performed. @@ -111,8 +110,7 @@ type Check struct { IsMultiple bool `yaml:"use_multiple_values"` auditer Auditer customConfigs []interface{} - Reason string `json:"reason,omitempty"` - OsTypeCommand interface{} `json:"-"` + Reason string `json:"reason,omitempty"` } // Group is a collection of similar checks. @@ -170,7 +168,6 @@ func (c *Check) Run(definedConstraints map[string][]string) { AuditType: c.AuditType, auditer: c.auditer, customConfigs: c.customConfigs, - OsTypeCommand: c.OsTypeCommand, } } else { subCheck = getFirstValidSubCheck(c.SubChecks, definedConstraints) @@ -262,7 +259,7 @@ func runAuditCommands(c BaseCheck) (output, errMessage string, state State) { } if c.auditer != nil { if len(c.customConfigs) == 0 { - c.customConfigs = append(c.customConfigs, c.OsTypeCommand) + c.customConfigs = append(c.customConfigs, c.Audit) } return c.auditer.Execute(c.customConfigs...) }