devtron-labs
diff --git a/‎Dockerfile
+2-1 b/‎Dockerfile
+2-1
diff --git a/‎DockerfileEA
+2-1 b/‎DockerfileEA
+2-1
diff --git a/‎api/argoApplication/ArgoApplicationRestHandler.go
+6-3 b/‎api/argoApplication/ArgoApplicationRestHandler.go
+6-3
diff --git a/‎api/argoApplication/wire_argoApplication.go
+4 b/‎api/argoApplication/wire_argoApplication.go
+4
diff --git a/‎api/helm-app/HelmAppRestHandler.go
+9-2 b/‎api/helm-app/HelmAppRestHandler.go
+9-2
diff --git a/‎api/k8s/application/k8sApplicationRestHandler.go
+37-36 b/‎api/k8s/application/k8sApplicationRestHandler.go
+37-36
diff --git a/‎api/restHandler/GlobalPluginRestHandler.go
+67 b/‎api/restHandler/GlobalPluginRestHandler.go
+67
diff --git a/‎api/router/GlobalPluginRouter.go
+4-1 b/‎api/router/GlobalPluginRouter.go
+4-1
diff --git a/‎vendor/github.com/argoproj/argo-cd/assets/badge.svg ‎argocd-assets/badge.svg b/‎vendor/github.com/argoproj/argo-cd/assets/badge.svg ‎argocd-assets/badge.svg
diff --git a/‎vendor/github.com/argoproj/argo-cd/assets/builtin-policy.csv ‎argocd-assets/builtin-policy.csv b/‎vendor/github.com/argoproj/argo-cd/assets/builtin-policy.csv ‎argocd-assets/builtin-policy.csv
diff --git a/‎vendor/github.com/argoproj/argo-cd/assets/model.conf ‎argocd-assets/model.conf b/‎vendor/github.com/argoproj/argo-cd/assets/model.conf ‎argocd-assets/model.conf
diff --git a/‎vendor/github.com/argoproj/argo-cd/assets/swagger.json ‎argocd-assets/swagger.json b/‎vendor/github.com/argoproj/argo-cd/assets/swagger.json ‎argocd-assets/swagger.json
@@ -17,7 +17,8 @@ RUN apt clean autoclean
 RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/devtron .
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
 
