github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add nolint:staticcheck to platform-specific calls

Browse Source 
The linter on platforms that have a hardcoded response complains about
"if xyz == nil" checks; ignore those.

Signed-off-by: Phil Estes <estesp@amazon.com>
This commit is contained in:
Phil Estes 2022-03-17 14:51:44 -04:00
parent c568752335
commit ee49c4d557
No known key found for this signature in database
GPG Key ID: FE2598126B196A38
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/server/container_stats.go
View File

@ -41,7 +41,7 @@ func (c *criService) ContainerStats(ctx context.Context, in *runtime.ContainerSt
} }
cs, err := c.containerMetrics(cntr.Metadata, resp.Metrics[0]) 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 nil, fmt.Errorf("failed to decode container metrics: %w", err)
} }
return &runtime.ContainerStatsResponse{Stats: cs}, nil return &runtime.ContainerStatsResponse{Stats: cs}, nil

2
pkg/cri/server/container_stats_list.go
View File

@ -58,7 +58,7 @@ func (c *criService) toCRIContainerStats(
containerStats := new(runtime.ListContainerStatsResponse) containerStats := new(runtime.ListContainerStatsResponse)
for _, cntr := range containers { for _, cntr := range containers {
cs, err := c.containerMetrics(cntr.Metadata, statsMap[cntr.ID]) 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) return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)
} }
containerStats.Stats = append(containerStats.Stats, cs) containerStats.Stats = append(containerStats.Stats, cs)

5
pkg/cri/server/sandbox_stats.go
View File

@ -34,13 +34,12 @@ func (c *criService) PodSandboxStats(
} }
metrics, err := metricsForSandbox(sandbox) 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) return nil, fmt.Errorf("failed getting metrics for sandbox %s: %w", r.GetPodSandboxId(), err)
} }
podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics) podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics)
if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
if err != nil {
return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err) return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err)
} }

5
pkg/cri/server/sandbox_stats_list.go
View File

@ -34,13 +34,12 @@ func (c *criService) ListPodSandboxStats(
podSandboxStats := new(runtime.ListPodSandboxStatsResponse) podSandboxStats := new(runtime.ListPodSandboxStatsResponse)
for _, sandbox := range sandboxes { for _, sandbox := range sandboxes {
metrics, err := metricsForSandbox(sandbox) metrics, err := metricsForSandbox(sandbox)
if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)
if err != nil {
return nil, fmt.Errorf("failed to obtain metrics for sandbox %q: %w", sandbox.ID, err) return nil, fmt.Errorf("failed to obtain metrics for sandbox %q: %w", sandbox.ID, err)
} }
sandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics) 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) return nil, fmt.Errorf("failed to decode sandbox container metrics for sandbox %q: %w", sandbox.ID, err)
} }
podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats) podSandboxStats.Stats = append(podSandboxStats.Stats, sandboxStats)