Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions api/appStore/AppStoreRouter.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ func (router AppStoreRouterImpl) Init(configRouter *mux.Router) {
configRouter.Path("/installed-app/detail").Queries("installed-app-id", "{installed-app-id}").Queries("env-id", "{env-id}").
HandlerFunc(router.deployRestHandler.FetchAppDetailsForInstalledApp).
Methods("GET")
configRouter.Path("/installed-app/resource/hibernate").Queries("installed-app-id", "{installed-app-id}").Queries("env-id", "{env-id}").
HandlerFunc(router.deployRestHandler.FetchResourceTreeForACDApp).
Methods("GET")
configRouter.Path("/installed-app/notes").Queries("installed-app-id", "{installed-app-id}").Queries("env-id", "{env-id}").
HandlerFunc(router.deployRestHandler.FetchNotesForArgoInstalledApp).
Methods("GET")
Expand Down
62 changes: 62 additions & 0 deletions api/appStore/InstalledAppRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ type InstalledAppRestHandler interface {
CheckAppExists(w http.ResponseWriter, r *http.Request)
DefaultComponentInstallation(w http.ResponseWriter, r *http.Request)
FetchAppDetailsForInstalledApp(w http.ResponseWriter, r *http.Request)
FetchResourceTreeForACDApp(w http.ResponseWriter, r *http.Request)
FetchNotesForArgoInstalledApp(w http.ResponseWriter, r *http.Request)
}

Expand Down Expand Up @@ -516,9 +517,70 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
common.WriteJsonResp(w, nil, appDetail, http.StatusOK)
}

func (handler *InstalledAppRestHandlerImpl) FetchResourceTreeForACDApp(w http.ResponseWriter, r *http.Request) {
userId, err := handler.userAuthService.GetLoggedInUser(r)
if userId == 0 || err != nil {
common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
return
}

vars := mux.Vars(r)
installedAppId, err := strconv.Atoi(vars["installed-app-id"])
if err != nil {
handler.Logger.Errorw("request err, FetchAppDetailsForInstalledApp", "err", err, "installedAppId", installedAppId)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
token := r.Header.Get("token")
envId, err := strconv.Atoi(vars["env-id"])
if err != nil {
handler.Logger.Errorw("request err, FetchAppDetailsForInstalledApp", "err", err, "installedAppId", installedAppId, "envId", envId)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
handler.Logger.Infow("request payload, FetchAppDetailsForInstalledApp, app store", "installedAppId", installedAppId, "envId", envId)

appDetail, err := handler.installedAppService.FindAppDetailsForAppstoreApplication(installedAppId, envId)
if err != nil {
handler.Logger.Errorw("service err, FetchAppDetailsForInstalledApp, app store", "err", err, "installedAppId", installedAppId, "envId", envId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
return
}

//rbac block starts from here
object, object2 := handler.enforcerUtil.GetHelmObjectByAppNameAndEnvId(appDetail.AppName, appDetail.EnvironmentId)

var ok bool

if object2 == "" {
ok = handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object)
} else {
ok = handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object) || handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object2)
}

if !ok {
common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
return
}
//rback block ends here
if len(appDetail.AppName) > 0 && len(appDetail.EnvironmentName) > 0 {
handler.fetchResourceTreeWithHibernateForACD(w, r, &appDetail)
} else {
appDetail.ResourceTree = map[string]interface{}{}
handler.Logger.Warnw("appName and envName not found - avoiding resource tree call", "app", appDetail.AppName, "env", appDetail.EnvironmentName)
}
common.WriteJsonResp(w, err, appDetail, http.StatusOK)
}

func (handler *InstalledAppRestHandlerImpl) fetchResourceTree(w http.ResponseWriter, r *http.Request, appDetail *bean2.AppDetailContainer) error {
ctx := r.Context()
cn, _ := w.(http.CloseNotifier)
_, err := handler.installedAppService.FetchResourceTree(ctx, cn, appDetail)
return err
}

