Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable new analyzers (protogetter, sloglint and testifylint) #1295

Merged
merged 3 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .golangci.yml
Expand Up @@ -39,11 +39,14 @@ linters:
- noctx
- nosprintfhostport
- predeclared
- protogetter
- reassign
- revive
- sloglint
- staticcheck
- tagalign
- tenv
- testifylint
- typecheck
- unconvert
- unparam
Expand Down
6 changes: 3 additions & 3 deletions cmd/list/namespaces.go
Expand Up @@ -86,9 +86,9 @@ func namespaceTableOutput(buf io.Writer, namespaces []*observerpb.Namespace) err

// contents
for _, ns := range namespaces {
fmt.Fprint(tw, ns.Namespace)
if listOpts.output == "wide" && ns.Cluster != "" {
fmt.Fprint(tw, "\t", ns.Cluster)
fmt.Fprint(tw, ns.GetNamespace())
if listOpts.output == "wide" && ns.GetCluster() != "" {
fmt.Fprint(tw, "\t", ns.GetCluster())
}
fmt.Fprintln(tw)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/list/node.go
Expand Up @@ -74,7 +74,7 @@ func runListNodes(ctx context.Context, cmd *cobra.Command, conn *grpc.ClientConn

nodes := res.GetNodes()
sort.Slice(nodes, func(i, j int) bool {
return nodes[i].Name < nodes[j].Name
return nodes[i].GetName() < nodes[j].GetName()
})
switch listOpts.output {
case "json":
Expand Down Expand Up @@ -114,7 +114,7 @@ func nodeTableOutput(buf io.Writer, nodes []*observerpb.Node) error {
tls := notAvailable
if t := n.GetTls(); t != nil {
tls = "Disabled"
if t.Enabled {
if t.GetEnabled() {
tls = "Enabled"
}
}
Expand Down
15 changes: 7 additions & 8 deletions cmd/observe/agent_events_test.go
Expand Up @@ -40,16 +40,16 @@ func Test_getAgentEventsRequest(t *testing.T) {
selectorOpts.since = ""
selectorOpts.until = ""
req, err := getAgentEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetAgentEventsRequest{Number: defaults.EventsPrintCount}, req)
selectorOpts.since = "2021-04-26T00:00:00Z"
selectorOpts.until = "2021-04-26T00:01:00Z"
req, err = getAgentEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
since, err := time.Parse(time.RFC3339, selectorOpts.since)
assert.NoError(t, err)
require.NoError(t, err)
until, err := time.Parse(time.RFC3339, selectorOpts.until)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetAgentEventsRequest{
Number: defaults.EventsPrintCount,
Since: timestamppb.New(since),
Expand All @@ -61,14 +61,13 @@ func Test_getAgentEventsRequestWithoutSince(t *testing.T) {
selectorOpts.since = ""
selectorOpts.until = ""
req, err := getAgentEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetAgentEventsRequest{Number: defaults.EventsPrintCount}, req)
selectorOpts.until = "2021-04-26T00:01:00Z"
req, err = getAgentEventsRequest()
assert.NoError(t, err)
assert.NoError(t, err)
require.NoError(t, err)
until, err := time.Parse(time.RFC3339, selectorOpts.until)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetAgentEventsRequest{
Number: defaults.EventsPrintCount,
Until: timestamppb.New(until),
Expand Down
15 changes: 8 additions & 7 deletions cmd/observe/debug_events_test.go
Expand Up @@ -10,23 +10,24 @@ import (
observerpb "github.com/cilium/cilium/api/v1/observer"
"github.com/cilium/hubble/pkg/defaults"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/protobuf/types/known/timestamppb"
)

func Test_getDebugEventsRequest(t *testing.T) {
selectorOpts.since = ""
selectorOpts.until = ""
req, err := getDebugEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetDebugEventsRequest{Number: defaults.EventsPrintCount}, req)
selectorOpts.since = "2021-04-26T01:00:00Z"
selectorOpts.until = "2021-04-26T01:01:00Z"
req, err = getDebugEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
since, err := time.Parse(time.RFC3339, selectorOpts.since)
assert.NoError(t, err)
require.NoError(t, err)
until, err := time.Parse(time.RFC3339, selectorOpts.until)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetDebugEventsRequest{
Number: defaults.EventsPrintCount,
Since: timestamppb.New(since),
Expand All @@ -38,13 +39,13 @@ func Test_getDebugEventsRequestWithoutSince(t *testing.T) {
selectorOpts.since = ""
selectorOpts.until = ""
req, err := getDebugEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetDebugEventsRequest{Number: defaults.EventsPrintCount}, req)
selectorOpts.until = "2021-04-26T01:01:00Z"
req, err = getDebugEventsRequest()
assert.NoError(t, err)
require.NoError(t, err)
until, err := time.Parse(time.RFC3339, selectorOpts.until)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &observerpb.GetDebugEventsRequest{
Number: defaults.EventsPrintCount,
Until: timestamppb.New(until),
Expand Down
4 changes: 2 additions & 2 deletions cmd/observe/flows.go
Expand Up @@ -111,15 +111,15 @@ type getFlowsFilters struct {
// passed to hubble observe command via `--config` flag.
func getFlowFiltersYAML(req *observerpb.GetFlowsRequest) (string, error) {
var allowlist, denylist []string
for _, filter := range req.Whitelist {
for _, filter := range req.GetWhitelist() {
filterJSON, err := json.Marshal(filter)
if err != nil {
return "", err
}
allowlist = append(allowlist, string(filterJSON))

}
for _, filter := range req.Blacklist {
for _, filter := range req.GetBlacklist() {
filterJSON, err := json.Marshal(filter)
if err != nil {
return "", err
Expand Down