resolved PR review comments also remove check for virtual cluster (#5095)

Author: Laeeqdev

api/helm-app/service/HelmAppService.go

@@ -73,7 +73,7 @@ type HelmAppService interface {
 	ValidateOCIRegistry(ctx context.Context, OCIRegistryRequest *gRPC.RegistryCredential) bool
 	GetRevisionHistoryMaxValue(appType bean.SourceAppType) int32
 	GetResourceTreeForExternalResources(ctx context.Context, clusterId int, clusterConfig *gRPC.ClusterConfig, resources []*gRPC.ExternalResourceDetail) (*gRPC.ResourceTreeResponse, error)
-	CheckIfNsExistsForClusterIds(clusterIdToNsMap map[int]string, clusterIds []int) error
+	CheckIfNsExistsForClusterIds(clusterIdToNsMap map[int]string) error
 }
 
 type HelmAppServiceImpl struct {
@@ -540,9 +540,7 @@ func (impl *HelmAppServiceImpl) DeleteApplication(ctx context.Context, app *AppI
 	clusterIdToNsMap := map[int]string{
 		app.ClusterId: app.Namespace,
 	}
-	clusterId := make([]int, 0)
-	clusterId = append(clusterId, app.ClusterId)
-	err = impl.CheckIfNsExistsForClusterIds(clusterIdToNsMap, clusterId)
+	err = impl.CheckIfNsExistsForClusterIds(clusterIdToNsMap)
 	if err != nil {
 		return nil, err
 	}
@@ -1111,14 +1109,20 @@ func (impl *HelmAppServiceImpl) GetRevisionHistoryMaxValue(appType bean.SourceAp
 		return 0
 	}
 }
-func (impl *HelmAppServiceImpl) CheckIfNsExistsForClusterIds(clusterIdToNsMap map[int]string, clusterIds []int) error {
-
+func (impl *HelmAppServiceImpl) CheckIfNsExistsForClusterIds(clusterIdToNsMap map[int]string) error {
+	clusterIds := make([]int, 0)
+	for clusterId, _ := range clusterIdToNsMap {
+		clusterIds = append(clusterIds, clusterId)
+	}
 	clusterBeans, err := impl.clusterService.FindByIds(clusterIds)
 	if err != nil {
 		impl.logger.Errorw("error in getting cluster bean", "error", err, "clusterIds", clusterIds)
 		return err
 	}
 	for _, clusterBean := range clusterBeans {
+		if clusterBean.IsVirtualCluster {
+			continue
+		}
 		if namespace, ok := clusterIdToNsMap[clusterBean.Id]; ok {
 			exists, err := impl.checkIfNsExists(namespace, &clusterBean)
 			if err != nil {

pkg/appStore/installedApp/service/AppStoreDeploymentService.go

@@ -142,9 +142,7 @@ func (impl *AppStoreDeploymentServiceImpl) InstallApp(installAppVersionRequest *
 	clusterIdToNsMap := map[int]string{
 		installAppVersionRequest.ClusterId: installAppVersionRequest.Namespace,
 	}
-	clusterId := make([]int, 0)
-	clusterId = append(clusterId, installAppVersionRequest.ClusterId)
-	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap, clusterId)
+	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap)
 	if err != nil {
 		return nil, err
 	}
@@ -583,9 +581,8 @@ func (impl *AppStoreDeploymentServiceImpl) UpdateInstalledApp(ctx context.Contex
 	clusterIdToNsMap := map[int]string{
 		installedApp.Environment.ClusterId: installedApp.Environment.Namespace,
 	}
-	clusterId := make([]int, 0)
-	clusterId = append(clusterId, installedApp.Environment.ClusterId)
-	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap, clusterId)
+
+	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap)
 	if err != nil {
 		return nil, err
 	}

pkg/deployment/trigger/devtronApps/TriggerService.go

@@ -294,9 +294,7 @@ func (impl *TriggerServiceImpl) ManualCdTrigger(triggerContext bean.TriggerConte
 	clusterIdToNsMap := map[int]string{
 		cdPipeline.Environment.ClusterId: cdPipeline.Environment.Namespace,
 	}
-	clusterId := make([]int, 0)
-	clusterId = append(clusterId, cdPipeline.Environment.ClusterId)
-	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap, clusterId)
+	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap)
 	if err != nil {
 		return 0, err
 	}

pkg/pipeline/DeploymentPipelineConfigService.go

@@ -2077,12 +2077,11 @@ func (impl *CdPipelineConfigServiceImpl) checkIfNsExistsForEnvIds(envIds []*int)
 		return fmt.Errorf("error in fetching environment err:", err)
 	}
 	clusterIdToNsMap := make(map[int]string, 0)
-	clusterIds := make([]int, 0)
 	for _, environment := range environmentList {
-		clusterIds = append(clusterIds, environment.ClusterId)
+
 		clusterIdToNsMap[environment.ClusterId] = environment.Namespace
 	}
-	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap, clusterIds)
+	err = impl.helmAppService.CheckIfNsExistsForClusterIds(clusterIdToNsMap)
 	if err != nil {
 		return err
 	}