From 56d68588338608c16f153b8d2a843f7602ed91f8 Mon Sep 17 00:00:00 2001 From: David Windsor Date: Thu, 27 Jun 2024 17:07:00 -0400 Subject: [PATCH] formatting Signed-off-by: David Windsor --- pkg/api/tracingapi/client_kprobe.go | 6 +-- pkg/generictypes/generictypes.go | 4 +- pkg/grpc/tracing/tracing.go | 2 +- pkg/sensors/tracing/kprobe_test.go | 57 ++++++++++++++--------------- 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/pkg/api/tracingapi/client_kprobe.go b/pkg/api/tracingapi/client_kprobe.go index d4136188882..62a3fd9a5f3 100644 --- a/pkg/api/tracingapi/client_kprobe.go +++ b/pkg/api/tracingapi/client_kprobe.go @@ -410,9 +410,9 @@ func (m MsgGenericKprobeArgLinuxBinprm) IsReturnArg() bool { } type MsgGenericKprobeArgDentry struct { - Index uint64 - Value string - Label string + Index uint64 + Value string + Label string } func (m MsgGenericKprobeArgDentry) GetIndex() uint64 { diff --git a/pkg/generictypes/generictypes.go b/pkg/generictypes/generictypes.go index 887c1f9f4cf..a1a372915b1 100644 --- a/pkg/generictypes/generictypes.go +++ b/pkg/generictypes/generictypes.go @@ -110,7 +110,7 @@ var GenericStringToType = map[string]int{ "linux_binprm": GenericLinuxBinprmType, "data_loc": GenericDataLoc, "net_device": GenericNetDev, - "dentry": GenericDentryType, + "dentry": GenericDentryType, } var GenericTypeToStringTable = map[int]string{ @@ -153,7 +153,7 @@ var GenericTypeToStringTable = map[int]string{ GenericLinuxBinprmType: "linux_binprm", GenericDataLoc: "data_loc", GenericNetDev: "net_device", - GenericDentryType: "dentry", + GenericDentryType: "dentry", GenericInvalidType: "", } diff --git a/pkg/grpc/tracing/tracing.go b/pkg/grpc/tracing/tracing.go index 575a37b2ef3..68151578257 100644 --- a/pkg/grpc/tracing/tracing.go +++ b/pkg/grpc/tracing/tracing.go @@ -269,7 +269,7 @@ func getKprobeArgument(arg tracingapi.MsgGenericKprobeArg) *tetragon.KprobeArgum case api.MsgGenericKprobeArgDentry: lArg := &tetragon.KprobeDentry{ Name: e.Value, - }; + } a.Arg = &tetragon.KprobeArgument_DentryArg{DentryArg: lArg} a.Label = e.Label default: diff --git a/pkg/sensors/tracing/kprobe_test.go b/pkg/sensors/tracing/kprobe_test.go index 4d15c29bb1a..db8a53f0bb2 100644 --- a/pkg/sensors/tracing/kprobe_test.go +++ b/pkg/sensors/tracing/kprobe_test.go @@ -4235,45 +4235,45 @@ spec: func TestLoadKprobeSensor(t *testing.T) { var sensorProgs = []tus.SensorProg{ // kprobe - 0: tus.SensorProg{Name: "generic_kprobe_event", Type: ebpf.Kprobe}, - 1: tus.SensorProg{Name: "generic_kprobe_setup_event", Type: ebpf.Kprobe}, - 2: tus.SensorProg{Name: "generic_kprobe_process_event", Type: ebpf.Kprobe}, - 3: tus.SensorProg{Name: "generic_kprobe_filter_arg", Type: ebpf.Kprobe}, - 4: tus.SensorProg{Name: "generic_kprobe_process_filter", Type: ebpf.Kprobe}, - 5: tus.SensorProg{Name: "generic_kprobe_actions", Type: ebpf.Kprobe}, - 6: tus.SensorProg{Name: "generic_kprobe_output", Type: ebpf.Kprobe}, + 0: {Name: "generic_kprobe_event", Type: ebpf.Kprobe}, + 1: {Name: "generic_kprobe_setup_event", Type: ebpf.Kprobe}, + 2: {Name: "generic_kprobe_process_event", Type: ebpf.Kprobe}, + 3: {Name: "generic_kprobe_filter_arg", Type: ebpf.Kprobe}, + 4: {Name: "generic_kprobe_process_filter", Type: ebpf.Kprobe}, + 5: {Name: "generic_kprobe_actions", Type: ebpf.Kprobe}, + 6: {Name: "generic_kprobe_output", Type: ebpf.Kprobe}, // retkprobe - 7: tus.SensorProg{Name: "generic_retkprobe_event", Type: ebpf.Kprobe}, - 8: tus.SensorProg{Name: "generic_retkprobe_filter_arg", Type: ebpf.Kprobe}, - 9: tus.SensorProg{Name: "generic_retkprobe_actions", Type: ebpf.Kprobe}, - 10: tus.SensorProg{Name: "generic_retkprobe_output", Type: ebpf.Kprobe}, + 7: {Name: "generic_retkprobe_event", Type: ebpf.Kprobe}, + 8: {Name: "generic_retkprobe_filter_arg", Type: ebpf.Kprobe}, + 9: {Name: "generic_retkprobe_actions", Type: ebpf.Kprobe}, + 10: {Name: "generic_retkprobe_output", Type: ebpf.Kprobe}, } var sensorMaps = []tus.SensorMap{ // all kprobe programs - tus.SensorMap{Name: "process_call_heap", Progs: []uint{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}, + {Name: "process_call_heap", Progs: []uint{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10}}, // all but generic_kprobe_output - tus.SensorMap{Name: "kprobe_calls", Progs: []uint{0, 1, 2, 3, 4, 5}}, + {Name: "kprobe_calls", Progs: []uint{0, 1, 2, 3, 4, 5}}, // generic_retkprobe_event - tus.SensorMap{Name: "retkprobe_calls", Progs: []uint{7, 8, 9}}, + {Name: "retkprobe_calls", Progs: []uint{7, 8, 9}}, // generic_kprobe_process_filter,generic_kprobe_filter_arg, // generic_kprobe_actions,generic_kprobe_output - tus.SensorMap{Name: "filter_map", Progs: []uint{3, 4, 5}}, + {Name: "filter_map", Progs: []uint{3, 4, 5}}, // generic_kprobe_actions - tus.SensorMap{Name: "override_tasks", Progs: []uint{5}}, + {Name: "override_tasks", Progs: []uint{5}}, // all kprobe but generic_kprobe_process_filter,generic_retkprobe_event - tus.SensorMap{Name: "config_map", Progs: []uint{0, 1, 2}}, + {Name: "config_map", Progs: []uint{0, 1, 2}}, // generic_kprobe_process_event*,generic_kprobe_actions,retkprobe - tus.SensorMap{Name: "fdinstall_map", Progs: []uint{1, 2, 5, 7, 9}}, + {Name: "fdinstall_map", Progs: []uint{1, 2, 5, 7, 9}}, // generic_kprobe_event - tus.SensorMap{Name: "tg_conf_map", Progs: []uint{0}}, + {Name: "tg_conf_map", Progs: []uint{0}}, } if kernels.EnableLargeProgs() { @@ -6003,7 +6003,7 @@ func TestDentryExtractPath(t *testing.T) { tus.LoadSensor(t, testsensor.GetTestSensor()) sm := tus.GetTestSensorManager(ctx, t) - testSymlink := testutils.RepoRootPath("contrib/tester-progs/symlink-tester") + testSymlink := testutils.RepoRootPath("contrib/tester-progs/symlink-tester") dentryTracingPolicy := tracingpolicy.GenericTracingPolicy{ Metadata: v1.ObjectMeta{ Name: "dentry-extract-path", @@ -6031,7 +6031,7 @@ func TestDentryExtractPath(t *testing.T) { MatchBinaries: []v1alpha1.BinarySelector{ { Operator: "In", - Values: []string{testSymlink}, + Values: []string{testSymlink}, }, }, }, @@ -6043,14 +6043,14 @@ func TestDentryExtractPath(t *testing.T) { err := sm.Manager.AddTracingPolicy(ctx, &dentryTracingPolicy) assert.NoError(t, err) - + command := exec.Command(testSymlink) - - ops := func() { - err = command.Start() - assert.NoError(t, err) - defer command.Process.Kill() - } + + ops := func() { + err = command.Start() + assert.NoError(t, err) + defer command.Process.Kill() + } events := perfring.RunTestEvents(t, ctx, ops) @@ -6064,7 +6064,6 @@ func TestDentryExtractPath(t *testing.T) { t.Error("dentry error") } - func TestLinuxBinprmExtractPath(t *testing.T) { testutils.CaptureLog(t, logger.GetLogger().(*logrus.Logger)) ctx, cancel := context.WithTimeout(context.Background(), tus.Conf().CmdWaitTime)