Merge pull request #1721 from k8s-infra-cherrypick-robot/cherry-pick-1710-to-release-1.13

k8s-ci-robot · web-flow · commit 9675b360f5ac · 2024-05-23T15:34:32.000-07:00
[release-1.13] Reassign error returned from validateStoragePools so InvalidArgument is recorded
diff --git a/pkg/gce-pd-csi-driver/controller.go b/pkg/gce-pd-csi-driver/controller.go
@@ -290,7 +290,9 @@ func (gceCS *GCEControllerServer) CreateVolume(ctx context.Context, req *csi.Cre
 
 	err = validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject())
 	if err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)
+		// Reassign error so that all errors are reported as InvalidArgument to RecordOperationErrorMetrics.
+		err = status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)
+		return nil, err
 	}
 
 	// Verify that the regional availability class is only used on regional disks.

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,9 @@ func (gceCS GCEControllerServer) CreateVolume(ctx context.Context, req csi.Cre`
`290`	`290`
`291`	`291`	`err = validateStoragePools(req, params, gceCS.CloudProvider.GetDefaultProject())`
`292`	`292`	`if err != nil {`
`293`		`- return nil, status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)`
	`293`	`+ // Reassign error so that all errors are reported as InvalidArgument to RecordOperationErrorMetrics.`
	`294`	`+ err = status.Errorf(codes.InvalidArgument, "CreateVolume failed to validate storage pools: %v", err)`
	`295`	`+ return nil, err`
`294`	`296`	`}`
`295`	`297`
`296`	`298`	`// Verify that the regional availability class is only used on regional disks.`