Feat: Gitops optional for cicd

api/appStore/InstalledAppRestHandler.go

@@ -360,14 +360,28 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
 				InternalMessage: "app detail fetched, failed to get resource tree from acd",
 				UserMessage:     "app detail fetched, failed to get resource tree from acd",
 			}
-			appDetail.ResourceTree = &application.ResourceTreeResponse{}
+			appDetail.ResourceTree = map[string]interface{}{}
 			common.WriteJsonResp(w, nil, appDetail, http.StatusOK)
 			return
 		}
-		appDetail.ResourceTree = resp
+		appDetail.ResourceTree = common.ConvertResourceTree(resp)
 		handler.Logger.Debugf("application %s in environment %s had status %+v\n", installedAppId, envId, resp)
 	} else {
 		handler.Logger.Infow("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) convertResourceTree(resp interface{}) map[string]interface{} {
+	var dat map[string]interface{}
+	b, err := json.Marshal(resp)
+	if err != nil {
+		handler.Logger.Errorw("error on marshal resource tree", "err", err)
+		return dat
+	}
+	if err := json.Unmarshal(b, &dat); err != nil {
+		handler.Logger.Errorw("error on unmarshal resource tree", "err", err)
+		return dat
+	}
+	return dat
+}

api/bean/AppView.go

@@ -20,7 +20,6 @@ package bean
 import (
 	"encoding/json"
 	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
-	"github.com/devtron-labs/devtron/client/argocdServer/application"
 )
 
 type AppContainer struct {
@@ -107,14 +106,15 @@ type DeploymentDetailContainer struct {
 	K8sVersion                    string          `json:"k8sVersion"`
 	CiArtifactId                  int             `json:"ciArtifactId"`
 	ClusterId                     int             `json:"clusterId"`
+	DeploymentAppType             string          `json:"deploymentAppType"`
 }
 
 type AppDetailContainer struct {
 	DeploymentDetailContainer `json:",inline"`
-	InstanceDetail            []InstanceDetail                  `json:"instanceDetail"` //pod list with cpu, memory usage percent
-	Environments              []Environment                     `json:"otherEnvironment,omitempty"`
-	LinkOuts                  []LinkOuts                        `json:"linkOuts,omitempty"`
-	ResourceTree              *application.ResourceTreeResponse `json:"resourceTree,omitempty"`
+	InstanceDetail            []InstanceDetail       `json:"instanceDetail"` //pod list with cpu, memory usage percent
+	Environments              []Environment          `json:"otherEnvironment,omitempty"`
+	LinkOuts                  []LinkOuts             `json:"linkOuts,omitempty"`
+	ResourceTree              map[string]interface{} `json:"resourceTree,omitempty"`
 }
 
 type Environment struct {

api/helm-app/applicationClient.go

@@ -25,6 +25,7 @@ type HelmAppClient interface {
 	IsReleaseInstalled(ctx context.Context, in *ReleaseIdentifier) (*BooleanResponse, error)
 	RollbackRelease(ctx context.Context, in *RollbackReleaseRequest) (*BooleanResponse, error)
 	TemplateChart(ctx context.Context, in *InstallReleaseRequest) (*TemplateChartResponse, error)
+	HelmInstallCustom(ctx context.Context, in *HelmInstallCustomRequest) (*HelmInstallCustomResponse, error)
 }
 
 type HelmAppClientImpl struct {
@@ -261,3 +262,15 @@ func (impl *HelmAppClientImpl) TemplateChart(ctx context.Context, in *InstallRel
 	}
 	return response, nil
 }
+
+func (impl *HelmAppClientImpl) HelmInstallCustom(ctx context.Context, in *HelmInstallCustomRequest) (*HelmInstallCustomResponse, error) {
+	applicationClient, err := impl.getApplicationClient()
+	if err != nil {
+		return nil, err
+	}
+	response, err := applicationClient.HelmInstallCustom(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+	return response, nil
+}