From 8c897963412b45826a2fb8b1fe51c72626432ea0 Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Sun, 28 Jan 2024 02:58:33 -0500 Subject: [PATCH] refactor: use a centralized list key for enabled protocols --- api/api.go | 4 +++- protocols/protocols.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/api.go b/api/api.go index eb6b991..28e08bd 100644 --- a/api/api.go +++ b/api/api.go @@ -4,6 +4,7 @@ import ( "context" "git.lumeweb.com/LumeWeb/portal/api/registry" "git.lumeweb.com/LumeWeb/portal/api/router" + "github.com/samber/lo" "github.com/spf13/viper" "go.uber.org/fx" ) @@ -28,8 +29,9 @@ func getModulesBasedOnConfig() []fx.Option { func BuildApis(config *viper.Viper) fx.Option { var options []fx.Option + enabledProtocols := config.GetStringSlice("core.protocols") for _, entry := range registry.GetRegistry() { - if config.GetBool("protocols." + entry.Key + ".enabled") { + if lo.Contains(enabledProtocols, entry.Key) { options = append(options, entry.Module) if entry.InitFunc != nil { options = append(options, fx.Invoke(entry.InitFunc)) diff --git a/protocols/protocols.go b/protocols/protocols.go index 2666aca..9aad2d8 100644 --- a/protocols/protocols.go +++ b/protocols/protocols.go @@ -3,6 +3,7 @@ package protocols import ( "context" "git.lumeweb.com/LumeWeb/portal/protocols/registry" + "github.com/samber/lo" "github.com/spf13/viper" "go.uber.org/fx" ) @@ -17,8 +18,9 @@ func RegisterProtocols() { func BuildProtocols(config *viper.Viper) fx.Option { var options []fx.Option + enabledProtocols := config.GetStringSlice("core.protocols") for _, entry := range registry.GetRegistry() { - if config.GetBool("protocols." + entry.Key + ".enabled") { + if lo.Contains(enabledProtocols, entry.Key) { options = append(options, entry.Module) if entry.InitFunc != nil { options = append(options, fx.Invoke(entry.InitFunc))