fix: Bugathon DT-19 version-2 fixes

api/bean/ConfigMapAndSecret.go

@@ -19,6 +19,7 @@ package bean
 
 import (
 	"encoding/json"
+	"github.com/devtron-labs/devtron/util"
 )
 
 type ConfigMapRootJson struct {
@@ -61,3 +62,10 @@ func (configSecret ConfigSecretMap) GetDataMap() (map[string]string, error) {
 	err := json.Unmarshal(configSecret.Data, &datamap)
 	return datamap, err
 }
+func (configSecretJson ConfigSecretJson) GetDereferencedSecrets() []ConfigSecretMap {
+	return util.GetDeReferencedArray(configSecretJson.Secrets)
+}
+
+func (configSecretJson *ConfigSecretJson) SetReferencedSecrets(secrets []ConfigSecretMap) {
+	configSecretJson.Secrets = util.GetReferencedArray(secrets)
+}

api/k8s/capacity/k8sCapacityRestHandler.go

@@ -61,7 +61,7 @@ func (handler *K8sCapacityRestHandlerImpl) GetClusterListRaw(w http.ResponseWrit
 		return
 	}
 	token := r.Header.Get("token")
-	clusters, err := handler.clusterService.FindAll()
+	clusters, err := handler.clusterService.FindAllExceptVirtual()
 	if err != nil {
 		handler.logger.Errorw("error in getting all clusters", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -83,7 +83,6 @@ func (handler *K8sCapacityRestHandlerImpl) GetClusterListRaw(w http.ResponseWrit
 				Id:                cluster.Id,
 				Name:              cluster.ClusterName,
 				ErrorInConnection: cluster.ErrorInConnecting,
-				IsVirtualCluster:  cluster.IsVirtualCluster,
 			}
 			clusterDetailList = append(clusterDetailList, clusterDetail)
 		}
@@ -102,7 +101,7 @@ func (handler *K8sCapacityRestHandlerImpl) GetClusterListWithDetail(w http.Respo
 		return
 	}
 	token := r.Header.Get("token")
-	clusters, err := handler.clusterService.FindAll()
+	clusters, err := handler.clusterService.FindAllExceptVirtual()
 	if err != nil {
 		handler.logger.Errorw("error in getting all clusters", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/restHandler/CoreAppRestHandler.go

@@ -1192,45 +1192,50 @@ func (handler CoreAppRestHandlerImpl) deleteApp(ctx context.Context, appId int,
 
 		// delete all CD pipelines for app starts
 		cdPipelines, err := handler.pipelineBuilder.GetCdPipelinesForApp(appId)
-		if err != nil {
+		if err != nil && err != pg.ErrNoRows {
 			handler.logger.Errorw("service err, GetCdPipelines in DeleteApp", "err", err, "appId", appId)
 			return err
 		}
-
-		for _, cdPipeline := range cdPipelines.Pipelines {
-			cdPipelineDeleteRequest := &bean.CDPatchRequest{
-				AppId:            appId,
-				UserId:           userId,
-				Action:           bean.CD_DELETE,
-				ForceDelete:      true,
-				NonCascadeDelete: false,
-				Pipeline:         cdPipeline,
-			}
-			_, err = handler.pipelineBuilder.PatchCdPipelines(cdPipelineDeleteRequest, ctx)
-			if err != nil {
-				handler.logger.Errorw("err in deleting cd pipeline in DeleteApp", "err", err, "payload", cdPipelineDeleteRequest)
-				return err
+		if err != pg.ErrNoRows {
+			for _, cdPipeline := range cdPipelines.Pipelines {
+				cdPipelineDeleteRequest := &bean.CDPatchRequest{
+					AppId:            appId,
+					UserId:           userId,
+					Action:           bean.CD_DELETE,
+					ForceDelete:      true,
+					NonCascadeDelete: false,
+					Pipeline:         cdPipeline,
+				}
+				_, err = handler.pipelineBuilder.PatchCdPipelines(cdPipelineDeleteRequest, ctx)
+				if err != nil {
+					handler.logger.Errorw("err in deleting cd pipeline in DeleteApp", "err", err, "payload", cdPipelineDeleteRequest)
+					return err
+				}
 			}
+
 		}
 		// delete all CD pipelines for app ends
 
 		// delete all CI pipelines for app starts
 		ciPipelines, err := handler.pipelineBuilder.GetCiPipeline(appId)
-		if err != nil {
+		if err != nil && err != pg.ErrNoRows {
 			handler.logger.Errorw("service err, GetCiPipelines in DeleteApp", "err", err, "appId", appId)
 			return err
 		}
-		for _, ciPipeline := range ciPipelines.CiPipelines {
-			ciPipelineDeleteRequest := &bean.CiPatchRequest{
-				AppId:      appId,
-				UserId:     userId,
-				Action:     bean.DELETE,
-				CiPipeline: ciPipeline,
-			}
-			_, err := handler.pipelineBuilder.PatchCiPipeline(ciPipelineDeleteRequest)
-			if err != nil {
-				handler.logger.Errorw("err in deleting ci pipeline in DeleteApp", "err", err, "payload", ciPipelineDeleteRequest)
-				return err
+		if err != pg.ErrNoRows {
+
+			for _, ciPipeline := range ciPipelines.CiPipelines {
+				ciPipelineDeleteRequest := &bean.CiPatchRequest{
+					AppId:      appId,
+					UserId:     userId,
+					Action:     bean.DELETE,
+					CiPipeline: ciPipeline,
+				}
+				_, err := handler.pipelineBuilder.PatchCiPipeline(ciPipelineDeleteRequest)
+				if err != nil {
+					handler.logger.Errorw("err in deleting ci pipeline in DeleteApp", "err", err, "payload", ciPipelineDeleteRequest)
+					return err
+				}
 			}
 		}
 		// delete all CI pipelines for app ends
@@ -1551,16 +1556,37 @@ func (handler CoreAppRestHandlerImpl) createWorkflows(ctx context.Context, appId
 		//Creating workflow ends
 
 		//Creating CI pipeline starts
-		ciPipelineId, err := handler.createCiPipeline(appId, userId, workflowId, workflow.CiPipeline)
+		ciPipeline, err := handler.createCiPipeline(appId, userId, workflowId, workflow.CiPipeline)
 		if err != nil {
+			err1 := handler.appWorkflowService.DeleteAppWorkflow(workflowId, userId)
+			if err1 != nil {
+				handler.logger.Errorw("service err, DeleteAppWorkflow ")
+				return err1, http.StatusInternalServerError
+			}
 			handler.logger.Errorw("err in saving ci pipelines", err, "appId", appId)
 			return err, http.StatusInternalServerError
 		}
 		//Creating CI pipeline ends
 
 		//Creating CD pipeline starts
-		err = handler.createCdPipelines(ctx, appId, userId, workflowId, ciPipelineId, workflow.CdPipelines)
+		err = handler.createCdPipelines(ctx, appId, userId, workflowId, ciPipeline.Id, workflow.CdPipelines)
 		if err != nil {
+			ciPipelineDeleteRequest := &bean.CiPatchRequest{
+				AppId:      appId,
+				UserId:     userId,
+				Action:     bean.DELETE,
+				CiPipeline: ciPipeline,
+			}
+			_, err1 := handler.pipelineBuilder.PatchCiPipeline(ciPipelineDeleteRequest)
+			if err1 != nil {
+				handler.logger.Errorw("err in deleting ci pipeline in DeleteApp", "err", err, "payload", ciPipelineDeleteRequest)
+				return err1, http.StatusInternalServerError
+			}
+			err1 = handler.appWorkflowService.DeleteAppWorkflow(workflowId, userId)
+			if err1 != nil {
+				handler.logger.Errorw("service err, DeleteAppWorkflow ")
+				return err1, http.StatusInternalServerError
+			}
 			handler.logger.Errorw("err in saving cd pipelines", err, "appId", appId)
 			return err, http.StatusInternalServerError
 		}
@@ -1590,13 +1616,13 @@ func (handler CoreAppRestHandlerImpl) createWorkflowInDb(workflowName string, ap
 	return savedAppWf.Id, nil
 }
 
-func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32, workflowId int, ciPipelineData *appBean.CiPipelineDetails) (int, error) {
+func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32, workflowId int, ciPipelineData *appBean.CiPipelineDetails) (*bean.CiPipeline, error) {
 
 	// if ci pipeline is of external type, then throw error as we are not supporting it as of now
 	if ciPipelineData.ParentCiPipeline == 0 && ciPipelineData.ParentAppId == 0 && ciPipelineData.IsExternal {
 		err := errors.New("external ci pipeline creation is not supported yet")
 		handler.logger.Error("external ci pipeline creation is not supported yet")
-		return 0, err
+		return nil, err
 	}
 
 	// build ci pipeline materials starts
@@ -1613,13 +1639,13 @@ func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32,
 		}
 		if err != nil {
 			handler.logger.Errorw("service err, FindByAppIdAndCheckoutPath in CreateWorkflows", "err", err, "appId", appId)
-			return 0, err
+			return nil, err
 		}
 
 		if gitMaterial == nil {
 			err = errors.New("gitMaterial is nil")
 			handler.logger.Errorw("gitMaterial is nil", "checkoutPath", ciMaterial.CheckoutPath)
-			return 0, err
+			return nil, err
 		}
 
 		ciMaterialRequest := &bean.CiMaterial{
@@ -1664,10 +1690,10 @@ func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32,
 	res, err := handler.pipelineBuilder.PatchCiPipeline(ciPipelineRequest)
 	if err != nil {
 		handler.logger.Errorw("service err, PatchCiPipelines", "err", err, "appId", appId)
-		return 0, err
+		return nil, err
 	}
 
-	return res.CiPipelines[0].Id, nil
+	return res.CiPipelines[0], nil
 }
 
 func (handler CoreAppRestHandlerImpl) createCdPipelines(ctx context.Context, appId int, userId int32, workflowId int, ciPipelineId int, cdPipelines []*appBean.CdPipelineDetails) error {

cmd/external-app/wire.go

@@ -40,6 +40,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
 	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
+	repository3 "github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
 	appStoreDeploymentTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool"
 	appStoreDeploymentGitopsTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool/gitops"
 	"github.com/devtron-labs/devtron/pkg/attributes"
@@ -199,6 +200,12 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(dockerRegistryRepository.DockerRegistryIpsConfigRepository), new(*dockerRegistryRepository.DockerRegistryIpsConfigRepositoryImpl)),
 		dockerRegistryRepository.NewOCIRegistryConfigRepositoryImpl,
 		wire.Bind(new(dockerRegistryRepository.OCIRegistryConfigRepository), new(*dockerRegistryRepository.OCIRegistryConfigRepositoryImpl)),
+
+		// chart group repository layer wire injection started
+		repository3.NewChartGroupDeploymentRepositoryImpl,
+		wire.Bind(new(repository3.ChartGroupDeploymentRepository), new(*repository3.ChartGroupDeploymentRepositoryImpl)),
+		// chart group repository layer wire injection ended
+
 		// end: docker registry wire set injection
 	)
 	return &App{}, nil

internal/sql/repository/pipelineConfig/CiWorkflowRepository.go

@@ -72,7 +72,7 @@ type CiWorkflow struct {
 	CiBuildType           string            `sql:"ci_build_type"`
 	EnvironmentId         int               `sql:"environment_id"`
 	ReferenceCiWorkflowId int               `sql:"ref_ci_workflow_id"`
-	ParentCiWorkFlowId int               `sql:"parent_ci_workflow_id"`
+	ParentCiWorkFlowId    int               `sql:"parent_ci_workflow_id"`
 	CiPipeline            *CiPipeline
 }
 

internal/sql/repository/security/ImageScanDeployInfoRepository.go

@@ -145,13 +145,13 @@ func (impl ImageScanDeployInfoRepositoryImpl) FetchListingGroupByObject(size int
 }
 
 func (impl ImageScanDeployInfoRepositoryImpl) FetchByAppIdAndEnvId(appId int, envId int, objectType []string) (*ImageScanDeployInfo, error) {
-	var model ImageScanDeployInfo
-	err := impl.dbConnection.Model(&model).
+	var model *ImageScanDeployInfo
+	err := impl.dbConnection.Model(model).
 		Where("scan_object_meta_id = ?", appId).
 		Where("env_id = ?", envId).Where("object_type in (?)", pg.In(objectType)).
 		Order("created_on desc").Limit(1).
 		Select()
-	return &model, err
+	return model, err
 }
 
 func (impl ImageScanDeployInfoRepositoryImpl) FindByTypeMetaAndTypeId(scanObjectMetaId int, objectType string) (*ImageScanDeployInfo, error) {
@@ -185,7 +185,8 @@ func (impl ImageScanDeployInfoRepositoryImpl) scanListQueryWithoutObject(request
 	}
 	query = query + " INNER JOIN environment env on env.id=info.env_id"
 	query = query + " INNER JOIN cluster clus on clus.id=env.cluster_id"
-	query = query + " WHERE info.scan_object_meta_id > 0 and env.active=true  and info.image_scan_execution_history_id[1] != -1"
+	query = query + " LEFT JOIN app ap on ap.id = info.scan_object_meta_id and info.object_type='app' WHERE ap.active=true"
+	query = query + " AND info.scan_object_meta_id > 0 and env.active=true and info.image_scan_execution_history_id[1] != -1 "
 	if len(deployInfoIds) > 0 {
 		ids := strings.Trim(strings.Join(strings.Fields(fmt.Sprint(deployInfoIds)), ","), "[]")
 		query = query + " AND info.id IN (" + ids + ")"