jo-micro
/
auth2
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename AppendFlag->MergeFlag

Browse Source
main
René Jochum 2 years ago
parent 7575483af5
commit 7a1ef6a625
Signed by: jochum
GPG Key ID: F7D906F5E51E8E5E
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

8
internal/ibun/ibun.go
Unescape Escape View File

@ -28,25 +28,25 @@ var SQLDB *sql.DB
var Bun *bun.DB var Bun *bun.DB
func AppendFlags(flags []cli.Flag) []cli.Flag { func AppendFlags(flags []cli.Flag) []cli.Flag {
flags = sutil.AppendFlag(flags, &cli.StringFlag{ flags = sutil.MergeFlag(flags, &cli.StringFlag{
Name: "auth2_database_url", Name: "auth2_database_url",
Usage: "bun Database URL", Usage: "bun Database URL",
EnvVars: []string{"MICRO_AUTH2_DATABASE_URL"}, EnvVars: []string{"MICRO_AUTH2_DATABASE_URL"},
}) })
flags = sutil.AppendFlag(flags, &cli.BoolFlag{ flags = sutil.MergeFlag(flags, &cli.BoolFlag{
Name: "auth2_database_debug", Name: "auth2_database_debug",
Usage: "Set it to the debug the database queries", Usage: "Set it to the debug the database queries",
EnvVars: []string{"MICRO_AUTH2_DATABASE_DEBUG"}, EnvVars: []string{"MICRO_AUTH2_DATABASE_DEBUG"},
DefaultText: "false", DefaultText: "false",
Value: false, Value: false,
}) })
flags = sutil.AppendFlag(flags, &cli.StringFlag{ flags = sutil.MergeFlag(flags, &cli.StringFlag{
Name: "auth2_migrations_table", Name: "auth2_migrations_table",
Value: "schema_migrations", Value: "schema_migrations",
Usage: "Table to store migrations info", Usage: "Table to store migrations info",
EnvVars: []string{"MICRO_AUTH2_MIGRATIONS_TABLE"}, EnvVars: []string{"MICRO_AUTH2_MIGRATIONS_TABLE"},
}) })
flags = sutil.AppendFlag(flags, &cli.StringFlag{ flags = sutil.MergeFlag(flags, &cli.StringFlag{
Name: "auth2_migrations_dir", Name: "auth2_migrations_dir",
Value: "/migrations", Value: "/migrations",
Usage: "Folder which contains migrations", Usage: "Folder which contains migrations",

2
internal/ilogger/logger.go
Unescape Escape View File

@ -17,7 +17,7 @@ var myLogger *logrus.Logger = nil
var initialized = false var initialized = false
func AppendFlags(flags []cli.Flag) []cli.Flag { func AppendFlags(flags []cli.Flag) []cli.Flag {
return sutil.AppendFlag(flags, &cli.StringFlag{ return sutil.MergeFlag(flags, &cli.StringFlag{
Name: "auth2_loglevel", Name: "auth2_loglevel",
Value: "info", Value: "info",
Usage: "Logrus log level default 'info', {panic,fatal,error,warn,info,debug,trace} available", Usage: "Logrus log level default 'info', {panic,fatal,error,warn,info,debug,trace} available",

2
plugins/client/jwt/jwt.go
Unescape Escape View File

@ -44,7 +44,7 @@ func (p *jwtPlugin) String() string {
} }
func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag { func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
return sutil.AppendFlags(flags, return sutil.MergeFlags(flags,
&cli.StringFlag{ &cli.StringFlag{
Name: "auth2_jwt_pub_key", Name: "auth2_jwt_pub_key",
Usage: "Public key PEM base64 encoded for access keys", Usage: "Public key PEM base64 encoded for access keys",

2
plugins/router/jwt/jwt.go
Unescape Escape View File

@ -36,7 +36,7 @@ func (p *jwtPlugin) String() string {
} }
func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag { func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
return sutil.AppendFlag(flags, &cli.StringFlag{ return sutil.MergeFlag(flags, &cli.StringFlag{
Name: "auth2_jwt_pub_key", Name: "auth2_jwt_pub_key",
Usage: "Public key PEM base64 encoded", Usage: "Public key PEM base64 encoded",
EnvVars: []string{"MICRO_AUTH2_JWT_PUB_KEY"}, EnvVars: []string{"MICRO_AUTH2_JWT_PUB_KEY"},

2
registry.go
Unescape Escape View File

@ -51,7 +51,7 @@ func (r *AuthRegistry[T]) Register(plugin T) {
// Flags returns a list of cli.Flag's for micro.Service // Flags returns a list of cli.Flag's for micro.Service
func (r *AuthRegistry[T]) AppendFlags(flags []cli.Flag) []cli.Flag { func (r *AuthRegistry[T]) AppendFlags(flags []cli.Flag) []cli.Flag {
if r.forcedPlugin == "" { if r.forcedPlugin == "" {
flags = sutil.AppendFlag(flags, &cli.StringFlag{ flags = sutil.MergeFlag(flags, &cli.StringFlag{
Name: fmt.Sprintf("auth2_%s", r.kind), Name: fmt.Sprintf("auth2_%s", r.kind),
Usage: fmt.Sprintf("Auth %s Plugin to use", r.kind), Usage: fmt.Sprintf("Auth %s Plugin to use", r.kind),
EnvVars: []string{fmt.Sprintf("MICRO_AUTH2_%s", strings.ToUpper(r.kind))}, EnvVars: []string{fmt.Sprintf("MICRO_AUTH2_%s", strings.ToUpper(r.kind))},

6
shared/sutil/flags.go
Unescape Escape View File

@ -2,7 +2,7 @@ package sutil
import "github.com/urfave/cli/v2" import "github.com/urfave/cli/v2"
func AppendFlag(flags []cli.Flag, flag cli.Flag) []cli.Flag { func MergeFlag(flags []cli.Flag, flag cli.Flag) []cli.Flag {
has := false has := false
for _, f := range flags { for _, f := range flags {
if f.Names()[0] == flag.Names()[0] { if f.Names()[0] == flag.Names()[0] {
@ -18,9 +18,9 @@ func AppendFlag(flags []cli.Flag, flag cli.Flag) []cli.Flag {
return append(flags, flag) return append(flags, flag)
} }
func AppendFlags(flags []cli.Flag, newFlags ...cli.Flag) []cli.Flag { func MergeFlags(flags []cli.Flag, newFlags ...cli.Flag) []cli.Flag {
for _, f := range newFlags { for _, f := range newFlags {
flags = AppendFlag(flags, f) flags = MergeFlag(flags, f)
} }
return flags return flags

Write Preview
Loading…
Cancel
Save