From ee49c4d557938bb52e439bc84078e60e37ef32d6 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 17 Mar 2022 14:51:44 -0400 Subject: [PATCH] Add nolint:staticcheck to platform-specific calls The linter on platforms that have a hardcoded response complains about "if xyz == nil" checks; ignore those. Signed-off-by: Phil Estes --- pkg/cri/server/container_stats.go | 2 +- pkg/cri/server/container_stats_list.go | 2 +- pkg/cri/server/sandbox_stats.go | 5 ++--- pkg/cri/server/sandbox_stats_list.go | 5 ++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/cri/server/container_stats.go b/pkg/cri/server/container_stats.go index 0ca66eef3..db62c342b 100644 --- a/pkg/cri/server/container_stats.go +++ b/pkg/cri/server/container_stats.go @@ -41,7 +41,7 @@ func (c *criService) ContainerStats(ctx context.Context, in *runtime.ContainerSt } cs, err := c.containerMetrics(cntr.Metadata, resp.Metrics[0]) - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (stats unimplemented) return nil, fmt.Errorf("failed to decode container metrics: %w", err) } return &runtime.ContainerStatsResponse{Stats: cs}, nil diff --git a/pkg/cri/server/container_stats_list.go b/pkg/cri/server/container_stats_list.go index 1d9be7d40..865c6bbf3 100644 --- a/pkg/cri/server/container_stats_list.go +++ b/pkg/cri/server/container_stats_list.go @@ -58,7 +58,7 @@ func (c *criService) toCRIContainerStats( containerStats := new(runtime.ListContainerStatsResponse) for _, cntr := range containers { cs, err := c.containerMetrics(cntr.Metadata, statsMap[cntr.ID]) - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (metrics unimplemented) return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err) } containerStats.Stats = append(containerStats.Stats, cs) diff --git a/pkg/cri/server/sandbox_stats.go b/pkg/cri/server/sandbox_stats.go index d9c9a5550..b74dd0ff5 100644 --- a/pkg/cri/server/sandbox_stats.go +++ b/pkg/cri/server/sandbox_stats.go @@ -34,13 +34,12 @@ func (c *criService) PodSandboxStats( } metrics, err := metricsForSandbox(sandbox) - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics) return nil, fmt.Errorf("failed getting metrics for sandbox %s: %w", r.GetPodSandboxId(), err) } podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics) - - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics) return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err) } diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index ff55b8f1c..1cd4f2db8 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -34,13 +34,12 @@ func (c *criService) ListPodSandboxStats( podSandboxStats := new(runtime.ListPodSandboxStatsResponse) for _, sandbox := range sandboxes { metrics, err := metricsForSandbox(sandbox) - - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics) return nil, fmt.Errorf("failed to obtain metrics for sandbox %q: %w", sandbox.ID, err) } sandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics) - if err != nil { + if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics) return nil, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err) } podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats)