From 93956396de40fba01f5ac8aee2aaf7d0e5284374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 10 Jan 2022 09:37:36 +0000 Subject: [PATCH] remove unused home provider from config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .../remove-unused-home-provider-config.md | 5 +++++ pkg/storage/registry/spaces/spaces.go | 13 +------------ 2 files changed, 6 insertions(+), 12 deletions(-) create mode 100644 changelog/unreleased/remove-unused-home-provider-config.md diff --git a/changelog/unreleased/remove-unused-home-provider-config.md b/changelog/unreleased/remove-unused-home-provider-config.md new file mode 100644 index 0000000000..f6ee8677fb --- /dev/null +++ b/changelog/unreleased/remove-unused-home-provider-config.md @@ -0,0 +1,5 @@ +Bugfix: remove unused home provider from config + +The spaces registry does not use a home provider config. + +https://github.com/cs3org/reva/pull/2428 diff --git a/pkg/storage/registry/spaces/spaces.go b/pkg/storage/registry/spaces/spaces.go index 3af8ebf23a..c909abd256 100644 --- a/pkg/storage/registry/spaces/spaces.go +++ b/pkg/storage/registry/spaces/spaces.go @@ -90,16 +90,11 @@ type StorageProviderClient interface { } type config struct { - Providers map[string]*Provider `mapstructure:"providers"` - HomeTemplate string `mapstructure:"home_template"` + Providers map[string]*Provider `mapstructure:"providers"` } func (c *config) init() { - if c.HomeTemplate == "" { - c.HomeTemplate = "/" - } - if len(c.Providers) == 0 { c.Providers = map[string]*Provider{ sharedconf.GetGatewaySVC(""): { @@ -165,10 +160,6 @@ func New(m map[string]interface{}, getClientFunc GetStorageProviderServiceClient resourceNameCache: make(map[string]string), getStorageProviderServiceClient: getClientFunc, } - r.homeTemplate, err = template.New("home_template").Funcs(sprig.TxtFuncMap()).Parse(c.HomeTemplate) - if err != nil { - return nil, err - } return r, nil } @@ -186,8 +177,6 @@ type GetStorageProviderServiceClientFunc func(addr string) (StorageProviderClien type registry struct { c *config - // the template to use when determining the home provider - homeTemplate *template.Template // a map of resources to providers resources map[string][]*registrypb.ProviderInfo resourceNameCache map[string]string