From 03e1f95d497bd0160944c59d0d5febc49754e192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 22 Dec 2020 15:10:23 +0000 Subject: [PATCH] fix lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- proxy/pkg/command/server.go | 5 +++++ storage/pkg/command/gateway.go | 2 +- web/pkg/command/server.go | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go index 29e1ad3f8..7029dda14 100644 --- a/proxy/pkg/command/server.go +++ b/proxy/pkg/command/server.go @@ -59,6 +59,11 @@ func Server(cfg *config.Config) *cli.Command { if err := ParseConfig(ctx, cfg); err != nil { return err } + + // TODO we could parse OCIS_URL and set the PROXY_HTTP_ADDR port but that would make it harder to deploy with a + // reverse proxy ... wouldn't it? + + return nil }, Action: func(c *cli.Context) error { logger := NewLogger(cfg) diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go index 2cb6595a6..552a1a97a 100644 --- a/storage/pkg/command/gateway.go +++ b/storage/pkg/command/gateway.go @@ -29,7 +29,7 @@ func Gateway(cfg *config.Config) *cli.Command { cfg.Reva.StorageRegistry.Rules = c.StringSlice("storage-registry-rule") if cfg.Reva.DataGateway.PublicURL == "" { - cfg.Reva.DataGateway.PublicURL == strings.TrimRight(cfg.Reva.Frontend.PublicURL, "/")+"/data" + cfg.Reva.DataGateway.PublicURL = strings.TrimRight(cfg.Reva.Frontend.PublicURL, "/") + "/data" } return nil diff --git a/web/pkg/command/server.go b/web/pkg/command/server.go index 0086f8ba7..4a5d71a28 100644 --- a/web/pkg/command/server.go +++ b/web/pkg/command/server.go @@ -44,7 +44,7 @@ func Server(cfg *config.Config) *cli.Command { // build well known openid-configuration endpoint if it is not set if cfg.Web.Config.OpenIDConnect.MetadataURL == "" { - cfg.Web.Config.OpenIDConnect.MetadataURL = strings.TrimRight(cfg.Web.Config.OpenIDConnect.Authority) + "/.well-known/openid-configuration" + cfg.Web.Config.OpenIDConnect.MetadataURL = strings.TrimRight(cfg.Web.Config.OpenIDConnect.Authority, "/") + "/.well-known/openid-configuration" } return nil