fix: ea mode fixes (#6624)

* project deletion fix

* delete cluster handling

* update error handling in DeleteClusterSecret to avoid blocking on unreachable clusters

Author: Shivam-nagar23

cmd/external-app/wire_gen.go

@@ -602,15 +602,6 @@ func (impl *ClusterServiceImpl) DeleteFromDb(bean *bean.ClusterBean, userId int3
 		impl.logger.Errorw("error in deleting cluster", "id", bean.Id, "err", err)
 		return "", err
 	}
-	k8sClient, err := impl.K8sUtil.GetCoreV1ClientInCluster()
-	if err != nil {
-		impl.logger.Errorw("error in getting in cluster k8s client", "err", err, "clusterName", bean.ClusterName)
-		return "", nil
-	}
-	// TODO Asutosh: why we maintain this duplicate code ??
-	secretName := ParseSecretNameForKubelinkInformer(bean.Id)
-	err = impl.K8sUtil.DeleteSecret(clusterBean.DefaultNamespace, secretName, k8sClient)
-	impl.logger.Errorw("error in deleting secret", "error", err)
 	return existingCluster.ClusterName, nil
 }
 

pkg/cluster/ClusterService.go

@@ -19,6 +19,7 @@ package delete
 import (
 	"fmt"
 	"github.com/devtron-labs/common-lib/utils/k8s"
+	appRepository "github.com/devtron-labs/devtron/internal/sql/repository/app"
 	dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
@@ -58,6 +59,7 @@ type DeleteServiceImpl struct {
 	dockerRegistryRepository dockerRegistryRepository.DockerArtifactStoreRepository
 	K8sUtil                  k8s.K8sService
 	k8sInformerFactory       informer.K8sInformerFactory
+	appRepository            appRepository.AppRepository
 }
 
 func NewDeleteServiceImpl(logger *zap.SugaredLogger,
@@ -70,6 +72,7 @@ func NewDeleteServiceImpl(logger *zap.SugaredLogger,
 	dockerRegistryRepository dockerRegistryRepository.DockerArtifactStoreRepository,
 	k8sInformerFactory informer.K8sInformerFactory,
 	K8sUtil k8s.K8sService,
+	appRepository appRepository.AppRepository,
 ) *DeleteServiceImpl {
 	return &DeleteServiceImpl{
 		logger:                   logger,
@@ -82,6 +85,7 @@ func NewDeleteServiceImpl(logger *zap.SugaredLogger,
 		dockerRegistryRepository: dockerRegistryRepository,
 		K8sUtil:                  K8sUtil,
 		k8sInformerFactory:       k8sInformerFactory,
+		appRepository:            appRepository,
 	}
 }
 
@@ -94,7 +98,8 @@ func (impl DeleteServiceImpl) DeleteCluster(deleteRequest *bean2.ClusterBean, us
 	err = impl.DeleteClusterSecret(deleteRequest, err)
 	if err != nil {
 		impl.logger.Errorw("error in deleting cluster secret", "clusterId", deleteRequest.Id, "error", err)
-		return err
+		// We are not returning error as it is not a blocking call as cluster can be unreachable at that time, and we have already deleted cluster from db.
+		//return err
 	}
 	impl.k8sInformerFactory.DeleteClusterFromCache(clusterName)
 	return nil
@@ -121,7 +126,17 @@ func (impl DeleteServiceImpl) DeleteEnvironment(deleteRequest *bean.EnvironmentB
 	return nil
 }
 func (impl DeleteServiceImpl) DeleteTeam(deleteRequest *bean3.TeamRequest) error {
-	err := impl.teamService.Delete(deleteRequest)
+	//finding if this project is used in some app; if yes, will not perform delete operation
+	apps, err := impl.appRepository.FindAppsByTeamId(deleteRequest.Id)
+	if err != nil && err != pg.ErrNoRows {
+		impl.logger.Errorw("err in deleting team", "teamId", deleteRequest.Id, "err", err)
+		return err
+	}
+	if len(apps) > 0 {
+		impl.logger.Errorw("err in deleting team, found apps in team", "teamName", deleteRequest.Name, "err", err)
+		return fmt.Errorf(" Please delete all apps in this project before deleting this project")
+	}
+	err = impl.teamService.Delete(deleteRequest)
 	if err != nil {
 		impl.logger.Errorw("error in deleting team", "err", err, "deleteRequest", deleteRequest)
 		return err

pkg/delete/DeleteService.go

@@ -99,7 +99,8 @@ func (impl DeleteServiceExtendedImpl) DeleteCluster(deleteRequest *bean2.Cluster
 	err = impl.DeleteClusterSecret(deleteRequest, err)
 	if err != nil {
 		impl.logger.Errorw("error in deleting cluster secret", "clusterId", deleteRequest.Id, "error", err)
-		return err
+		// We are not returning error as it is not a blocking call as cluster can be unreachable at that time, and we have already deleted cluster from db.
+		//return err
 	}
 	impl.k8sInformerFactory.DeleteClusterFromCache(clusterName)
 	return nil