Remove short variable declaration from validateStoragePools to allow for correct error to be passed to RecordOperationErrorMetrics

amacaskill · k8s-infra-cherrypick-robot · commit fe2f25e33b37 · 2024-04-18T21:58:48.000Z
diff --git a/pkg/gce-pd-csi-driver/controller.go b/pkg/gce-pd-csi-driver/controller.go
@@ -288,7 +288,8 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 		gceAPIVersion = gce.GCEAPIVersionBeta
 	}
 
-	if err := validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject()); err != nil {
+	err = validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject())
+	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,8 @@ func (gceCS GCEControllerServer) CreateVolume(ctx context.Context, req csi.Cre`
`288`	`288`	`gceAPIVersion = gce.GCEAPIVersionBeta`
`289`	`289`	`}`
`290`	`290`
`291`		`- if err := validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject()); err != nil {`
	`291`	`+ err = validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject())`
	`292`	`+ if err != nil {`
`292`	`293`	`return nil, status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)`
`293`	`294`	`}`
`294`	`295`