review changes

Author: iamayushm

client/argocdServer/config/Config.go

@@ -28,7 +28,6 @@ import (
 
 type ArgoCDConfigGetter interface {
 	GetGRPCConfig() (*bean.ArgoGRPCConfig, error)
-	GetAllGRPCConfigs() ([]*bean.ArgoGRPCConfig, error)
 	GetK8sConfig() (*bean.ArgoK8sConfig, error)
 }
 
@@ -70,17 +69,6 @@ func (impl *ArgoCDConfigGetterImpl) GetGRPCConfig() (*bean.ArgoGRPCConfig, error
 	}, nil
 }
 
-func (impl *ArgoCDConfigGetterImpl) GetAllGRPCConfigs() ([]*bean.ArgoGRPCConfig, error) {
-	return []*bean.ArgoGRPCConfig{{
-		ConnectionConfig: impl.config,
-		AuthConfig: &bean.AcdAuthConfig{
-			ClusterId:                 bean2.DefaultClusterId,
-			DevtronSecretName:         impl.devtronSecretConfig.DevtronSecretName,
-			DevtronDexSecretNamespace: impl.devtronSecretConfig.DevtronDexSecretNamespace,
-		},
-	}}, nil
-}
-
 func (impl *ArgoCDConfigGetterImpl) GetK8sConfig() (*bean.ArgoK8sConfig, error) {
 	clusterBean, err := impl.clusterReadService.FindOne(bean2.DEFAULT_CLUSTER)
 	if err != nil {

client/argocdServer/connection/Connection.go

@@ -105,11 +105,11 @@ func NewArgoCDConnectionManagerImpl(Logger *zap.SugaredLogger,
 		argoCDConfigGetter:      argoCDConfigGetter,
 	}
 	if !runTimeConfig.LocalDevMode {
-		grpcConfigs, err := argoCDConfigGetter.GetAllGRPCConfigs()
+		grpcConfig, err := argoCDConfigGetter.GetGRPCConfig()
 		if err != nil {
 			Logger.Errorw("error in GetAllGRPCConfigs", "error", err)
 		}
-		go argoUserServiceImpl.ValidateGitOpsAndGetOrUpdateArgoCdUserDetail(grpcConfigs)
+		go argoUserServiceImpl.ValidateGitOpsAndGetOrUpdateArgoCdUserDetail(grpcConfig)
 	}
 	return argoUserServiceImpl, nil
 }
@@ -119,14 +119,12 @@ const (
 	ModuleStatusInstalled string = "installed"
 )
 
-func (impl *ArgoCDConnectionManagerImpl) ValidateGitOpsAndGetOrUpdateArgoCdUserDetail(grpcConfigs []*bean.ArgoGRPCConfig) string {
+func (impl *ArgoCDConnectionManagerImpl) ValidateGitOpsAndGetOrUpdateArgoCdUserDetail(grpcConfig *bean.ArgoGRPCConfig) string {
 	gitOpsConfigurationStatus, err := impl.gitOpsConfigReadService.IsGitOpsConfigured()
 	if err != nil || !gitOpsConfigurationStatus.IsGitOpsConfigured {
 		return ""
 	}
-	for _, grpcConfig := range grpcConfigs {
-		_ = impl.GetOrUpdateArgoCdUserDetail(grpcConfig)
-	}
+	_ = impl.GetOrUpdateArgoCdUserDetail(grpcConfig)
 	return ""
 }
 

pkg/gitops/GitOpsConfigService.go

@@ -118,14 +118,12 @@ func (impl *GitOpsConfigServiceImpl) ValidateAndCreateGitOpsConfig(config *apiBe
 	detailedErrorGitOpsConfigResponse := impl.GitOpsValidateDryRun(config)
 	if len(detailedErrorGitOpsConfigResponse.StageErrorMap) == 0 {
 		//create argo-cd user, if not created, here argo-cd integration has to be installed
-		gRPCConfigs, err := impl.argoCDConfigGetter.GetAllGRPCConfigs()
+		gRPCConfig, err := impl.argoCDConfigGetter.GetGRPCConfig()
 		if err != nil {
 			impl.logger.Errorw("error in getting all grpc configs", "error", err)
 			return detailedErrorGitOpsConfigResponse, err
 		}
-		for _, gRPCConfig := range gRPCConfigs {
-			_ = impl.argoCDConnectionManager.GetOrUpdateArgoCdUserDetail(gRPCConfig)
-		}
+		_ = impl.argoCDConnectionManager.GetOrUpdateArgoCdUserDetail(gRPCConfig)
 		_, err = impl.createGitOpsConfig(context.Background(), config)
 		if err != nil {
 			impl.logger.Errorw("service err, SaveGitRepoConfig", "err", err, "payload", config)
@@ -178,14 +176,13 @@ func (impl *GitOpsConfigServiceImpl) ValidateAndUpdateGitOpsConfig(config *apiBe
 			}
 		}
 	}
-	gRPCConfigs, err := impl.argoCDConfigGetter.GetAllGRPCConfigs()
+	gRPCConfig, err := impl.argoCDConfigGetter.GetGRPCConfig()
 	if err != nil {
 		impl.logger.Errorw("error in getting all grpc configs", "error", err)
 		return apiBean.DetailedErrorGitOpsConfigResponse{}, err
 	}
-	for _, gRPCConfig := range gRPCConfigs {
-		_ = impl.argoCDConnectionManager.GetOrUpdateArgoCdUserDetail(gRPCConfig)
-	}
+	_ = impl.argoCDConnectionManager.GetOrUpdateArgoCdUserDetail(gRPCConfig)
+
 	detailedErrorGitOpsConfigResponse := impl.GitOpsValidateDryRun(config)
 	if len(detailedErrorGitOpsConfigResponse.StageErrorMap) == 0 {
 		err := impl.updateGitOpsConfig(config)