test: Update tests to account for collectionKey changes

Signed-off-by: Joshua Jorel Lee <joshua.jorel.ee@gmail.com>
cilium · Apr 19, 2024 · acd9375 · acd9375
1 parent 1a3ec9a
commit acd9375
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/pkg/metrics/policystatemetrics/policystatemetrics_test.go b/pkg/metrics/policystatemetrics/policystatemetrics_test.go
@@ -52,7 +52,7 @@ tetragon_tracingpolicy_loaded{state="load_error"} %d
 	err = testutil.CollectAndCompare(collector, expectedMetrics(0, 1, 0, 0))
 	assert.NoError(t, err)
 
-	err = manager.DisableTracingPolicy(context.TODO(), "pizza")
+	err = manager.DisableTracingPolicy(context.TODO(), "pizza", "")
 	assert.NoError(t, err)
 	err = testutil.CollectAndCompare(collector, expectedMetrics(1, 0, 0, 0))
 	assert.NoError(t, err)

diff --git a/pkg/sensors/manager_test.go b/pkg/sensors/manager_test.go
@@ -164,14 +164,15 @@ func TestPolicyFilterDisabled(t *testing.T) {
 
 	// normal policy should succeed
 	policyName := "test-policy"
+	policyNamespace := ""
 	policy.ObjectMeta.Name = policyName
 	err = mgr.AddTracingPolicy(ctx, &policy)
 	require.NoError(t, err, fmt.Sprintf("Add tracing policy failed with error: %v", err))
-	err = mgr.DeleteTracingPolicy(ctx, policyName)
+	err = mgr.DeleteTracingPolicy(ctx, policyName, policyNamespace)
 	require.NoError(t, err)
 	err = mgr.AddTracingPolicy(ctx, &policy)
 	require.NoError(t, err)
-	err = mgr.DeleteTracingPolicy(ctx, policyName)
+	err = mgr.DeleteTracingPolicy(ctx, policyName, policyNamespace)
 	require.NoError(t, err)
 
 	// namespaced policy with disabled state should fail
@@ -248,7 +249,7 @@ func TestPolicyStates(t *testing.T) {
 		assert.Len(t, l.Policies, 1)
 		assert.Equal(t, EnabledState.ToTetragonState(), l.Policies[0].State)
 
-		err = mgr.DisableTracingPolicy(ctx, policy.ObjectMeta.Name)
+		err = mgr.DisableTracingPolicy(ctx, policy.ObjectMeta.Name, policy.Namespace)
 		assert.NoError(t, err)
 		l, err = mgr.ListTracingPolicies(ctx)
 		assert.NoError(t, err)

diff --git a/pkg/sensors/tracing/generickprobe_test.go b/pkg/sensors/tracing/generickprobe_test.go
@@ -132,6 +132,7 @@ func Test_Kprobe_DisableEnablePolicy(t *testing.T) {
 	})
 
 	const policyName = "test"
+	const policyNamespace = ""
 	policy := v1alpha1.TracingPolicy{
 		ObjectMeta: v1.ObjectMeta{
 			Name: policyName,
@@ -150,7 +151,7 @@ func Test_Kprobe_DisableEnablePolicy(t *testing.T) {
 		err = mgr.AddTracingPolicy(ctx, &policy)
 		assert.NoError(t, err)
 		t.Cleanup(func() {
-			err = mgr.DeleteTracingPolicy(ctx, policyName)
+			err = mgr.DeleteTracingPolicy(ctx, policyName, policyNamespace)
 			assert.NoError(t, err)
 		})
 
@@ -164,13 +165,13 @@ func Test_Kprobe_DisableEnablePolicy(t *testing.T) {
 		err = mgr.AddTracingPolicy(ctx, &policy)
 		assert.NoError(t, err)
 		t.Cleanup(func() {
-			err = mgr.DeleteTracingPolicy(ctx, policyName)
+			err = mgr.DeleteTracingPolicy(ctx, policyName, policy.Namespace)
 			assert.NoError(t, err)
 		})
 
-		err = mgr.DisableTracingPolicy(ctx, policyName)
+		err = mgr.DisableTracingPolicy(ctx, policyName, policyNamespace)
 		assert.NoError(t, err)
-		err = mgr.EnableTracingPolicy(ctx, policyName)
+		err = mgr.EnableTracingPolicy(ctx, policyName, policyNamespace)
 		assert.NoError(t, err)
 	})
 }
diff --git a/pkg/sensors/tracing/policyfilter_test.go b/pkg/sensors/tracing/policyfilter_test.go
@@ -280,7 +280,7 @@ func TestNamespacedPolicies(t *testing.T) {
 	runTest(map[int32]int{4444: 1})
 
 	// Let's delete the tracing policy, and check that we get no events
-	err = sm.Manager.DeleteTracingPolicy(ctx, "lseek-test")
+	err = sm.Manager.DeleteTracingPolicy(ctx, "lseek-test", "ns1")
 	require.NoError(t, err)
 	runTest(map[int32]int{})
 
@@ -290,7 +290,7 @@ func TestNamespacedPolicies(t *testing.T) {
 	runTest(map[int32]int{4444: 1})
 
 	// delete policy, and see that we still don't get any events
-	err = sm.Manager.DeleteTracingPolicy(ctx, "lseek-test")
+	err = sm.Manager.DeleteTracingPolicy(ctx, "lseek-test", "")
 	require.NoError(t, err)
 	runTest(map[int32]int{})
 

diff --git a/pkg/server/fake_observer.go b/pkg/server/fake_observer.go
@@ -34,15 +34,15 @@ func (f *FakeObserver) AddTracingPolicy(ctx context.Context, tp tracingpolicy.Tr
 	return nil
 }
 
-func (f *FakeObserver) DeleteTracingPolicy(ctx context.Context, sensorName string) error {
+func (f *FakeObserver) DeleteTracingPolicy(ctx context.Context, sensorName string, sensorNamespace string) error {
 	return nil
 }
 
-func (f *FakeObserver) EnableTracingPolicy(ctx context.Context, sensorName string) error {
+func (f *FakeObserver) EnableTracingPolicy(ctx context.Context, sensorName string, sensorNamespace string) error {
 	return nil
 }
 
-func (f *FakeObserver) DisableTracingPolicy(ctx context.Context, sensorName string) error {
+func (f *FakeObserver) DisableTracingPolicy(ctx context.Context, sensorName string, sensorNamespace string) error {
 	return nil
 }