Skip to content

Commit 6b36ba2

Browse files
ashishdevtronkishan789dev
authored and
kishan789dev
committed
fix: grpc error handling for TemplateChart req (#4980)
* grpc error handling * fix
1 parent ec64adb commit 6b36ba2

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

api/helm-app/service/HelmAppService.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,9 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart
962962
if err != nil {
963963
impl.logger.Errorw("error in templating chart", "err", err)
964964
clientErrCode, errMsg := util.GetClientDetailedError(err)
965-
if clientErrCode.IsInvalidArgumentCode() {
965+
if clientErrCode.IsFailedPreconditionCode() {
966+
return nil, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
967+
} else if clientErrCode.IsInvalidArgumentCode() {
966968
return nil, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
967969
}
968970
return nil, err
@@ -979,6 +981,12 @@ func (impl *HelmAppServiceImpl) GetNotes(ctx context.Context, request *gRPC.Inst
979981
response, err := impl.helmAppClient.GetNotes(ctx, request)
980982
if err != nil {
981983
impl.logger.Errorw("error in fetching chart", "err", err)
984+
clientErrCode, errMsg := util.GetClientDetailedError(err)
985+
if clientErrCode.IsFailedPreconditionCode() {
986+
return notesTxt, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
987+
} else if clientErrCode.IsInvalidArgumentCode() {
988+
return notesTxt, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
989+
}
982990
return notesTxt, err
983991
}
984992
notesTxt = response.Notes

pkg/generateManifest/DeployementTemplateService.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,9 @@ func (impl DeploymentTemplateServiceImpl) GenerateManifest(ctx context.Context,
359359
if err != nil {
360360
impl.Logger.Errorw("error in templating chart", "err", err)
361361
clientErrCode, errMsg := util.GetClientDetailedError(err)
362-
if clientErrCode.IsInvalidArgumentCode() {
362+
if clientErrCode.IsFailedPreconditionCode() {
363+
return nil, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
364+
} else if clientErrCode.IsInvalidArgumentCode() {
363365
return nil, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
364366
}
365367
return nil, err

0 commit comments

Comments
 (0)