From 59e6e3cd99cb746cf3c3c2dff85e5410504455c2 Mon Sep 17 00:00:00 2001 From: ShohamBit Date: Wed, 8 Jan 2025 15:45:57 +0000 Subject: [PATCH] fix lint problom in traceectl --- cmd/traceectl/cmd/event.go | 9 +++------ cmd/traceectl/cmd/root.go | 1 - cmd/traceectl/cmd/stream.go | 9 ++++----- cmd/traceectl/pkg/cmd/flags/server.go | 1 - cmd/traceectl/pkg/cmd/formatter/formatter.go | 2 +- cmd/traceectl/pkg/cmd/test/test.go | 1 - cmd/traceectl/pkg/mock/server.go | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/cmd/traceectl/cmd/event.go b/cmd/traceectl/cmd/event.go index c4abe945d913..3beb723a092f 100644 --- a/cmd/traceectl/cmd/event.go +++ b/cmd/traceectl/cmd/event.go @@ -62,7 +62,7 @@ var describeEventCmd = &cobra.Command{ Long: `Retrieves the detailed definition of a specific event, including its fields, types, and other metadata.`, Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { - getEventDescriptions(cmd, args) + eventDescriptions(cmd, args) }, } var enableEventCmd = &cobra.Command{ @@ -108,7 +108,7 @@ func listEvents(cmd *cobra.Command, args []string) { case formatter.FormatTable: format.PrintTableHeaders([]string{"ID", "Name", "Version", "Tags"}) for _, event := range response.Definitions { - //remove descriptions + // remove descriptions format.PrintTableRow(prepareDescription(event)[:4]) } default: @@ -117,7 +117,7 @@ func listEvents(cmd *cobra.Command, args []string) { } } -func getEventDescriptions(cmd *cobra.Command, args []string) { +func eventDescriptions(cmd *cobra.Command, args []string) { traceeClient, err := client.NewServiceClient(server) if err != nil { cmd.PrintErrln("Error creating client: ", err) @@ -129,7 +129,6 @@ func getEventDescriptions(cmd *cobra.Command, args []string) { if err != nil { cmd.PrintErrln("Error getting event definitions: ", err) return - } format, err := formatter.NewFormatter(formatFlag, cmd) if err != nil { @@ -147,7 +146,6 @@ func getEventDescriptions(cmd *cobra.Command, args []string) { default: cmd.PrintErrln("output format not supported") return - } } func prepareDescription(event *pb.EventDefinition) []string { @@ -158,7 +156,6 @@ func prepareDescription(event *pb.EventDefinition) []string { strings.Join(event.Tags, ", "), event.Description, } - } func enableEvents(cmd *cobra.Command, eventName string) { traceeClient, err := client.NewServiceClient(server) diff --git a/cmd/traceectl/cmd/root.go b/cmd/traceectl/cmd/root.go index 072f70583acd..4aaeef1c04ec 100644 --- a/cmd/traceectl/cmd/root.go +++ b/cmd/traceectl/cmd/root.go @@ -103,7 +103,6 @@ func displayMetrics(cmd *cobra.Command, _ []string) { fmt.Fprintf(cmd.OutOrStdout(), "LostWrCount: %d\n", response.LostWrCount) fmt.Fprintf(cmd.OutOrStdout(), "LostNtCapCount: %d\n", response.LostNtCapCount) fmt.Fprintf(cmd.OutOrStdout(), "LostBPFLogsCount: %d\n", response.LostBPFLogsCount) - } func displayVersion(cmd *cobra.Command, _ []string) { diff --git a/cmd/traceectl/cmd/stream.go b/cmd/traceectl/cmd/stream.go index 0b9f8b3fd42d..8db001d1f3f7 100644 --- a/cmd/traceectl/cmd/stream.go +++ b/cmd/traceectl/cmd/stream.go @@ -36,14 +36,14 @@ func streamEvents(cmd *cobra.Command, args []string) { } defer traceeClient.CloseConnection() - //request to stream events + // request to stream events req := &pb.StreamEventsRequest{Policies: args} stream, err := traceeClient.StreamEvents(cmd.Context(), req) if err != nil { cmd.PrintErrln("Error calling Stream: ", err) return } - //create formatter + // create formatter format, err := formatter.NewFormatter(formatFlag, cmd) if err != nil { cmd.PrintErrln("Error creating formatter: ", err) @@ -54,7 +54,7 @@ func streamEvents(cmd *cobra.Command, args []string) { for { res, err := stream.Recv() if err != nil { - //End of stream\close connection + // End of stream\close connectio if errors.Is(err, io.EOF) { break } @@ -67,7 +67,7 @@ func streamEvents(cmd *cobra.Command, args []string) { for { res, err := stream.Recv() if err != nil { - //End of stream\close connection + // End of stream\close connection if errors.Is(err, io.EOF) { break } @@ -88,7 +88,6 @@ func prepareEvent(event *pb.Event) []string { strconv.Itoa(int(event.Context.Process.Pid.Value)), getEventData(event.Data), } - } func getEventData(data []*pb.EventValue) string { var result []string diff --git a/cmd/traceectl/pkg/cmd/flags/server.go b/cmd/traceectl/pkg/cmd/flags/server.go index 5191eddde1bb..0b9b0e709604 100644 --- a/cmd/traceectl/pkg/cmd/flags/server.go +++ b/cmd/traceectl/pkg/cmd/flags/server.go @@ -39,7 +39,6 @@ func determineConnectionType(server client.ServerInfo) error { } return fmt.Errorf("unsupported connection type: %s", server.Addr) - } func isValidTCPAddress(addr string) bool { host, port, err := net.SplitHostPort(addr) diff --git a/cmd/traceectl/pkg/cmd/formatter/formatter.go b/cmd/traceectl/pkg/cmd/formatter/formatter.go index 77e7ad8137e7..0ed449ebae23 100644 --- a/cmd/traceectl/pkg/cmd/formatter/formatter.go +++ b/cmd/traceectl/pkg/cmd/formatter/formatter.go @@ -27,7 +27,7 @@ func NewFormatter(format string, cmd *cobra.Command) (*Formatter, error) { cmd: cmd, }, nil case FormatTable: - //add padding for table + // add padding for table return &Formatter{ format: format, cmd: cmd, diff --git a/cmd/traceectl/pkg/cmd/test/test.go b/cmd/traceectl/pkg/cmd/test/test.go index 2de066b69ce5..6420d1ee6e94 100644 --- a/cmd/traceectl/pkg/cmd/test/test.go +++ b/cmd/traceectl/pkg/cmd/test/test.go @@ -47,6 +47,5 @@ func TestCommand(t *testing.T, testCase TestCase, rootCmd *cobra.Command) { assert.ErrorContains(t, err, testCase.ExpectedError.Error()) } else { assert.Contains(t, output, testCase.ExpectedPrinter) - } } diff --git a/cmd/traceectl/pkg/mock/server.go b/cmd/traceectl/pkg/mock/server.go index 1353f22e6010..66eb9d522a04 100644 --- a/cmd/traceectl/pkg/mock/server.go +++ b/cmd/traceectl/pkg/mock/server.go @@ -12,7 +12,7 @@ import ( ) var ( - ExpectedVersion string = "v0.22.0-15-gd09d7fca0d" + ExpectedVersion = "v0.22.0-15-gd09d7fca0d" serverInfo *client.ServerInfo = &client.ServerInfo{ Addr: client.Socket, ConnectionType: client.Protocol_UNIX,