mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 12:19:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

new config framework in glauth

Browse Source
This commit is contained in:
A.Unger
2021-11-08 13:48:07 +01:00
parent bff4ec48b0
commit 3d90b21e3b
5 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ocis/pkg/command/glauth.go
View File

@@ -2,45 +2,39 @@ package command
import (
"github.com/owncloud/ocis/glauth/pkg/command"
svcconfig "github.com/owncloud/ocis/glauth/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/ocis-pkg/shared"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/urfave/cli/v2"
)
// GLAuthCommand is the entrypoint for the glauth command.
func GLAuthCommand(cfg *config.Config) *cli.Command {
var globalLog shared.Log
return &cli.Command{
Name: "glauth",
Usage: "Start glauth server",
Category: "Extensions",
Before: func(ctx *cli.Context) error {
return ParseConfig(ctx, cfg)
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
globalLog = cfg.Log
return nil
},
Action: func(c *cli.Context) error {
origCmd := command.Server(configureGLAuth(cfg))
// if Glauth logging is empty in ocis.yaml
if (cfg.GLAuth.Log == shared.Log{}) && (globalLog != shared.Log{}) {
// we can safely inherit the global logging values.
cfg.GLAuth.Log = globalLog
}
origCmd := command.Server(cfg.GLAuth)
return handleOriginalAction(c, origCmd)
},
}
}
func configureGLAuth(cfg *config.Config) *svcconfig.Config {
cfg.GLAuth.Log.Level = cfg.Log.Level
cfg.GLAuth.Log.Pretty = cfg.Log.Pretty
cfg.GLAuth.Log.Color = cfg.Log.Color
cfg.GLAuth.Version = version.String
if cfg.Tracing.Enabled {
cfg.GLAuth.Tracing.Enabled = cfg.Tracing.Enabled
cfg.GLAuth.Tracing.Type = cfg.Tracing.Type
cfg.GLAuth.Tracing.Endpoint = cfg.Tracing.Endpoint
cfg.GLAuth.Tracing.Collector = cfg.Tracing.Collector
}
return cfg.GLAuth
}
func init() {
register.AddCommand(GLAuthCommand)
}

21
ocis/pkg/command/idp.go
View File

@@ -2,9 +2,7 @@ package command
import (
"github.com/owncloud/ocis/idp/pkg/command"
svcconfig "github.com/owncloud/ocis/idp/pkg/config"
"github.com/owncloud/ocis/ocis-pkg/config"
"github.com/owncloud/ocis/ocis-pkg/version"
"github.com/owncloud/ocis/ocis/pkg/register"
"github.com/urfave/cli/v2"
)
@@ -22,7 +20,7 @@ func IDPCommand(cfg *config.Config) *cli.Command {
return ParseConfig(ctx, cfg)
},
Action: func(c *cli.Context) error {
idpCommand := command.Server(configureIDP(cfg))
idpCommand := command.Server(cfg.IDP)
if err := idpCommand.Before(c); err != nil {
return err
@@ -33,23 +31,6 @@ func IDPCommand(cfg *config.Config) *cli.Command {
}
}
func configureIDP(cfg *config.Config) *svcconfig.Config {
cfg.IDP.Log.Level = cfg.Log.Level
cfg.IDP.Log.Pretty = cfg.Log.Pretty
cfg.IDP.Log.Color = cfg.Log.Color
cfg.IDP.HTTP.TLS = false
cfg.IDP.Service.Version = version.String
if cfg.Tracing.Enabled {
cfg.IDP.Tracing.Enabled = cfg.Tracing.Enabled
cfg.IDP.Tracing.Type = cfg.Tracing.Type
cfg.IDP.Tracing.Endpoint = cfg.Tracing.Endpoint
cfg.IDP.Tracing.Collector = cfg.Tracing.Collector
}
return cfg.IDP
}
func init() {
register.AddCommand(IDPCommand)
}

2
ocis/pkg/command/proxy.go
View File

@@ -26,9 +26,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
if err := ParseConfig(ctx, cfg); err != nil {
return err
}
globalLog = cfg.Log
return nil
},
Action: func(c *cli.Context) error {