Merge pull request #2803 from ElijahQuinones/returnCode

Adjust error codes

Author: k8s-ci-robot

pkg/cloud/cloud.go

@@ -168,6 +168,9 @@ var (
 	// name, but different size, is found.
 	ErrDiskExistsDiffSize = errors.New("there is already a disk with same name and different size")
 
+	// ErrSourceNotFound is returned when a volume's source is not found when provisioning using a source (snapshot or volume).
+	ErrSourceNotFound = errors.New("source was not found")
+
 	// ErrNotFound is returned when a resource is not found.
 	ErrNotFound = errors.New("resource was not found")
 
@@ -745,7 +748,9 @@ func (c *cloud) CreateDisk(ctx context.Context, volumeName string, diskOptions *
 	if err != nil {
 		switch {
 		case isAWSErrorSnapshotNotFound(err):
-			return nil, ErrNotFound
+			return nil, ErrSourceNotFound
+		case isAWSErrorVolumeNotFound(err):
+			return nil, ErrSourceNotFound
 		case isAWSErrorIdempotentParameterMismatch(err):
 			nextTokenNumber := 2
 			if tokenNumber, ok := c.latestClientTokens.Get(volumeName); ok {

pkg/cloud/cloud_test.go

@@ -1287,7 +1287,7 @@ func TestCreateDisk(t *testing.T) {
 				AvailabilityZone: expZone,
 			},
 			expCreateVolumeInput: &ec2.CreateVolumeInput{},
-			expErr:               ErrNotFound,
+			expErr:               ErrSourceNotFound,
 			expCreateVolumeErr: &smithy.GenericAPIError{
 				Code:    "InvalidSnapshot.NotFound",
 				Message: "Snapshot not found",

pkg/driver/controller.go

@@ -405,16 +405,14 @@ func (d *ControllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
 	if err != nil {
 		var errCode codes.Code
 		switch {
-		case errors.Is(err, cloud.ErrNotFound):
-			errCode = codes.NotFound
 		case errors.Is(err, cloud.ErrIdempotentParameterMismatch), errors.Is(err, cloud.ErrAlreadyExists):
 			errCode = codes.AlreadyExists
-		case errors.Is(err, cloud.ErrLimitExceeded):
-			errCode = codes.ResourceExhausted
 		case errors.Is(err, cloud.ErrInvalidArgument):
 			errCode = codes.InvalidArgument
+		case errors.Is(err, cloud.ErrSourceNotFound):
+			errCode = codes.NotFound
 		default:
-			errCode = codes.Internal
+			errCode = codes.Aborted
 		}
 		return nil, status.Errorf(errCode, "Could not create volume %q: %v", volName, err)
 	}

pkg/driver/controller_test.go

@@ -2445,62 +2445,7 @@ func TestCreateVolume(t *testing.T) {
 				}
 			},
 		},
-		{
-			name: "returns ResourceExhausted with MaxIOPSLimitExceeded error",
-			testFunc: func(t *testing.T) {
-				t.Helper()
-				req := &csi.CreateVolumeRequest{
-					Name:               "vol-test",
-					CapacityRange:      stdCapRange,
-					VolumeCapabilities: stdVolCap,
-				}
-
-				ctx := t.Context()
-
-				mockCtl := gomock.NewController(t)
-				defer mockCtl.Finish()
 
-				mockCloud := cloud.NewMockCloud(mockCtl)
-				mockCloud.EXPECT().CreateDisk(gomock.Eq(ctx), gomock.Eq(req.GetName()), gomock.Any()).Return(nil, cloud.ErrLimitExceeded)
-
-				awsDriver := ControllerService{
-					cloud:    mockCloud,
-					inFlight: internal.NewInFlight(),
-					options:  &Options{},
-				}
-
-				_, err := awsDriver.CreateVolume(ctx, req)
-				checkExpectedErrorCode(t, err, codes.ResourceExhausted)
-			},
-		},
-		{
-			name: "returns ResourceExhausted with VolumeLimitExceeded error",
-			testFunc: func(t *testing.T) {
-				t.Helper()
-				req := &csi.CreateVolumeRequest{
-					Name:               "vol-test",
-					CapacityRange:      stdCapRange,
-					VolumeCapabilities: stdVolCap,
-				}
-
-				ctx := t.Context()
-
-				mockCtl := gomock.NewController(t)
-				defer mockCtl.Finish()
-
-				mockCloud := cloud.NewMockCloud(mockCtl)
-				mockCloud.EXPECT().CreateDisk(gomock.Eq(ctx), gomock.Eq(req.GetName()), gomock.Any()).Return(nil, cloud.ErrLimitExceeded)
-
-				awsDriver := ControllerService{
-					cloud:    mockCloud,
-					inFlight: internal.NewInFlight(),
-					options:  &Options{},
-				}
-
-				_, err := awsDriver.CreateVolume(ctx, req)
-				checkExpectedErrorCode(t, err, codes.ResourceExhausted)
-			},
-		},
 		{
 			name: "success user tags override cluster tags",
 			testFunc: func(t *testing.T) {

tests/sanity/fake_sanity_cloud.go

@@ -55,7 +55,7 @@ func (d *fakeCloud) CreateDisk(ctx context.Context, volumeID string, diskOptions
 
 	if diskOptions.SnapshotID != "" {
 		if _, exists := d.snapshots[diskOptions.SnapshotID]; !exists {
-			return nil, cloud.ErrNotFound
+			return nil, cloud.ErrSourceNotFound
 		}
 		newDisk := &cloud.Disk{
 			SnapshotID:       diskOptions.SnapshotID,