From 52f11cfd80d74f9c1135166ce61bb9b07644d67c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 12 Jul 2022 11:32:30 +0000 Subject: [PATCH] fix search reva addr config parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/search/pkg/config/config.go | 2 +- services/search/pkg/config/defaults/defaultconfig.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/services/search/pkg/config/config.go b/services/search/pkg/config/config.go index a1475a8954..b921f0996b 100644 --- a/services/search/pkg/config/config.go +++ b/services/search/pkg/config/config.go @@ -19,7 +19,7 @@ type Config struct { GRPC GRPC `yaml:"grpc"` Datapath string `yaml:"data_path" env:"SEARCH_DATA_PATH" desc:"Path for the search persistence directory."` - Reva Reva `yaml:"reva"` + Reva *Reva `yaml:"reva"` Events Events `yaml:"events"` MachineAuthAPIKey string `yaml:"machine_auth_api_key" env:"OCIS_MACHINE_AUTH_API_KEY;SEARCH_MACHINE_AUTH_API_KEY" desc:"Machine auth API key used to validate internal requests necessary for the access to resources from other services."` diff --git a/services/search/pkg/config/defaults/defaultconfig.go b/services/search/pkg/config/defaults/defaultconfig.go index 213dfc5ab1..fda99492d3 100644 --- a/services/search/pkg/config/defaults/defaultconfig.go +++ b/services/search/pkg/config/defaults/defaultconfig.go @@ -29,7 +29,7 @@ func DefaultConfig() *config.Config { Name: "search", }, Datapath: path.Join(defaults.BaseDataPath(), "search"), - Reva: config.Reva{ + Reva: &config.Reva{ Address: "127.0.0.1:9142", }, Events: config.Events{ @@ -68,6 +68,14 @@ func EnsureDefaults(cfg *config.Config) { if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" { cfg.MachineAuthAPIKey = cfg.Commons.MachineAuthAPIKey } + + if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil { + cfg.Reva = &config.Reva{ + Address: cfg.Commons.Reva.Address, + } + } else if cfg.Reva == nil { + cfg.Reva = &config.Reva{} + } } func Sanitize(cfg *config.Config) {