updated feature flag name

Author: Ash-exp

pkg/commonService/CommonBaseService.go

@@ -44,14 +44,14 @@ func NewCommonBaseServiceImpl(logger *zap.SugaredLogger, envVariables *util.Envi
 
 func (impl *CommonBaseServiceImpl) isGitOpsEnable() (*FeatureGitOpsVariables, error) {
 	featureGitOpsFlags := &FeatureGitOpsVariables{
-		IsFeatureArgoCdMigrationEnabled: impl.globalEnvVariables.DeploymentServiceTypeConfig.EnableMigrateArgoCdApplication,
+		IsFeatureArgoCdMigrationEnabled: impl.globalEnvVariables.DeploymentServiceTypeConfig.IsFeatureMigrateArgoCdApplicationEnable(),
 	}
 	argoModule, err := impl.moduleReadService.GetModuleInfoByName(bean.ModuleNameArgoCd)
 	if err != nil && !errors.Is(err, moduleErr.ModuleNotFoundError) {
 		impl.logger.Errorw("error in getting argo module", "error", err)
 		return featureGitOpsFlags, err
 	}
-	if !impl.globalEnvVariables.DeploymentServiceTypeConfig.EnableMigrateArgoCdApplication {
+	if !impl.globalEnvVariables.DeploymentServiceTypeConfig.IsFeatureMigrateArgoCdApplicationEnable() {
 		featureGitOpsFlags.IsFeatureGitOpsEnabled = argoModule.IsInstalled()
 		featureGitOpsFlags.IsFeatureUserDefinedGitOpsEnabled = argoModule.IsInstalled()
 		return featureGitOpsFlags, nil

util/GlobalConfig.go

@@ -29,13 +29,18 @@ type EnvironmentVariables struct {
 	InternalEnvVariables        *InternalEnvVariables
 }
 
+// CATEGORY=CD
 type DeploymentServiceTypeConfig struct {
-	ExternallyManagedDeploymentType bool `env:"IS_INTERNAL_USE" envDefault:"false"`
-	HelmInstallASyncMode            bool `env:"RUN_HELM_INSTALL_IN_ASYNC_MODE_HELM_APPS" envDefault:"false"`
-	UseDeploymentConfigData         bool `env:"USE_DEPLOYMENT_CONFIG_DATA" envDefault:"false"`
-	MigrateDeploymentConfigData     bool `json:"MIGRATE_DEPLOYMENT_CONFIG_DATA" envDefault:"false" description:"migrate deployment config data from charts table to deployment_config table" deprecated:"false"`
-	EnableMigrateArgoCdApplication  bool `env:"ENABLE_MIGRATE_ARGOCD_APPLICATION" envDefault:"false" description:"enable migration of external argocd application to devtron pipeline" deprecated:"false"`
-	ShouldCheckNamespaceOnClone     bool `env:"SHOULD_CHECK_NAMESPACE_ON_CLONE" envDefault:"false"  description:"should we check if namespace exists or not while cloning app" deprecated:"false"`
+	ExternallyManagedDeploymentType       bool `env:"IS_INTERNAL_USE" envDefault:"false"`
+	HelmInstallASyncMode                  bool `env:"RUN_HELM_INSTALL_IN_ASYNC_MODE_HELM_APPS" envDefault:"false"`
+	UseDeploymentConfigData               bool `env:"USE_DEPLOYMENT_CONFIG_DATA" envDefault:"false"`
+	MigrateDeploymentConfigData           bool `env:"MIGRATE_DEPLOYMENT_CONFIG_DATA" envDefault:"false" description:"migrate deployment config data from charts table to deployment_config table" deprecated:"false"`
+	FeatureMigrateArgoCdApplicationEnable bool `env:"FEATURE_MIGRATE_ARGOCD_APPLICATION_ENABLE" envDefault:"false" description:"enable migration of external argocd application to devtron pipeline" deprecated:"false"`
+	ShouldCheckNamespaceOnClone           bool `env:"SHOULD_CHECK_NAMESPACE_ON_CLONE" envDefault:"false"  description:"should we check if namespace exists or not while cloning app" deprecated:"false"`
+}
+
+func (d *DeploymentServiceTypeConfig) IsFeatureMigrateArgoCdApplicationEnable() bool {
+	return false
 }
 
 type GlobalEnvVariables struct {