From e436b56ea03b102444fa720bd41ad0309921049f Mon Sep 17 00:00:00 2001 From: Admin Date: Tue, 3 Sep 2024 17:02:43 +0530 Subject: [PATCH] handled the release not found case for app detail of external app --- api/helm-app/HelmAppRestHandler.go | 6 ++++++ cmd/external-app/wire_gen.go | 2 +- pkg/pipeline/AppDeploymentTypeChangeManager.go | 2 +- pkg/pipeline/PipelineBuilder.go | 2 +- wire_gen.go | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/helm-app/HelmAppRestHandler.go b/api/helm-app/HelmAppRestHandler.go index 059ce2ad9d..9a46413f69 100644 --- a/api/helm-app/HelmAppRestHandler.go +++ b/api/helm-app/HelmAppRestHandler.go @@ -28,6 +28,7 @@ import ( clientErrors "github.com/devtron-labs/devtron/pkg/errors" "github.com/devtron-labs/devtron/pkg/fluxApplication" bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean" + "github.com/devtron-labs/devtron/pkg/pipeline" "net/http" "strconv" "strings" @@ -144,6 +145,11 @@ func (handler *HelmAppRestHandlerImpl) GetApplicationDetail(w http.ResponseWrite //RBAC enforcer Ends appdetail, err := handler.helmAppService.GetApplicationDetail(context.Background(), appIdentifier) if err != nil { + + if pipeline.CheckAppReleaseNotExist(err) { + common.WriteJsonResp(w, err, nil, http.StatusNotFound) + return + } apiError := clientErrors.ConvertToApiError(err) if apiError != nil { err = apiError diff --git a/cmd/external-app/wire_gen.go b/cmd/external-app/wire_gen.go index 23dbbb8301..72533cab86 100644 --- a/cmd/external-app/wire_gen.go +++ b/cmd/external-app/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject diff --git a/pkg/pipeline/AppDeploymentTypeChangeManager.go b/pkg/pipeline/AppDeploymentTypeChangeManager.go index a6130a2357..714bc8720f 100644 --- a/pkg/pipeline/AppDeploymentTypeChangeManager.go +++ b/pkg/pipeline/AppDeploymentTypeChangeManager.go @@ -744,7 +744,7 @@ func (impl *AppDeploymentTypeChangeManagerImpl) fetchDeletedApp(ctx context.Cont impl.logger.Errorw("error in getting application detail", "err", err, "deploymentAppName", pipeline.DeploymentAppName) } - if err != nil && checkAppReleaseNotExist(err) { + if err != nil && CheckAppReleaseNotExist(err) { successfulPipelines = impl.appendToDeploymentChangeStatusList( successfulPipelines, pipeline, diff --git a/pkg/pipeline/PipelineBuilder.go b/pkg/pipeline/PipelineBuilder.go index 7fdc24e702..d47772e3c6 100644 --- a/pkg/pipeline/PipelineBuilder.go +++ b/pkg/pipeline/PipelineBuilder.go @@ -284,7 +284,7 @@ type PipelineStrategy struct { Default bool `json:"default"` } -func checkAppReleaseNotExist(err error) bool { +func CheckAppReleaseNotExist(err error) bool { // RELEASE_NOT_EXIST check for helm App and NOT_FOUND check for argo app return strings.Contains(err.Error(), bean.NOT_FOUND) || strings.Contains(err.Error(), bean.RELEASE_NOT_EXIST) } diff --git a/wire_gen.go b/wire_gen.go index 0bc013a9cf..5ff9a316f0 100644 --- a/wire_gen.go +++ b/wire_gen.go @@ -1,6 +1,6 @@ // Code generated by Wire. DO NOT EDIT. -//go:generate go run github.com/google/wire/cmd/wire +//go:generate go run -mod=mod github.com/google/wire/cmd/wire //go:build !wireinject // +build !wireinject