func (handler *InstalledAppRestHandlerImpl) fetchResourceTreeWithHibernateForACD(w http.ResponseWriter, r *http.Request, appDetail *bean2.AppDetailContainer) {
ctx := r.Context()
cn, _ := w.(http.CloseNotifier)
handler.installedAppService.FetchResourceTreeWithHibernateForACD(ctx, cn, appDetail)
}
6 changes: 3 additions & 3 deletions internal/sql/repository/GlobalCMCSRepository.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ type GlobalCMCS struct {
Type string `sql:"type"` // [environment, volume]
//json string of map of key:value, example: '{ "a" : "b", "c" : "d"}'
Data string `sql:"data"`
MountPath string `sql:"mount_path"`
Deleted bool `sql:"deleted,notnull"`
SecretIngestionFor string `sql:"secret_ingestion_for,notnull"` // [CI, CD, CI/CD]
MountPath string `sql:"mount_path"`
Deleted bool `sql:"deleted,notnull"`
SecretIngestionFor string `sql:"secret_ingestion_for,notnull"` // [CI, CD, CI/CD]
sql.AuditLog
}

Expand Down
177 changes: 134 additions & 43 deletions pkg/appStore/deployment/service/InstalledAppService.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
util2 "github.com/devtron-labs/devtron/pkg/util"
util3 "github.com/devtron-labs/devtron/util"
"github.com/devtron-labs/devtron/util/argo"
"github.com/tidwall/gjson"
"net/http"

/* #nosec */
Expand Down Expand Up @@ -82,6 +83,7 @@ type InstalledAppService interface {
MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId int, envId int) error
CheckAppExistsByInstalledAppId(installedAppId int) error
FindNotesForArgoApplication(installedAppId, envId int) (string, string, error)
FetchResourceTreeWithHibernateForACD(rctx context.Context, cn http.CloseNotifier, appDetail *bean2.AppDetailContainer) bean2.AppDetailContainer
}

