misc: cm/ cs not working in cd pipeline stage (#6324)

* fix: cm/ cs not working in cd pipeline stage

* chore: removed unused wire dep

Author: Ash-exp

pkg/pipeline/WorkflowService.go

@@ -28,7 +28,6 @@ import (
 	"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
 	"github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
-	"github.com/devtron-labs/devtron/pkg/app"
 	bean2 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
 	"github.com/devtron-labs/devtron/pkg/config/read"
@@ -66,7 +65,6 @@ type WorkflowServiceImpl struct {
 	config                 *rest.Config
 	ciCdConfig             *types.CiCdConfig
 	configMapService       read.ConfigReadService
-	appService             app.AppService
 	envRepository          repository2.EnvironmentRepository
 	globalCMCSService      GlobalCMCSService
 	argoWorkflowExecutor   executors.ArgoWorkflowExecutor
@@ -78,15 +76,20 @@ type WorkflowServiceImpl struct {
 
 // TODO: Move to bean
 
-func NewWorkflowServiceImpl(Logger *zap.SugaredLogger, envRepository repository2.EnvironmentRepository, ciCdConfig *types.CiCdConfig,
-	appService app.AppService, globalCMCSService GlobalCMCSService, argoWorkflowExecutor executors.ArgoWorkflowExecutor,
+func NewWorkflowServiceImpl(Logger *zap.SugaredLogger,
+	envRepository repository2.EnvironmentRepository,
+	ciCdConfig *types.CiCdConfig,
+	configMapService read.ConfigReadService,
+	globalCMCSService GlobalCMCSService,
+	argoWorkflowExecutor executors.ArgoWorkflowExecutor,
 	k8sUtil *k8s.K8sServiceImpl,
-	systemWorkflowExecutor executors.SystemWorkflowExecutor, k8sCommonService k8s2.K8sCommonService,
+	systemWorkflowExecutor executors.SystemWorkflowExecutor,
+	k8sCommonService k8s2.K8sCommonService,
 	infraProvider infraProviders.InfraProvider) (*WorkflowServiceImpl, error) {
 	commonWorkflowService := &WorkflowServiceImpl{
 		Logger:                 Logger,
 		ciCdConfig:             ciCdConfig,
-		appService:             appService,
+		configMapService:       configMapService,
 		envRepository:          envRepository,
 		globalCMCSService:      globalCMCSService,
 		argoWorkflowExecutor:   argoWorkflowExecutor,
@@ -277,6 +280,19 @@ func (impl *WorkflowServiceImpl) addExistingCmCsInWorkflowForCDStage(workflowReq
 		return nil, nil, err
 	}
 	impl.Logger.Debugw("existing cm", "cm", existingConfigMap, "secrets", existingSecrets)
+	if existingConfigMap != nil {
+		for i := range existingConfigMap.Maps {
+			workflowConfigMaps = append(workflowConfigMaps, existingConfigMap.Maps[i])
+		}
+	}
+	if existingSecrets != nil {
+		for i := range existingSecrets.Secrets {
+			if existingSecrets.Secrets[i] == nil {
+				continue
+			}
+			workflowSecrets = append(workflowSecrets, *existingSecrets.Secrets[i])
+		}
+	}
 	return workflowConfigMaps, workflowSecrets, nil
 }