@@ -21,6 +21,7 @@ import (
2121 "context"
2222 "encoding/json"
2323 "fmt"
24+ service2 "github.com/devtron-labs/devtron/api/helm-app/service"
2425 "net/http"
2526 "strconv"
2627 "time"
@@ -31,7 +32,6 @@ import (
3132 "github.com/devtron-labs/devtron/api/restHandler/common"
3233 "github.com/devtron-labs/devtron/internal/util"
3334 appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
34- appStoreDeploymentCommon "github.com/devtron-labs/devtron/pkg/appStore/deployment/common"
3535 "github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
3636 "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
3737 "github.com/devtron-labs/devtron/pkg/auth/user"
@@ -51,35 +51,33 @@ type CommonDeploymentRestHandler interface {
5151}
5252
5353type CommonDeploymentRestHandlerImpl struct {
54- Logger * zap.SugaredLogger
55- userAuthService user.UserService
56- enforcer casbin.Enforcer
57- enforcerUtil rbac.EnforcerUtil
58- enforcerUtilHelm rbac.EnforcerUtilHelm
59- appStoreDeploymentService service.AppStoreDeploymentService
60- appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
61- validator * validator.Validate
62- helmAppService client.HelmAppService
63- helmAppRestHandler client.HelmAppRestHandler
64- argoUserService argo.ArgoUserService
54+ Logger * zap.SugaredLogger
55+ userAuthService user.UserService
56+ enforcer casbin.Enforcer
57+ enforcerUtil rbac.EnforcerUtil
58+ enforcerUtilHelm rbac.EnforcerUtilHelm
59+ appStoreDeploymentService service.AppStoreDeploymentService
60+ validator * validator.Validate
61+ helmAppService service2.HelmAppService
62+ helmAppRestHandler client.HelmAppRestHandler
63+ argoUserService argo.ArgoUserService
6564}
6665
6766func NewCommonDeploymentRestHandlerImpl (Logger * zap.SugaredLogger , userAuthService user.UserService ,
6867 enforcer casbin.Enforcer , enforcerUtil rbac.EnforcerUtil , enforcerUtilHelm rbac.EnforcerUtilHelm , appStoreDeploymentService service.AppStoreDeploymentService ,
69- validator * validator.Validate , helmAppService client .HelmAppService , appStoreDeploymentServiceC appStoreDeploymentCommon. AppStoreDeploymentCommonService ,
68+ validator * validator.Validate , helmAppService service2 .HelmAppService ,
7069 helmAppRestHandler client.HelmAppRestHandler , argoUserService argo.ArgoUserService ) * CommonDeploymentRestHandlerImpl {
7170 return & CommonDeploymentRestHandlerImpl {
72- Logger : Logger ,
73- userAuthService : userAuthService ,
74- enforcer : enforcer ,
75- enforcerUtil : enforcerUtil ,
76- enforcerUtilHelm : enforcerUtilHelm ,
77- appStoreDeploymentService : appStoreDeploymentService ,
78- validator : validator ,
79- helmAppService : helmAppService ,
80- appStoreDeploymentServiceC : appStoreDeploymentServiceC ,
81- helmAppRestHandler : helmAppRestHandler ,
82- argoUserService : argoUserService ,
71+ Logger : Logger ,
72+ userAuthService : userAuthService ,
73+ enforcer : enforcer ,
74+ enforcerUtil : enforcerUtil ,
75+ enforcerUtilHelm : enforcerUtilHelm ,
76+ appStoreDeploymentService : appStoreDeploymentService ,
77+ validator : validator ,
78+ helmAppService : helmAppService ,
79+ helmAppRestHandler : helmAppRestHandler ,
80+ argoUserService : argoUserService ,
8381 }
8482}
8583func (handler * CommonDeploymentRestHandlerImpl ) getAppOfferingMode (installedAppId string , appId string ) (string , * appStoreBean.InstallAppVersionDTO , error ) {
@@ -91,9 +89,9 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
9189 err = & util.ApiError {HttpStatusCode : http .StatusBadRequest , UserMessage : "invalid app id" }
9290 return appOfferingMode , installedAppDto , err
9391 }
94- installedAppDto , err = handler .appStoreDeploymentServiceC .GetInstalledAppByClusterNamespaceAndName (appIdentifier .ClusterId , appIdentifier .Namespace , appIdentifier .ReleaseName )
92+ installedAppDto , err = handler .appStoreDeploymentService .GetInstalledAppByClusterNamespaceAndName (appIdentifier .ClusterId , appIdentifier .Namespace , appIdentifier .ReleaseName )
9593 if err != nil {
96- err = & util.ApiError {HttpStatusCode : http .StatusInternalServerError , UserMessage : "unable to find app in database" }
94+ err = & util.ApiError {HttpStatusCode : http .StatusBadRequest , UserMessage : "unable to find app in database" }
9795 return appOfferingMode , installedAppDto , err
9896 }
9997 // this is the case when hyperion apps does not linked yet
@@ -117,9 +115,9 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
117115 err = & util.ApiError {HttpStatusCode : http .StatusBadRequest , UserMessage : "invalid installed app id" }
118116 return appOfferingMode , installedAppDto , err
119117 }
120- installedAppDto , err = handler .appStoreDeploymentServiceC .GetInstalledAppByInstalledAppId (installedAppId )
118+ installedAppDto , err = handler .appStoreDeploymentService .GetInstalledAppByInstalledAppId (installedAppId )
121119 if err != nil {
122- err = & util.ApiError {HttpStatusCode : http .StatusInternalServerError , UserMessage : "unable to find app in database" }
120+ err = & util.ApiError {HttpStatusCode : http .StatusBadRequest , UserMessage : "unable to find app in database" }
123121 return appOfferingMode , installedAppDto , err
124122 }
125123 } else {
0 commit comments