type InstalledAppServiceImpl struct {
Expand Down Expand Up @@ -942,49 +944,9 @@ func (impl InstalledAppServiceImpl) GetInstalledAppVersionHistoryValues(installe
return values, err
}
func (impl InstalledAppServiceImpl) FetchResourceTree(rctx context.Context, cn http.CloseNotifier, appDetail *bean2.AppDetailContainer) (bean2.AppDetailContainer, error) {
var err error
if util.IsAcdApp(appDetail.DeploymentAppType) {
acdAppName := appDetail.AppName + "-" + appDetail.EnvironmentName
query := &application.ResourcesQuery{
ApplicationName: &acdAppName,
}
ctx, cancel := context.WithCancel(rctx)
if cn != nil {
go func(done <-chan struct{}, closed <-chan bool) {
select {
case <-done:
case <-closed:
cancel()
}
}(ctx.Done(), cn.CloseNotify())
}
acdToken, err := impl.argoUserService.GetLatestDevtronArgoCdUserToken()
if err != nil {
impl.logger.Errorw("error in getting acd token", "err", err)
return *appDetail, err
}
ctx = context.WithValue(ctx, "token", acdToken)
defer cancel()
start := time.Now()
resp, err := impl.acdClient.ResourceTree(ctx, query)
elapsed := time.Since(start)
impl.logger.Debugf("Time elapsed %s in fetching app-store installed application %s for environment %s", elapsed, appDetail.InstalledAppId, appDetail.EnvironmentId)
if err != nil {
impl.logger.Errorw("service err, FetchAppDetailsForInstalledApp, fetching resource tree", "err", err, "installedAppId", appDetail.InstalledAppId, "envId", appDetail.EnvironmentId)
err = &util.ApiError{
Code: constants.AppDetailResourceTreeNotFound,
InternalMessage: "app detail fetched, failed to get resource tree from acd",
UserMessage: "app detail fetched, failed to get resource tree from acd",
}
appDetail.ResourceTree = map[string]interface{}{}
return *appDetail, err
}
// TODO: using this resp.Status to update in app_status table
appDetail.ResourceTree = util3.InterfaceToMapAdapter(resp)
err = impl.appStatusService.UpdateStatusWithAppIdEnvId(appDetail.AppId, appDetail.EnvironmentId, resp.Status)
if err != nil {
impl.logger.Warnw("error in updating app status", "err", err, appDetail.AppId, "envId", appDetail.EnvironmentId)
}
impl.logger.Debugf("application %s in environment %s had status %+v\n", appDetail.InstalledAppId, appDetail.EnvironmentId, resp)
appDetail, err = fetchResourceTreeForACD(rctx, cn, appDetail, impl)
} else if util.IsHelmApp(appDetail.DeploymentAppType) {
config, err := impl.helmAppService.GetClusterConf(appDetail.ClusterId)
if err != nil {
Expand All @@ -1009,7 +971,7 @@ func (impl InstalledAppServiceImpl) FetchResourceTree(rctx context.Context, cn h
appDetail.ResourceTree = map[string]interface{}{}
}
}
return *appDetail, nil
return *appDetail, err
}

func (impl InstalledAppServiceImpl) MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId int, envId int) error {
Expand Down Expand Up @@ -1069,3 +1031,132 @@ func (impl InstalledAppServiceImpl) CheckAppExistsByInstalledAppId(installedAppI
_, err := impl.installedAppRepository.GetInstalledApp(installedAppId)
return err
}

func (impl InstalledAppServiceImpl) FetchResourceTreeWithHibernateForACD(rctx context.Context, cn http.CloseNotifier, appDetail *bean2.AppDetailContainer) bean2.AppDetailContainer {
ctx, cancel := context.WithCancel(rctx)
if cn != nil {
go func(done <-chan struct{}, closed <-chan bool) {
select {
case <-done:
case <-closed:
cancel()
}
}(ctx.Done(), cn.CloseNotify())
}
acdToken, err := impl.argoUserService.GetLatestDevtronArgoCdUserToken()
if err != nil {
impl.logger.Errorw("error in getting acd token", "err", err)
return *appDetail
}
ctx = context.WithValue(ctx, "token", acdToken)
defer cancel()
appDetail, err = fetchResourceTreeForACD(rctx, cn, appDetail, impl)
if err != nil {
return *appDetail
}
if appDetail.ResourceTree["nodes"] == nil {
return *appDetail
}
appDetail.ResourceTree = checkHibernate(impl, appDetail, ctx)
return *appDetail
}
func checkHibernate(impl InstalledAppServiceImpl, resp *bean2.AppDetailContainer, ctx context.Context) map[string]interface{} {

responseTree := resp.ResourceTree

for _, node := range responseTree["nodes"].(interface{}).([]interface{}) {
currNode := node.(interface{}).(map[string]interface{})
name := resp.AppName + "-" + resp.Namespace
resName := util3.InterfaceToString(currNode["name"])
resKind := util3.InterfaceToString(currNode["kind"])
resGroup := util3.InterfaceToString(currNode["group"])
resVersion := util3.InterfaceToString(currNode["version"])
resNamespace := util3.InterfaceToString(currNode["namespace"])
rQuery := &application.ApplicationResourceRequest{
Name: &name,
ResourceName: &resName,
Kind: &resKind,
Group: &resGroup,
Version: &resVersion,
Namespace: &resNamespace,
}
ctx, _ := context.WithTimeout(ctx, 60*time.Second)
if currNode["parentRefs"] == nil {

res, err := impl.acdClient.GetResource(ctx, rQuery)
if err != nil {
impl.logger.Errorw("GRPC_GET_RESOURCE", "data", res, "timeTaken", time.Since(time.Now()), "err", err)
return responseTree
}
if res.Manifest != nil {
manifest, _ := gjson.Parse(*res.Manifest).Value().(map[string]interface{})
replicas := util3.InterfaceToMapAdapter(manifest["spec"])["replicas"]
if replicas != nil {
currNode["canBeHibernated"] = true
}
annotations := util3.InterfaceToMapAdapter(manifest["metadata"])["annotations"]
if annotations != nil {
val := util3.InterfaceToMapAdapter(annotations)["hibernator.devtron.ai/replicas"]
if val != nil {
if util3.InterfaceToString(val) != "0" && util3.InterfaceToFloat(replicas) == 0 {
currNode["isHibernated"] = true
}
}
}

}

if err != nil {
impl.logger.Errorw("GRPC_GET_RESOURCE", "data", res, "timeTaken", time.Since(time.Now()), "err", err)
}
}
node = currNode
}
return responseTree
}

func fetchResourceTreeForACD(rctx context.Context, cn http.CloseNotifier, appDetail *bean2.AppDetailContainer, impl InstalledAppServiceImpl) (*bean2.AppDetailContainer, error) {
acdAppName := appDetail.AppName + "-" + appDetail.EnvironmentName
query := &application.ResourcesQuery{
ApplicationName: &acdAppName,
}
ctx, cancel := context.WithCancel(rctx)
if cn != nil {
go func(done <-chan struct{}, closed <-chan bool) {
select {
case <-done:
case <-closed:
cancel()
}
}(ctx.Done(), cn.CloseNotify())
}
acdToken, err := impl.argoUserService.GetLatestDevtronArgoCdUserToken()
if err != nil {
impl.logger.Errorw("error in getting acd token", "err", err)
return appDetail, err
}
ctx = context.WithValue(ctx, "token", acdToken)
defer cancel()
start := time.Now()
resp, err := impl.acdClient.ResourceTree(ctx, query)
elapsed := time.Since(start)
impl.logger.Debugf("Time elapsed %s in fetching app-store installed application %s for environment %s", elapsed, appDetail.InstalledAppId, appDetail.EnvironmentId)
if err != nil {
impl.logger.Errorw("service err, FetchAppDetailsForInstalledApp, fetching resource tree", "err", err, "installedAppId", appDetail.InstalledAppId, "envId", appDetail.EnvironmentId)
err = &util.ApiError{
Code: constants.AppDetailResourceTreeNotFound,
InternalMessage: "app detail fetched, failed to get resource tree from acd",
UserMessage: "app detail fetched, failed to get resource tree from acd",
}
appDetail.ResourceTree = map[string]interface{}{}
return appDetail, err
}
// TODO: using this resp.Status to update in app_status table
appDetail.ResourceTree = util3.InterfaceToMapAdapter(resp)
err = impl.appStatusService.UpdateStatusWithAppIdEnvId(appDetail.AppId, appDetail.EnvironmentId, resp.Status)
if err != nil {
impl.logger.Warnw("error in updating app status", "err", err, appDetail.AppId, "envId", appDetail.EnvironmentId)
}
impl.logger.Debugf("application %s in environment %s had status %+v\n", appDetail.InstalledAppId, appDetail.EnvironmentId, resp)
return appDetail, err
}
4 changes: 2 additions & 2 deletions pkg/chartRepo/ChartRepositoryService_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package chartRepo

import (
"encoding/json"
"testing"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/util"
"github.com/ghodss/yaml"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"testing"
)

type ChartRepositoryServiceMock struct {
Expand Down Expand Up @@ -108,7 +108,7 @@ func TestUpdateRepository_NewRepository(t *testing.T) {
var newRepositories []*AcdConfigMapRepositoriesDto
repoByte, _ := yaml.YAMLToJSON([]byte(newYaml))
json.Unmarshal(repoByte, &newRepositories)

// verify
assert.Equal(t, "https://github.com/devtron/myrepo2/", newRepositories[1].Url)
assert.Equal(t, "myuser", newRepositories[1].UsernameSecret.Name)
Expand Down
28 changes: 28 additions & 0 deletions util/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,31 @@ func TriggerGitOpsMetrics(operation string, method string, startTime time.Time,
}
middleware.GitOpsDuration.WithLabelValues(operation, method, status).Observe(time.Since(startTime).Seconds())
}

func InterfaceToString(resp interface{}) string {
var dat string
b, err := json.Marshal(resp)
if err != nil {
fmt.Printf("Error: %s", err)
return dat
}
if err := json.Unmarshal(b, &dat); err != nil {
fmt.Printf("Error: %s", err)
return dat
}
return dat
}

func InterfaceToFloat(resp interface{}) float64 {
var dat float64
b, err := json.Marshal(resp)
if err != nil {
fmt.Printf("Error: %s", err)
return dat
}
if err := json.Unmarshal(b, &dat); err != nil {
fmt.Printf("Error: %s", err)
return dat
}
return dat
}