Skip to content

fix: grpc error handling for TemplateChart req #4980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 25, 2024
Merged

fix: grpc error handling for TemplateChart req #4980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76b57d3
grpc error handling
ashishdevtron Apr 19, 2024
77a0d58
fix
ashishdevtron Apr 19, 2024
990ed38
Merge branch 'main' into template-chart-fix
ashishdevtron Apr 19, 2024
fbee542
Merge branch 'main' into template-chart-fix
ashishdevtron Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion api/helm-app/service/HelmAppService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,9 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart
if err != nil {
impl.logger.Errorw("error in templating chart", "err", err)
clientErrCode, errMsg := util.GetClientDetailedError(err)
if clientErrCode.IsInvalidArgumentCode() {
if clientErrCode.IsFailedPreconditionCode() {
return nil, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
} else if clientErrCode.IsInvalidArgumentCode() {
return nil, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
}
return nil, err
Expand All @@ -979,6 +981,12 @@ func (impl *HelmAppServiceImpl) GetNotes(ctx context.Context, request *gRPC.Inst
response, err := impl.helmAppClient.GetNotes(ctx, request)
if err != nil {
impl.logger.Errorw("error in fetching chart", "err", err)
clientErrCode, errMsg := util.GetClientDetailedError(err)
if clientErrCode.IsFailedPreconditionCode() {
return notesTxt, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
} else if clientErrCode.IsInvalidArgumentCode() {
return notesTxt, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
}
return notesTxt, err
}
notesTxt = response.Notes
Expand Down
4 changes: 3 additions & 1 deletion pkg/generateManifest/DeployementTemplateService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,9 @@ func (impl DeploymentTemplateServiceImpl) GenerateManifest(ctx context.Context,
if err != nil {
impl.Logger.Errorw("error in templating chart", "err", err)
clientErrCode, errMsg := util.GetClientDetailedError(err)
if clientErrCode.IsInvalidArgumentCode() {
if clientErrCode.IsFailedPreconditionCode() {
return nil, &util.ApiError{HttpStatusCode: http.StatusUnprocessableEntity, Code: strconv.Itoa(http.StatusUnprocessableEntity), InternalMessage: errMsg, UserMessage: errMsg}
} else if clientErrCode.IsInvalidArgumentCode() {
return nil, &util.ApiError{HttpStatusCode: http.StatusConflict, Code: strconv.Itoa(http.StatusConflict), InternalMessage: errMsg, UserMessage: errMsg}
}
return nil, err
Expand Down