Merge pull request #882 from kaleido-io/dxtype

Deprecate default value for "ffdx"
hyperledger · Jun 28, 2022 · 522007c · 522007c
2 parents 30b0c56 + 4677c10
commit 522007c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/coreconfig/coreconfig.go b/internal/coreconfig/coreconfig.go
@@ -312,7 +312,6 @@ func setDefaults() {
 	viper.SetDefault(string(CorsAllowedOrigins), []string{"*"})
 	viper.SetDefault(string(CorsEnabled), true)
 	viper.SetDefault(string(CorsMaxAge), 600)
-	viper.SetDefault(string(DataexchangeType), "ffdx")
 	viper.SetDefault(string(HistogramsMaxChartRows), 100)
 	viper.SetDefault(string(DebugPort), -1)
 	viper.SetDefault(string(DownloadWorkerCount), 10)

diff --git a/internal/orchestrator/orchestrator.go b/internal/orchestrator/orchestrator.go
@@ -359,6 +359,10 @@ func (or *orchestrator) initDatabaseCheckPreinit(ctx context.Context) (err error
 
 func (or *orchestrator) initDataExchange(ctx context.Context) (err error) {
 	dxPlugin := config.GetString(coreconfig.DataexchangeType)
+	if dxPlugin == "" {
+		dxPlugin = "ffdx"
+		log.L(ctx).Warnf("The default value for %s has been deprecated - please explicitly set it to \"ffdx\"", coreconfig.DataexchangeType)
+	}
 	if or.dataexchange == nil {
 		pluginName := dxPlugin
 		if or.dataexchange, err = dxfactory.GetPlugin(ctx, pluginName); err != nil {