From d41bc5e1b8b5a366d2e9491267995133af8c2451 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Tue, 27 Jul 2021 13:39:09 +0200 Subject: [PATCH] fix URL naming --- storage/pkg/command/appprovider.go | 4 ++-- storage/pkg/config/config.go | 4 ++-- storage/pkg/flagset/appprovider.go | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go index ef4eb3ccbd..d7f76d76c7 100644 --- a/storage/pkg/command/appprovider.go +++ b/storage/pkg/command/appprovider.go @@ -102,8 +102,8 @@ func appProviderConfigFromStruct(c *cli.Context, cfg *config.Config) map[string] "demo": map[string]interface{}{}, "wopiinsecure": cfg.Reva.AppProvider.WopiInsecure, "iopsecret": cfg.Reva.AppProvider.IopSecret, - "wopiurl": cfg.Reva.AppProvider.WopiUrl, - "wopibridgeurl": cfg.Reva.AppProvider.WopiBridgeUrl, + "wopiurl": cfg.Reva.AppProvider.WopiURL, + "wopibridgeurl": cfg.Reva.AppProvider.WopiBridgeURL, }, }, }, diff --git a/storage/pkg/config/config.go b/storage/pkg/config/config.go index 9c9de1c464..ff9eb02180 100644 --- a/storage/pkg/config/config.go +++ b/storage/pkg/config/config.go @@ -45,8 +45,8 @@ type AppProvider struct { Driver string IopSecret string WopiInsecure bool - WopiUrl string - WopiBridgeUrl string + WopiURL string + WopiBridgeURL string } // Sharing defines the available sharing configuration. diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go index 2a839b176a..18b5d7db8e 100644 --- a/storage/pkg/flagset/appprovider.go +++ b/storage/pkg/flagset/appprovider.go @@ -68,17 +68,17 @@ func AppProviderWithConfig(cfg *config.Config) []cli.Flag { }, &cli.StringFlag{ Name: "wopiurl", - Value: flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiUrl, ""), + Value: flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiURL, ""), Usage: "WOPI server URL", EnvVars: []string{"APP_PROVIDER_WOPI_URL"}, - Destination: &cfg.Reva.AppProvider.WopiUrl, + Destination: &cfg.Reva.AppProvider.WopiURL, }, &cli.StringFlag{ Name: "wopibridgeurl", - Value: flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiBridgeUrl, ""), + Value: flags.OverrideDefaultString(cfg.Reva.AppProvider.WopiBridgeURL, ""), Usage: "WOPI bridge URL", EnvVars: []string{"APP_PROVIDER_WOPI_BRIDGE_URL"}, - Destination: &cfg.Reva.AppProvider.WopiBridgeUrl, + Destination: &cfg.Reva.AppProvider.WopiBridgeURL, }, // Gateway