Add nolint:staticcheck to platform-specific calls

estesp · thaJeztah · commit a0213573b217 · 2022-03-24T03:25:09.000+01:00
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> (cherry picked from commit ee49c4d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git 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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func (c criService) ContainerStats(ctx context.Context, in runtime.ContainerSt`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`cs, err := c.containerMetrics(cntr.Metadata, resp.Metrics[0])`
`44`		`- if err != nil {`
	`44`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (stats unimplemented)`
`45`	`45`	`return nil, fmt.Errorf("failed to decode container metrics: %w", err)`
`46`	`46`	`}`
`47`	`47`	`return &runtime.ContainerStatsResponse{Stats: cs}, nil`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func (c *criService) toCRIContainerStats(`
`58`	`58`	`containerStats := new(runtime.ListContainerStatsResponse)`
`59`	`59`	`for _, cntr := range containers {`
`60`	`60`	`cs, err := c.containerMetrics(cntr.Metadata, statsMap[cntr.ID])`
`61`		`- if err != nil {`
	`61`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (metrics unimplemented)`
`62`	`62`	`return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)`
`63`	`63`	`}`
`64`	`64`	`containerStats.Stats = append(containerStats.Stats, cs)`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,12 @@ func (c *criService) PodSandboxStats(`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`metrics, err := metricsForSandbox(sandbox)`
`37`		`- if err != nil {`
	`37`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)`
`38`	`38`	`return nil, fmt.Errorf("failed getting metrics for sandbox %s: %w", r.GetPodSandboxId(), err)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`podSandboxStats, err := c.podSandboxStats(ctx, sandbox, metrics)`
`42`		`-`
`43`		`- if err != nil {`
	`42`	`+ if err != nil { //nolint:staticcheck // Ignore SA4023 as some platforms always return nil (unimplemented metrics)`
`44`	`43`	`return nil, fmt.Errorf("failed to decode pod sandbox metrics %s: %w", r.GetPodSandboxId(), err)`
`45`	`44`	`}`
`46`	`45`