feat: deployment history release not found err handling (#3811)

devtron-labs · Sep 12, 2023 · a659dd7 · a659dd7
1 parent d81b772
commit a659dd7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/api/helm-app/applicationClient.go b/api/helm-app/applicationClient.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"fmt"
 	"github.com/caarlos0/env"
+	"github.com/devtron-labs/devtron/internal/constants"
+	"github.com/devtron-labs/devtron/internal/util"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -156,6 +158,13 @@ func (impl *HelmAppClientImpl) GetDeploymentHistory(ctx context.Context, in *App
 	}
 	history, err := applicationClient.GetDeploymentHistory(ctx, in)
 	if err != nil {
+		if util.GetGRPCErrorDetailedMessage(err) == ErrReleaseNotFound {
+			err = &util.ApiError{
+				Code:            constants.HelmReleaseNotFound,
+				InternalMessage: ErrReleaseNotFound,
+				UserMessage:     fmt.Sprintf("no release found with release name '%s'", in.ReleaseName),
+			}
+		}
 		return nil, err
 	}
 	return history, nil

diff --git a/api/helm-app/bean.go b/api/helm-app/bean.go
@@ -8,6 +8,7 @@ const (
 	SOURCE_HELM_APP          SourceAppType = "helm-app"
 	SOURCE_EXTERNAL_HELM_APP SourceAppType = "external-helm-app"
 	SOURCE_UNKNOWN           SourceAppType = "unknown"
+	ErrReleaseNotFound       string        = "release: not found"
 )
 
 type SourceAppType string

diff --git a/internal/constants/InternalErrorCode.go b/internal/constants/InternalErrorCode.go
@@ -75,6 +75,7 @@ const (
 	UserUpdateFetchRoleFailed            string = "6008"
 
 	AppDetailResourceTreeNotFound string = "7000"
+	HelmReleaseNotFound           string = "7001"
 
 	CasbinPolicyNotCreated string = "8000"
 

diff --git a/internal/util/ErrorUtil.go b/internal/util/ErrorUtil.go
@@ -20,6 +20,7 @@ package util
 import (
 	"fmt"
 	"github.com/go-pg/pg"
+	"google.golang.org/grpc/status"
 )
 
 type ApiError struct {
@@ -39,11 +40,18 @@ func (e *ApiError) ErrorfInternal(format string, a ...interface{}) error {
 	return &ApiError{InternalMessage: fmt.Sprintf(format, a...)}
 }
 
-//default user message will be set
+// default user message will be set
 func (e ApiError) ErrorfUser(format string, a ...interface{}) error {
 	return &ApiError{InternalMessage: fmt.Sprintf(format, a...)}
 }
 
 func IsErrNoRows(err error) bool {
 	return pg.ErrNoRows == err
 }
+
+func GetGRPCErrorDetailedMessage(err error) string {
+	if errStatus, ok := status.FromError(err); ok {
+		return errStatus.Message()
+	}
+	return ""
+}