Skip to content

Commit 3bf7667

Browse files
committed
error-code
Signed-off-by: Sameer Shaikh <sameer.shaikh@ibm.com>
1 parent c09c46d commit 3bf7667

12 files changed

+10
-46
lines changed

common/vpcclient/vpcfilevolume/create_file_share_target.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@ func (vs *FileShareService) CreateFileShareTarget(fileShareTargetRequest *models
4949

5050
req := request.PathParameter(shareIDParam, fileShareTargetRequest.ShareID)
5151

52-
resp, err := req.JSONBody(fileShareTargetRequest).JSONSuccess(&shareTarget).JSONError(&apiErr).Invoke()
52+
_, err := req.JSONBody(fileShareTargetRequest).JSONSuccess(&shareTarget).JSONError(&apiErr).Invoke()
5353
if err != nil {
54-
if len(apiErr.Errors) > 0 {
55-
apiErr.Errors[0].Status = resp.Status
56-
}
5754
return nil, err
5855
}
5956
ctxLogger.Info("Successfully created the file share target")

common/vpcclient/vpcfilevolume/delete_file_share.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,8 @@ func (vs *FileShareService) DeleteFileShare(shareID string, ctxLogger *zap.Logge
4444
request := vs.client.NewRequest(operation)
4545
ctxLogger.Info("Equivalent curl command", zap.Reflect("URL", request.URL()), zap.Reflect("Operation", operation))
4646

47-
resp, err := request.PathParameter(shareIDParam, shareID).JSONError(&apiErr).Invoke()
47+
_, err := request.PathParameter(shareIDParam, shareID).JSONError(&apiErr).Invoke()
4848
if err != nil {
49-
if len(apiErr.Errors) > 0 {
50-
apiErr.Errors[0].Status = resp.Status
51-
}
5249
return err
5350
}
5451

common/vpcclient/vpcfilevolume/delete_file_share_target.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ func (vs *FileShareService) DeleteFileShareTarget(deleteShareTargetRequest *mode
5151
if resp != nil && resp.StatusCode == http.StatusNotFound {
5252
// file share target is deleted. So do not want to retry
5353
ctxLogger.Info("Exit DeleteFileShareTarget", zap.Any("resp", resp.StatusCode), zap.Error(err), zap.Error(apiErr))
54-
if len(apiErr.Errors) > 0 {
55-
apiErr.Errors[0].Status = resp.Status
56-
}
5754
return resp, apiErr
5855
}
5956
}

common/vpcclient/vpcfilevolume/expand_volume.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,8 @@ func (vs *FileShareService) ExpandVolume(shareID string, volumeTemplate *models.
4545
request := vs.client.NewRequest(operation)
4646
req := request.PathParameter(shareIDParam, shareID)
4747
ctxLogger.Info("Equivalent curl command and payload details", zap.Reflect("URL", req.URL()), zap.Reflect("Payload", volumeTemplate), zap.Reflect("Operation", operation))
48-
resp, err := req.JSONBody(volumeTemplate).JSONSuccess(&share).JSONError(&apiErr).Invoke()
48+
_, err := req.JSONBody(volumeTemplate).JSONSuccess(&share).JSONError(&apiErr).Invoke()
4949
if err != nil {
50-
if len(apiErr.Errors) > 0 {
51-
apiErr.Errors[0].Status = resp.Status
52-
}
5350
ctxLogger.Info("Exit Backend ExpandVolume due to error.", zap.Reflect("Error: ", err))
5451
return nil, err
5552
}

common/vpcclient/vpcfilevolume/get_file_share.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ func (vs *FileShareService) GetFileShare(shareID string, ctxLogger *zap.Logger)
4646
ctxLogger.Info("Equivalent curl command", zap.Reflect("URL", request.URL()), zap.Reflect("Operation", operation))
4747

4848
req := request.PathParameter(shareIDParam, shareID)
49-
resp, err := req.JSONSuccess(&share).JSONError(&apiErr).Invoke()
49+
_, err := req.JSONSuccess(&share).JSONError(&apiErr).Invoke()
5050
if err != nil {
51-
if len(apiErr.Errors) > 0 {
52-
apiErr.Errors[0].Status = resp.Status
53-
}
5451
return nil, err
5552
}
5653

common/vpcclient/vpcfilevolume/get_file_share_etag.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ func (vs *FileShareService) GetFileShareEtag(shareID string, ctxLogger *zap.Logg
4848
req := request.PathParameter(shareIDParam, shareID)
4949
resp, err := req.JSONSuccess(&share).JSONError(&apiErr).Invoke()
5050
if err != nil {
51-
if len(apiErr.Errors) > 0 {
52-
apiErr.Errors[0].Status = resp.Status
53-
}
5451
return nil, "", err
5552
}
5653

common/vpcclient/vpcfilevolume/get_file_share_target.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,8 @@ func (vs *FileShareService) GetFileShareTarget(shareID string, targetID string,
4747

4848
req := request.PathParameter(shareIDParam, shareID).PathParameter(shareTargetIDParam, targetID)
4949

50-
resp, err := req.JSONSuccess(&shareTarget).JSONError(&apiErr).Invoke()
50+
_, err := req.JSONSuccess(&shareTarget).JSONError(&apiErr).Invoke()
5151
if err != nil {
52-
if len(apiErr.Errors) > 0 {
53-
apiErr.Errors[0].Status = resp.Status
54-
}
5552
return nil, err
5653
}
5754

common/vpcclient/vpcfilevolume/list_file_share_targets.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,8 @@ func (vs *FileShareService) ListFileShareTargets(shareID string, filters *models
5555
}
5656
}
5757

58-
resp, err := req.Invoke()
58+
_, err := req.Invoke()
5959
if err != nil {
60-
if len(apiErr.Errors) > 0 {
61-
apiErr.Errors[0].Status = resp.Status
62-
}
6360
return nil, err
6461
}
6562

common/vpcclient/vpcfilevolume/list_file_shares.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ func (vs *FileShareService) ListFileShares(limit int, start string, filters *mod
6565
}
6666
}
6767

68-
resp, err := req.Invoke()
68+
_, err := req.Invoke()
6969
if err != nil {
70-
if len(apiErr.Errors) > 0 {
71-
apiErr.Errors[0].Status = resp.Status
72-
}
7370
return nil, err
7471
}
7572

common/vpcclient/vpcfilevolume/list_security_groups.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,8 @@ func (vs *FileShareService) ListSecurityGroups(limit int, start string, filters
6767

6868
ctxLogger.Info("Equivalent curl command", zap.Reflect("URL", req.URL()))
6969

70-
resp, err := req.Invoke()
70+
_, err := req.Invoke()
7171
if err != nil {
72-
if len(apiErr.Errors) > 0 {
73-
apiErr.Errors[0].Status = resp.Status
74-
}
7572
return nil, err
7673
}
7774

0 commit comments

Comments
 (0)