demo feat deployment app type change api (#3006)

* add api to force delete all cd pipelines of all apps of an environment from argo cd

* update deployment_app_type to helm and toggle deployment_app_created to false in db when changing cd app type and refactored

* remove code smell

* add check on app health status before deleting app from argocd

* resolve build issues

* Revert "resolve build issues"

This reverts commit 647fab2.

* revert and resolve build issues: missing argocd assets

* add support for changing deployment type from helm to argo_cd

* resolve sonar issue: decrease cognitive complexity

* resolve sonar issue: decrease cognitive complexity

* resolve sonar issue: decrease cognitive complexity

* resolve sonar issue: decrease cognitive complexity

* resolve sonar issue: decrease cognitive complexity

* resolve sonar issue: decrease cognitive complexity

* add api spec

* add exclusion list in request body and refactored code

* fixed failedPipelines empty list issue and handled case for missing status rows in db

* fixed pg query issue

* handled argocd app progressing app status

* add exclude apps property in api spec

* fix: helm deploy hibernate fix (#2983)

* finished on time update fix

* hibernate handling for helm apps

* HPA support for Helm deploy

* bulk API hibernate and unhibernate in helm deployment

* bulk deploy for helm type + hibernate support for custom chart

* scaling bug fixes

* refactoring done

* autoscaling handling for deployment as well

* removed dead code

* dead code removed

* fix: added deployment app type support for app create api, separated cron time for helm app status update (#2995)

* wip

* updated spec

* register app in acd when migrating from helm to argocd

* updated PipelineRepository mock

* add bulk cd pipeline async trigger

---------

Co-authored-by: kripanshdevtron <[email protected]>
Co-authored-by: kartik-579 <[email protected]>

Author: 3 people

api/restHandler/AppListingRestHandler.go

@@ -29,7 +29,6 @@ import (
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/client/argocdServer/application"
 	"github.com/devtron-labs/devtron/client/cron"
-	"github.com/devtron-labs/devtron/internal/constants"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
@@ -777,13 +776,11 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
 		resp, err := handler.application.ResourceTree(ctx, query)
 		elapsed := time.Since(start)
 		if err != nil {
-			handler.logger.Errorw("service err, FetchAppDetails, resource tree", "err", err, "app", appId, "env", envId)
-			err = &util.ApiError{
-				Code:            constants.AppDetailResourceTreeNotFound,
-				InternalMessage: "app detail fetched, failed to get resource tree from acd",
-				UserMessage:     "Error fetching detail, if you have recently created this deployment pipeline please try after sometime.",
-			}
-			common.WriteJsonResp(w, err, "", http.StatusInternalServerError)
+			handler.logger.Errorw("service err, FetchAppDetails, resource tree",
+				"err", err,
+				"app", appId,
+				"env", envId)
+
 			return appDetail
 		}
 		if resp.Status == string(health.HealthStatusHealthy) {

api/restHandler/app/DeploymentPipelineRestHandler.go

@@ -299,6 +299,7 @@ func (handler PipelineConfigRestHandlerImpl) HandleChangeDeploymentRequest(w htt
 	decoder := json.NewDecoder(r.Body)
 	var deploymentAppTypeChangeRequest *bean.DeploymentAppTypeChangeRequest
 	err = decoder.Decode(&deploymentAppTypeChangeRequest)
+	deploymentAppTypeChangeRequest.UserId = userId
 	if err != nil {
 		handler.Logger.Errorw("request err, HandleChangeDeploymentRequest", "err", err, "payload",
 			deploymentAppTypeChangeRequest)

internal/sql/repository/pipelineConfig/PipelineRepository.go

@@ -92,7 +92,7 @@ type PipelineRepository interface {
 	FindAllPipelinesByChartsOverrideAndAppIdAndChartId(chartOverridden bool, appId int, chartId int) (pipelines []*Pipeline, err error)
 	FindActiveByAppIdAndPipelineId(appId int, pipelineId int) ([]*Pipeline, error)
 	UpdateCdPipeline(pipeline *Pipeline) error
-	UpdateCdPipelineDeploymentAppInFilter(deploymentAppType string, cdPipelineIdIncludes []int) error
+	UpdateCdPipelineDeploymentAppInFilter(deploymentAppType string, cdPipelineIdIncludes []int, userId int32) error
 	FindNumberOfAppsWithCdPipeline(appIds []int) (count int, err error)
 	GetAppAndEnvDetailsForDeploymentAppTypePipeline(deploymentAppType string, clusterIds []int) ([]*Pipeline, error)
 	GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelines(pendingSinceSeconds int, timeForDegradation int) ([]*Pipeline, error)
@@ -453,15 +453,17 @@ func (impl PipelineRepositoryImpl) UpdateCdPipeline(pipeline *Pipeline) error {
 // UpdateCdPipelineDeploymentAppInFilter takes in deployment app type and list of cd pipeline ids and
 // updates the deployment_app_type and sets deployment_app_created to false in the table for given ids.
 func (impl PipelineRepositoryImpl) UpdateCdPipelineDeploymentAppInFilter(deploymentAppType string,
-	cdPipelineIdIncludes []int) error {
+	cdPipelineIdIncludes []int, userId int32) error {
 
 	query := "update pipeline set " +
 		"deployment_app_created = false, " +
-		"deployment_app_type = '" + deploymentAppType + "' " +
+		"deployment_app_type = '" + deploymentAppType + "', " +
+		"updated_by = ?, " +
+		"updated_on = ? " +
 		"where id in (?)"
 
 	var pipeline *Pipeline
-	_, err := impl.dbConnection.Query(pipeline, query, pg.In(cdPipelineIdIncludes))
+	_, err := impl.dbConnection.Query(pipeline, query, userId, time.Now(), pg.In(cdPipelineIdIncludes))
 
 	return err
 }

internal/sql/repository/pipelineConfig/mocks/PipelineRepository.go

@@ -27,11 +27,14 @@ import (
 	pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
 	client2 "github.com/devtron-labs/devtron/api/helm-app"
 	application3 "github.com/devtron-labs/devtron/client/k8s/application"
+	bean2 "github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/chart"
 	"github.com/devtron-labs/devtron/pkg/dockerRegistry"
 	repository3 "github.com/devtron-labs/devtron/pkg/pipeline/history/repository"
 	"github.com/devtron-labs/devtron/util/argo"
 	"github.com/devtron-labs/devtron/util/k8s"
+	"github.com/tidwall/gjson"
+	"github.com/tidwall/sjson"
 	"go.opentelemetry.io/otel"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -1679,7 +1682,7 @@ func (impl *AppServiceImpl) mergeAndSave(envOverride *chartConfig.EnvConfigOverr
 	}
 
 	appName := fmt.Sprintf("%s-%s", pipeline.App.AppName, envOverride.Environment.Name)
-	merged = impl.hpaCheckBeforeTrigger(ctx, appName, envOverride.Namespace, merged, pipeline.AppId, pipeline.DeploymentAppType, pipeline.Environment.ClusterId)
+	merged = impl.autoscalingCheckBeforeTrigger(ctx, appName, envOverride.Namespace, merged, pipeline, overrideRequest)
 
 	_, span := otel.Tracer("orchestrator").Start(ctx, "dockerRegistryIpsConfigService.HandleImagePullSecretOnApplicationDeployment")
 	// handle image pull secret if access given
@@ -1888,7 +1891,12 @@ func (impl *AppServiceImpl) UpdateCdWorkflowRunnerByACDObject(app *v1alpha1.Appl
 	return nil
 }
 
-func (impl *AppServiceImpl) hpaCheckBeforeTrigger(ctx context.Context, appName string, namespace string, merged []byte, appId int, appDeploymentType string, clusterId int) []byte {
+func (impl *AppServiceImpl) autoscalingCheckBeforeTrigger(ctx context.Context, appName string, namespace string, merged []byte, pipeline *pipelineConfig.Pipeline, overrideRequest *bean.ValuesOverrideRequest) []byte {
+	var appId = pipeline.AppId
+	pipelineId := pipeline.Id
+	var appDeploymentType = pipeline.DeploymentAppType
+	var clusterId = pipeline.Environment.ClusterId
+	deploymentType := overrideRequest.DeploymentType
 	templateMap := make(map[string]interface{})
 	err := json.Unmarshal(merged, &templateMap)
 	if err != nil {
@@ -1946,21 +1954,13 @@ func (impl *AppServiceImpl) hpaCheckBeforeTrigger(ctx context.Context, appName s
 			}
 			if len(resourceManifest) > 0 {
 				statusMap := resourceManifest["status"].(map[string]interface{})
-				currentReplicaVal := fmt.Sprintf("%v", statusMap["currentReplicas"])
-				currentReplicaCount, err := strconv.ParseFloat(currentReplicaVal, 64)
+				currentReplicaVal := statusMap["currentReplicas"]
+				currentReplicaCount, err := util2.ParseFloatNumber(currentReplicaVal)
 				if err != nil {
 					impl.logger.Errorw("error occurred while parsing replica count", "currentReplicas", currentReplicaVal, "err", err)
 					return merged
 				}
 
-				if currentReplicaCount <= reqMaxReplicas && currentReplicaCount >= reqMinReplicas {
-					reqReplicaCount = currentReplicaCount
-				} else if currentReplicaCount > reqMaxReplicas {
-					reqReplicaCount = reqMaxReplicas
-				} else if currentReplicaCount < reqMinReplicas {
-					reqReplicaCount = reqMinReplicas
-				}
-
 				reqReplicaCount = impl.fetchRequiredReplicaCount(currentReplicaCount, reqMaxReplicas, reqMinReplicas)
 				templateMap["replicaCount"] = reqReplicaCount
 				merged, err = json.Marshal(&templateMap)

pkg/app/AppService.go

@@ -527,6 +527,7 @@ type DeploymentAppTypeChangeRequest struct {
 	EnvId                 int            `json:"envId,omitempty" validate:"required"`
 	DesiredDeploymentType DeploymentType `json:"desiredDeploymentType,omitempty" validate:"required"`
 	ExcludeApps           []int          `json:"excludeApps"`
+	UserId                int32          `json:"-"`
 }
 
 type DeploymentChangeStatus struct {

pkg/bean/app.go

@@ -24,8 +24,7 @@ func TestGitopsOrHelmOption(t *testing.T) {
 			nil, nil, nil,
 			nil, nil, nil, nil,
 			nil, nil, nil, nil,
-			nil, nil, nil, nil, nil,
-			nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
+			nil, nil, nil, nil, nil, nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
 
 		pipelineCreateRequest := &bean.CdPipelines{
 			Pipelines: []*bean.CDPipelineConfigObject{
@@ -78,9 +77,7 @@ func TestGitopsOrHelmOption(t *testing.T) {
 			nil, nil, nil,
 			nil, nil, nil, nil,
 			nil, nil, nil, nil,
-			nil, nil, nil, nil,
-			nil, nil, nil, nil,
-			&DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
+			nil, nil, nil, nil, nil, nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
 
 		pipelineCreateRequest := &bean.CdPipelines{
 			Pipelines: []*bean.CDPipelineConfigObject{
@@ -133,8 +130,7 @@ func TestGitopsOrHelmOption(t *testing.T) {
 			nil, nil, nil,
 			nil, nil, nil, nil,
 			nil, nil, nil, nil,
-			nil, nil, nil, nil, nil, nil,
-			nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: true}, nil, nil)
+			nil, nil, nil, nil, nil, nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: true}, nil, nil)
 
 		pipelineCreateRequestHelm := &bean.CdPipelines{
 			Pipelines: []*bean.CDPipelineConfigObject{
@@ -225,8 +221,7 @@ func TestGitopsOrHelmOption(t *testing.T) {
 			nil, nil, nil,
 			nil, nil, nil, nil,
 			nil, nil, nil, nil,
-			nil, nil, nil, nil, nil, nil,
-			nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
+			nil, nil, nil, nil, nil, nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: false}, nil, nil)
 
 		pipelineCreateRequest := &bean.CdPipelines{
 			Pipelines: []*bean.CDPipelineConfigObject{
@@ -283,8 +278,7 @@ func TestGitopsOrHelmOption(t *testing.T) {
 			nil, nil, nil,
 			nil, nil, nil, nil,
 			nil, nil, nil, nil,
-			nil, nil, nil, nil, nil, nil,
-			nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: true}, nil, nil)
+			nil, nil, nil, nil, nil, nil, nil, nil, &DeploymentServiceTypeConfig{IsInternalUse: true}, nil, nil)
 
 		pipelineCreateRequest := &bean.CdPipelines{
 			Pipelines: []*bean.CDPipelineConfigObject{