@@ -17,7 +17,8 @@ RUN apt autoremove -y && rm -rf /var/lib/apt/lists/*
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/auth_model.conf .
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/cmd/external-app/devtron-ea .
 
-COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+#COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
+COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/argocd-assets/ /go/src/github.com/devtron-labs/devtron/vendor/github.com/argoproj/argo-cd/assets
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/devtron-reference-helm-charts scripts/devtron-reference-helm-charts
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/sql scripts/sql
 COPY --from=build-env  /go/src/github.com/devtron-labs/devtron/scripts/casbin scripts/casbin
 
@@ -20,6 +20,7 @@ import (
 	"errors"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"go.uber.org/zap"
 	"net/http"
@@ -34,14 +35,16 @@ type ArgoApplicationRestHandler interface {
 
 type ArgoApplicationRestHandlerImpl struct {
 	argoApplicationService argoApplication.ArgoApplicationService
+	readService            read.ArgoApplicationReadService
 	logger                 *zap.SugaredLogger
 	enforcer               casbin.Enforcer
 }
 
 func NewArgoApplicationRestHandlerImpl(argoApplicationService argoApplication.ArgoApplicationService,
-	logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
+	readService read.ArgoApplicationReadService, logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
 	return &ArgoApplicationRestHandlerImpl{
 		argoApplicationService: argoApplicationService,
+		readService:            readService,
 		logger:                 logger,
 		enforcer:               enforcer,
 	}
@@ -101,9 +104,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 			return
 		}
 	}
-	resp, err := handler.argoApplicationService.GetAppDetail(resourceName, namespace, clusterId)
+	resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
 	if err != nil {
-		handler.logger.Errorw("error in listing all argo applications", "err", err, "resourceName", resourceName, "clusterId", clusterId)
+		handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
 
@@ -18,10 +18,14 @@ package argoApplication
 
 import (
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/google/wire"
 )
 
 var ArgoApplicationWireSet = wire.NewSet(
+	read.NewArgoApplicationReadServiceImpl,
+	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
+
 	argoApplication.NewArgoApplicationServiceImpl,
 	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
 
 
@@ -25,9 +25,11 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
 	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 +146,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
@@ -226,7 +233,7 @@ func (handler *HelmAppRestHandlerImpl) handleFluxApplicationHibernate(r *http.Re
 	return handler.fluxApplication.HibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)
 }
 func (handler *HelmAppRestHandlerImpl) handleArgoApplicationHibernate(r *http.Request, token string, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error) {
-	appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)
+	appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)
 	if err != nil {
 		return nil, err
 	}
@@ -310,7 +317,7 @@ func (handler *HelmAppRestHandlerImpl) handleFluxApplicationUnHibernate(r *http.
 	return handler.fluxApplication.UnHibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)
 }
 func (handler *HelmAppRestHandlerImpl) handleArgoApplicationUnHibernate(r *http.Request, token string, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error) {
-	appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)
+	appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)
 	if err != nil {
 		return nil, err
 	}
 
@@ -33,7 +33,8 @@ import (
 	client "github.com/devtron-labs/devtron/api/helm-app/service"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	util2 "github.com/devtron-labs/devtron/internal/util"
-	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/cluster"
@@ -81,39 +82,39 @@ type K8sApplicationRestHandler interface {
 }
 
 type K8sApplicationRestHandlerImpl struct {
-	logger                 *zap.SugaredLogger
-	k8sApplicationService  application2.K8sApplicationService
-	pump                   connector.Pump
-	terminalSessionHandler terminal.TerminalSessionHandler
-	enforcer               casbin.Enforcer
-	validator              *validator.Validate
-	enforcerUtil           rbac.EnforcerUtil
-	enforcerUtilHelm       rbac.EnforcerUtilHelm
-	helmAppService         client.HelmAppService
-	userService            user.UserService
-	k8sCommonService       k8s.K8sCommonService
-	terminalEnvVariables   *util.TerminalEnvVariables
-	fluxAppService         fluxApplication.FluxApplicationService
-	argoApplication        argoApplication.ArgoApplicationService
+	logger                     *zap.SugaredLogger
+	k8sApplicationService      application2.K8sApplicationService
+	pump                       connector.Pump
+	terminalSessionHandler     terminal.TerminalSessionHandler
+	enforcer                   casbin.Enforcer
+	validator                  *validator.Validate
+	enforcerUtil               rbac.EnforcerUtil
+	enforcerUtilHelm           rbac.EnforcerUtilHelm
+	helmAppService             client.HelmAppService
+	userService                user.UserService
+	k8sCommonService           k8s.K8sCommonService
+	terminalEnvVariables       *util.TerminalEnvVariables
+	fluxAppService             fluxApplication.FluxApplicationService
+	argoApplicationReadService read.ArgoApplicationReadService
 }
 
-func NewK8sApplicationRestHandlerImpl(logger *zap.SugaredLogger, k8sApplicationService application2.K8sApplicationService, pump connector.Pump, terminalSessionHandler terminal.TerminalSessionHandler, enforcer casbin.Enforcer, enforcerUtilHelm rbac.EnforcerUtilHelm, enforcerUtil rbac.EnforcerUtil, helmAppService client.HelmAppService, userService user.UserService, k8sCommonService k8s.K8sCommonService, validator *validator.Validate, envVariables *util.EnvironmentVariables, fluxAppService fluxApplication.FluxApplicationService, argoApplication argoApplication.ArgoApplicationService,
+func NewK8sApplicationRestHandlerImpl(logger *zap.SugaredLogger, k8sApplicationService application2.K8sApplicationService, pump connector.Pump, terminalSessionHandler terminal.TerminalSessionHandler, enforcer casbin.Enforcer, enforcerUtilHelm rbac.EnforcerUtilHelm, enforcerUtil rbac.EnforcerUtil, helmAppService client.HelmAppService, userService user.UserService, k8sCommonService k8s.K8sCommonService, validator *validator.Validate, envVariables *util.EnvironmentVariables, fluxAppService fluxApplication.FluxApplicationService, argoApplicationReadService read.ArgoApplicationReadService,
 ) *K8sApplicationRestHandlerImpl {
 	return &K8sApplicationRestHandlerImpl{
-		logger:                 logger,
-		k8sApplicationService:  k8sApplicationService,
-		pump:                   pump,
-		terminalSessionHandler: terminalSessionHandler,
-		enforcer:               enforcer,
-		validator:              validator,
-		enforcerUtilHelm:       enforcerUtilHelm,
-		enforcerUtil:           enforcerUtil,
-		helmAppService:         helmAppService,
-		userService:            userService,
-		k8sCommonService:       k8sCommonService,
-		terminalEnvVariables:   envVariables.TerminalEnvVariables,
-		fluxAppService:         fluxAppService,
-		argoApplication:        argoApplication,
+		logger:                     logger,
+		k8sApplicationService:      k8sApplicationService,
+		pump:                       pump,
+		terminalSessionHandler:     terminalSessionHandler,
+		enforcer:                   enforcer,
+		validator:                  validator,
+		enforcerUtilHelm:           enforcerUtilHelm,
+		enforcerUtil:               enforcerUtil,
+		helmAppService:             helmAppService,
+		userService:                userService,
+		k8sCommonService:           k8sCommonService,
+		terminalEnvVariables:       envVariables.TerminalEnvVariables,
+		fluxAppService:             fluxAppService,
+		argoApplicationReadService: argoApplicationReadService,
 	}
 }
 
@@ -289,7 +290,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		resourceTreeResponse = appDetail.ResourceTreeResponse
 
 	} else if appType == bean2.ArgoAppType {
-		appIdentifier, err := argoApplication.DecodeExternalArgoAppId(appIdString)
+		appIdentifier, err := helper.DecodeExternalArgoAppId(appIdString)
 		if err != nil {
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 			return
@@ -301,7 +302,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		}
 		//RBAC enforcer Ends
 
-		appDetail, err := handler.argoApplication.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
+		appDetail, err := handler.argoApplicationReadService.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
 		if err != nil {
 			apiError := clientErrors.ConvertToApiError(err)
 			if apiError != nil {
@@ -721,12 +722,12 @@ func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.Re
 		}
 		//RBAC enforcer ends here
 	} else if request.AppType == bean2.ArgoAppType && request.ExternalArgoApplicationName != "" {
-		appIdentifier, err := argoApplication.DecodeExternalArgoAppId(request.AppId)
+		appIdentifier, err := helper.DecodeExternalArgoAppId(request.AppId)
 		if err != nil {
 			handler.logger.Errorw(bean2.AppIdDecodingError, "err", err, "appIdentifier", request.AppIdentifier)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 		}
-		valid, err := handler.k8sApplicationService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)
+		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)
 		if err != nil || !valid {
 			handler.logger.Errorw("error in validating resource request", "err", err)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
@@ -1145,14 +1146,14 @@ func (handler *K8sApplicationRestHandlerImpl) verifyRbacForAppRequests(token str
 	envObject := ""
 	switch request.AppType {
 	case bean2.ArgoAppType:
-		argoAppIdentifier, err := argoApplication.DecodeExternalArgoAppId(request.AppId)
+		argoAppIdentifier, err := helper.DecodeExternalArgoAppId(request.AppId)
 		if err != nil {
 			handler.logger.Errorw("error in decoding appId", "err", err, "appId", request.AppId)
 			return false, err
 		}
 		request.ClusterId = argoAppIdentifier.ClusterId
 		request.ExternalArgoApplicationName = argoAppIdentifier.AppName
-		valid, err := handler.k8sApplicationService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)
+		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)
 		if err != nil || !valid {
 			handler.logger.Errorw("error in validating resource request", "err", err)
 			return false, err
 
@@ -35,6 +35,7 @@ import (
 
 type GlobalPluginRestHandler interface {
 	PatchPlugin(w http.ResponseWriter, r *http.Request)
+	CreatePlugin(w http.ResponseWriter, r *http.Request)
 
 	GetAllGlobalVariables(w http.ResponseWriter, r *http.Request)
 	ListAllPlugins(w http.ResponseWriter, r *http.Request)
@@ -46,6 +47,7 @@ type GlobalPluginRestHandler interface {
 	GetPluginDetailByIds(w http.ResponseWriter, r *http.Request)
 	GetAllUniqueTags(w http.ResponseWriter, r *http.Request)
 	MigratePluginData(w http.ResponseWriter, r *http.Request)
+	GetAllPluginMinData(w http.ResponseWriter, r *http.Request)
 }
 
 func NewGlobalPluginRestHandler(logger *zap.SugaredLogger, globalPluginService plugin.GlobalPluginService,
@@ -420,3 +422,68 @@ func (handler *GlobalPluginRestHandlerImpl) MigratePluginData(w http.ResponseWri
 	}
 	common.WriteJsonResp(w, nil, nil, http.StatusOK)
 }
+
+func (handler *GlobalPluginRestHandlerImpl) CreatePlugin(w http.ResponseWriter, r *http.Request) {
+	userId, err := handler.userService.GetLoggedInUser(r)
+	if userId == 0 || err != nil {
+		common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+		return
+	}
+	token := r.Header.Get("token")
+	appId, err := common.ExtractIntQueryParam(w, r, "appId", 0)
+	if err != nil {
+		return
+	}
+	ok, err := handler.IsUserAuthorized(token, appId)
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	if !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+		return
+	}
+	decoder := json.NewDecoder(r.Body)
+	var pluginDataDto bean.PluginParentMetadataDto
+	err = decoder.Decode(&pluginDataDto)
+	if err != nil {
+		handler.logger.Errorw("request err, CreatePlugin", "error", err, "payload", pluginDataDto)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	handler.logger.Infow("request payload received for creating plugins", pluginDataDto, "userId", userId)
+
+	pluginVersionId, err := handler.globalPluginService.CreatePluginOrVersions(&pluginDataDto, userId)
+	if err != nil {
+		handler.logger.Errorw("service error, error in creating plugin", "pluginCreateRequestDto", pluginDataDto, "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+
+	common.WriteJsonResp(w, nil, bean.NewPluginMinDto().WithPluginVersionId(pluginVersionId), http.StatusOK)
+}
+
+func (handler *GlobalPluginRestHandlerImpl) GetAllPluginMinData(w http.ResponseWriter, r *http.Request) {
+	token := r.Header.Get("token")
+	appId, err := common.ExtractIntQueryParam(w, r, "appId", 0)
+	if err != nil {
+		return
+	}
+	ok, err := handler.IsUserAuthorized(token, appId)
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	if !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+		return
+	}
+
+	pluginDetail, err := handler.globalPluginService.GetAllPluginMinData()
+	if err != nil {
+		handler.logger.Errorw("error in getting all unique tags", "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, nil, pluginDetail, http.StatusOK)
+}
@@ -41,7 +41,8 @@ type GlobalPluginRouterImpl struct {
 func (impl *GlobalPluginRouterImpl) initGlobalPluginRouter(globalPluginRouter *mux.Router) {
 	globalPluginRouter.Path("/migrate").
 		HandlerFunc(impl.globalPluginRestHandler.MigratePluginData).Methods("PUT")
-
+	globalPluginRouter.Path("/create").
+		HandlerFunc(impl.globalPluginRestHandler.CreatePlugin).Methods("POST")
 	// versioning impact handling to be done for below apis,
 	globalPluginRouter.Path("").
 		HandlerFunc(impl.globalPluginRestHandler.PatchPlugin).Methods("POST")
@@ -68,5 +69,7 @@ func (impl *GlobalPluginRouterImpl) initGlobalPluginRouter(globalPluginRouter *m
 
 	globalPluginRouter.Path("/list/tags").
 		HandlerFunc(impl.globalPluginRestHandler.GetAllUniqueTags).Methods("GET")
+	globalPluginRouter.Path("/list/v2/min").
+		HandlerFunc(impl.globalPluginRestHandler.GetAllPluginMinData).Methods("GET")
 
 }