[CWS] make disableBundledRules a dynamic test opts (#27276)

DataDog · Jul 3, 2024 · 00e95ee · 00e95ee
1 parent 51437cf
commit 00e95ee
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkg/security/tests/filters_test.go b/pkg/security/tests/filters_test.go
@@ -60,7 +60,7 @@ func TestFilterOpenBasenameApprover(t *testing.T) {
 		Expression: fmt.Sprintf(`open.file.path == "{{.Root}}/%s"`, basename),
 	}
 
-	test, err := newTestModule(t, nil, []*rules.RuleDefinition{rule}, withStaticOpts(testOpts{disableBundledRules: true}))
+	test, err := newTestModule(t, nil, []*rules.RuleDefinition{rule}, withDynamicOpts(dynamicTestOpts{disableBundledRules: true}))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/security/tests/module_tester_linux.go b/pkg/security/tests/module_tester_linux.go
@@ -642,7 +642,7 @@ func newTestModule(t testing.TB, macroDefs []*rules.MacroDefinition, ruleDefs []
 		return nil, err
 	}
 
-	if opts.staticOpts.disableBundledRules {
+	if opts.dynamicOpts.disableBundledRules {
 		ruleDefs = append(ruleDefs, &rules.RuleDefinition{
 			ID:       events.NeedRefreshSBOMRuleID,
 			Disabled: true,

diff --git a/pkg/security/tests/open_test.go b/pkg/security/tests/open_test.go
@@ -433,7 +433,7 @@ func TestOpenApproverZero(t *testing.T) {
 		Expression: `open.flags == 0 && process.file.name == "testsuite"`,
 	}
 
-	test, err := newTestModule(t, nil, []*rules.RuleDefinition{rule}, withStaticOpts(testOpts{disableBundledRules: true}))
+	test, err := newTestModule(t, nil, []*rules.RuleDefinition{rule}, withDynamicOpts(dynamicTestOpts{disableBundledRules: true}))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/security/tests/testopts.go b/pkg/security/tests/testopts.go
@@ -58,12 +58,12 @@ type testOpts struct {
 	snapshotRuleMatchHandler                   func(*testModule, *model.Event, *rules.Rule)
 	enableFIM                                  bool // only valid on windows
 	networkIngressEnabled                      bool
-	disableBundledRules                        bool
 }
 
 type dynamicTestOpts struct {
 	testDir                  string
 	disableAbnormalPathCheck bool
+	disableBundledRules      bool
 }
 
 type tmOpts struct {