Pr/jrfastab/config map testing

cmd/tetragon/conf.go

@@ -20,7 +20,7 @@ var (
 	}
 )
 
-func readConfigSettings(defaultConfDir string, defaultConfDropIn string, dropInsDir []string) {
+func ReadConfigSettings(defaultConfDir string, defaultConfDropIn string, dropInsDir []string) {
 	viper.SetEnvPrefix("tetragon")
 	replacer := strings.NewReplacer("-", "_")
 	viper.SetEnvKeyReplacer(replacer)

cmd/tetragon/conf_test.go

@@ -1117,7 +1117,7 @@ func runTestCases(t *testing.T) {
 		packageConfDropIns = append(packageConfDropIns, filepath.Join(testDir, c))
 	}
 	log.Infof("Test %s index %d dumping settings before: %+v", c.description, globalTestIndex, viper.AllSettings())
-	readConfigSettings(defaultConfYamlFile, defaultConfDropIn, packageConfDropIns)
+	ReadConfigSettings(defaultConfYamlFile, defaultConfDropIn, packageConfDropIns)
 	log.Infof("Test %s index %d expected settings: %+v", c.description, globalTestIndex, c.expectedOptions)
 	log.Infof("Test %s index %d dumping settings after: %+v", c.description, globalTestIndex, viper.AllSettings())
 

cmd/tetragon/main.go

@@ -858,7 +858,7 @@ func execute() error {
 	}
 
 	cobra.OnInitialize(func() {
-		readConfigSettings(adminTgConfDir, adminTgConfDropIn, packageTgConfDropIns)
+		ReadConfigSettings(adminTgConfDir, adminTgConfDropIn, packageTgConfDropIns)
 	})
 
 	flags := rootCmd.PersistentFlags()

pkg/observer/observertesthelper/observer_test_helper.go

@@ -677,6 +677,22 @@ func WaitForProcess(process string) error {
 	return fmt.Errorf("process '%s' did not start", process)
 }
 
+func WriteConfigMap(dir, key, value string) error {
+	fileName := filepath.Join(dir, key)
+	if err := os.MkdirAll(filepath.Dir(fileName), 0777); err != nil {
+		return err
+	}
+
+	out, err := os.Create(fileName)
+	if err != nil {
+		return err
+	}
+	if _, err := out.Write([]byte(value)); err != nil {
+		return err
+	}
+	return out.Sync()
+}
+
 func WriteConfigFile(fileName, config string) error {
 	out, err := os.Create(fileName)
 	if err != nil {

pkg/sensors/exec/exec_test.go

@@ -46,6 +46,8 @@
 	"github.com/cilium/tetragon/pkg/testutils/perfring"
 	tus "github.com/cilium/tetragon/pkg/testutils/sensors"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/pflag"
+	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
@@ -1632,3 +1634,49 @@
 func TestThrottle2(t *testing.T) {
 	testThrottle(t)
 }
+
+func TestConfigDir(t *testing.T) {
+	var flags pflag.FlagSet
+	configDir := "/tmp/tetragon.configMap"
+	observertesthelper.WriteConfigMap(configDir, "enable-process-cred", "false")
+	observertesthelper.WriteConfigMap(configDir, "enable-process-ns", "false")
+
+	var doneWG, readyWG sync.WaitGroup
+	defer doneWG.Wait()
+
+	ctx, cancel := context.WithTimeout(context.Background(), tus.Conf().CmdWaitTime)
+	defer cancel()
+
+	obs, err := observertesthelper.GetDefaultObserver(t, ctx, tus.Conf().TetragonLib, observertesthelper.WithConfigMap(configDir))
+	if err != nil {
+		t.Fatalf("Failed to run observer: %s", err)
+	}
+
+	option.ReadConfigDir(configDir)
+	option.AddFlags(&flags)
+	viper.BindPFlags(&flags)
+	option.ReadAndSetFlags()
+
+	observertesthelper.LoopEvents(ctx, t, &doneWG, &readyWG, obs)
+	readyWG.Wait()
+
+	testNop := testutils.RepoRootPath("contrib/tester-progs/nop")
+
+	myCaps := ec.NewCapabilitiesChecker().FromCapabilities(caps.GetCurrentCapabilities())
+	myNs := ec.NewNamespacesChecker().FromNamespaces(namespace.GetCurrentNamespace())
+	procChecker := ec.NewProcessChecker().
+		WithBinary(sm.Full(testNop)).
+		WithArguments(sm.Full("arg1 arg2 arg3")).
+		WithCap(myCaps).
+		WithNs(myNs)
+
+	execChecker := ec.NewProcessExecChecker("").WithProcess(procChecker)
+	checker := ec.NewUnorderedEventChecker(execChecker)
+
+	if err := exec.Command(testNop, "arg1", "arg2", "arg3").Run(); err != nil {
+		t.Fatalf("Failed to execute test binary: %s\n", err)
+	}
+
+	err = jsonchecker.JsonTestCheck(t, checker)
+	assert.Error(t, err)
+}