diff --git a/internal/ibun/ibun.go b/internal/ibun/ibun.go index adc6205..6bbd1a7 100644 --- a/internal/ibun/ibun.go +++ b/internal/ibun/ibun.go @@ -28,25 +28,25 @@ var SQLDB *sql.DB var Bun *bun.DB func AppendFlags(flags []cli.Flag) []cli.Flag { - flags = sutil.AppendFlag(flags, &cli.StringFlag{ + flags = sutil.MergeFlag(flags, &cli.StringFlag{ Name: "auth2_database_url", Usage: "bun Database URL", EnvVars: []string{"MICRO_AUTH2_DATABASE_URL"}, }) - flags = sutil.AppendFlag(flags, &cli.BoolFlag{ + flags = sutil.MergeFlag(flags, &cli.BoolFlag{ Name: "auth2_database_debug", Usage: "Set it to the debug the database queries", EnvVars: []string{"MICRO_AUTH2_DATABASE_DEBUG"}, DefaultText: "false", Value: false, }) - flags = sutil.AppendFlag(flags, &cli.StringFlag{ + flags = sutil.MergeFlag(flags, &cli.StringFlag{ Name: "auth2_migrations_table", Value: "schema_migrations", Usage: "Table to store migrations info", EnvVars: []string{"MICRO_AUTH2_MIGRATIONS_TABLE"}, }) - flags = sutil.AppendFlag(flags, &cli.StringFlag{ + flags = sutil.MergeFlag(flags, &cli.StringFlag{ Name: "auth2_migrations_dir", Value: "/migrations", Usage: "Folder which contains migrations", diff --git a/internal/ilogger/logger.go b/internal/ilogger/logger.go index beab951..1263671 100644 --- a/internal/ilogger/logger.go +++ b/internal/ilogger/logger.go @@ -17,7 +17,7 @@ var myLogger *logrus.Logger = nil var initialized = false func AppendFlags(flags []cli.Flag) []cli.Flag { - return sutil.AppendFlag(flags, &cli.StringFlag{ + return sutil.MergeFlag(flags, &cli.StringFlag{ Name: "auth2_loglevel", Value: "info", Usage: "Logrus log level default 'info', {panic,fatal,error,warn,info,debug,trace} available", diff --git a/plugins/client/jwt/jwt.go b/plugins/client/jwt/jwt.go index dcce9bd..1094455 100644 --- a/plugins/client/jwt/jwt.go +++ b/plugins/client/jwt/jwt.go @@ -44,7 +44,7 @@ func (p *jwtPlugin) String() string { } func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag { - return sutil.AppendFlags(flags, + return sutil.MergeFlags(flags, &cli.StringFlag{ Name: "auth2_jwt_pub_key", Usage: "Public key PEM base64 encoded for access keys", diff --git a/plugins/router/jwt/jwt.go b/plugins/router/jwt/jwt.go index 7c13283..cbcebc4 100644 --- a/plugins/router/jwt/jwt.go +++ b/plugins/router/jwt/jwt.go @@ -36,7 +36,7 @@ func (p *jwtPlugin) String() string { } 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", Usage: "Public key PEM base64 encoded", EnvVars: []string{"MICRO_AUTH2_JWT_PUB_KEY"}, diff --git a/registry.go b/registry.go index 926b53b..44cb2c4 100644 --- a/registry.go +++ b/registry.go @@ -51,7 +51,7 @@ func (r *AuthRegistry[T]) Register(plugin T) { // Flags returns a list of cli.Flag's for micro.Service func (r *AuthRegistry[T]) AppendFlags(flags []cli.Flag) []cli.Flag { if r.forcedPlugin == "" { - flags = sutil.AppendFlag(flags, &cli.StringFlag{ + flags = sutil.MergeFlag(flags, &cli.StringFlag{ Name: fmt.Sprintf("auth2_%s", r.kind), Usage: fmt.Sprintf("Auth %s Plugin to use", r.kind), EnvVars: []string{fmt.Sprintf("MICRO_AUTH2_%s", strings.ToUpper(r.kind))}, diff --git a/shared/sutil/flags.go b/shared/sutil/flags.go index 3fb9b69..7bac7d4 100644 --- a/shared/sutil/flags.go +++ b/shared/sutil/flags.go @@ -2,7 +2,7 @@ package sutil 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 for _, f := range flags { 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) } -func AppendFlags(flags []cli.Flag, newFlags ...cli.Flag) []cli.Flag { +func MergeFlags(flags []cli.Flag, newFlags ...cli.Flag) []cli.Flag { for _, f := range newFlags { - flags = AppendFlag(flags, f) + flags = MergeFlag(flags, f) } return flags