@@ -21,7 +21,6 @@ import (
2121
2222 "github.com/shirou/gopsutil/v4/process"
2323
24- ipc "github.com/DataDog/datadog-agent/comp/core/ipc/def"
2524 workloadfilter "github.com/DataDog/datadog-agent/comp/core/workloadfilter/def"
2625 workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
2726 "github.com/DataDog/datadog-agent/pkg/compliance/aptconfig"
@@ -115,7 +114,7 @@ type Agent struct {
115114 telemetrySender telemetry.SimpleTelemetrySender
116115 wmeta workloadmeta.Component
117116 filterStore workloadfilter.Component
118- ipc ipc. Component
117+ hostname string
119118 opts AgentOptions
120119
121120 telemetry * telemetry.ContainersTelemetry
@@ -139,7 +138,7 @@ var seclRuleFilterError error
139138// MakeDefaultRuleFilter implements the default filtering of benchmarks' rules. It
140139// will exclude rules based on the evaluation context / environment running
141140// the benchmark.
142- func MakeDefaultRuleFilter (ipc ipc. Component ) RuleFilter {
141+ func MakeDefaultRuleFilter (hostname string ) RuleFilter {
143142 isK8s := env .IsKubernetes ()
144143 xccdfEnabled := xccdfEnabled ()
145144
@@ -158,7 +157,7 @@ func MakeDefaultRuleFilter(ipc ipc.Component) RuleFilter {
158157 }
159158 if len (r .Filters ) > 0 {
160159 initSECRulerFilter .Do (func () {
161- seclRuleFilterValue , seclRuleFilterError = newSECLRuleFilter (ipc )
160+ seclRuleFilterValue , seclRuleFilterError = newSECLRuleFilter (hostname )
162161 })
163162 if seclRuleFilterError != nil {
164163 log .Errorf ("failed to apply rule filters: %s" , seclRuleFilterError )
@@ -179,7 +178,7 @@ func MakeDefaultRuleFilter(ipc ipc.Component) RuleFilter {
179178}
180179
181180// NewAgent returns a new compliance agent.
182- func NewAgent (telemetrySender telemetry.SimpleTelemetrySender , wmeta workloadmeta.Component , ipc ipc .Component , filterStore workloadfilter. Component , opts AgentOptions ) * Agent {
181+ func NewAgent (telemetrySender telemetry.SimpleTelemetrySender , wmeta workloadmeta.Component , filterStore workloadfilter .Component , hostname string , opts AgentOptions ) * Agent {
183182 if opts .ConfigDir == "" {
184183 panic ("compliance: missing agent configuration directory" )
185184 }
@@ -195,7 +194,7 @@ func NewAgent(telemetrySender telemetry.SimpleTelemetrySender, wmeta workloadmet
195194 if opts .CheckIntervalLowPriority <= 0 {
196195 opts .CheckIntervalLowPriority = defaultCheckIntervalLowPriority
197196 }
198- defaultRuleFilter := MakeDefaultRuleFilter (ipc )
197+ defaultRuleFilter := MakeDefaultRuleFilter (hostname )
199198 if ruleFilter := opts .RuleFilter ; ruleFilter != nil {
200199 opts .RuleFilter = func (r * Rule ) bool { return defaultRuleFilter (r ) && ruleFilter (r ) }
201200 } else {
@@ -205,7 +204,7 @@ func NewAgent(telemetrySender telemetry.SimpleTelemetrySender, wmeta workloadmet
205204 telemetrySender : telemetrySender ,
206205 wmeta : wmeta ,
207206 filterStore : filterStore ,
208- ipc : ipc ,
207+ hostname : hostname ,
209208 opts : opts ,
210209 statuses : make (map [string ]* CheckStatus ),
211210 }
@@ -424,7 +423,7 @@ func (a *Agent) runKubernetesConfigurationsExport(ctx context.Context) {
424423}
425424
426425func (a * Agent ) runAptConfigurationExport (ctx context.Context ) {
427- seclRuleFilter , err := newSECLRuleFilter (a .ipc )
426+ seclRuleFilter , err := newSECLRuleFilter (a .hostname )
428427 if err != nil {
429428 log .Errorf ("failed to run apt configuration export: %v" , err )
430429 return
0 commit comments