From 801d2fec3b0929fdf622772cbd5c21cfe93f3c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Jochum?= <rene@jochum.dev>
Date: Thu, 22 Sep 2022 18:03:07 +0200
Subject: [PATCH] Rename AppendFlags->MergeFlags

---
 cmd/microauth2sqld/main.go | 2 +-
 noop.go                    | 4 ++--
 plugin.go                  | 4 ++--
 plugins/client/jwt/jwt.go  | 2 +-
 plugins/router/jwt/jwt.go  | 2 +-
 registry.go                | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/microauth2sqld/main.go b/cmd/microauth2sqld/main.go
index 326e2a9..eeed3b8 100644
--- a/cmd/microauth2sqld/main.go
+++ b/cmd/microauth2sqld/main.go
@@ -97,7 +97,7 @@ func main() {
 	auth2ClientReg := auth2.ClientAuthRegistry()
 	auth2ClientReg.ForcePlugin("jwt")
 
-	flags := ibun.AppendFlags(ilogger.AppendFlags(auth2ClientReg.AppendFlags([]cli.Flag{
+	flags := ibun.AppendFlags(ilogger.AppendFlags(auth2ClientReg.MergeFlags([]cli.Flag{
 		// Generate
 		&cli.BoolFlag{
 			Name:  "auth2_generate_keys",
diff --git a/noop.go b/noop.go
index 7153c0a..38352b5 100644
--- a/noop.go
+++ b/noop.go
@@ -25,7 +25,7 @@ func (p *noopClientPlugin) String() string {
 	return "noop"
 }
 
-func (p *noopClientPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
+func (p *noopClientPlugin) MergeFlags(flags []cli.Flag) []cli.Flag {
 	return flags
 }
 
@@ -70,7 +70,7 @@ func (p *noopRouterPlugin) String() string {
 	return "noop"
 }
 
-func (p *noopRouterPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
+func (p *noopRouterPlugin) MergeFlags(flags []cli.Flag) []cli.Flag {
 	return flags
 }
 
diff --git a/plugin.go b/plugin.go
index ebbacd4..e715ec1 100644
--- a/plugin.go
+++ b/plugin.go
@@ -13,8 +13,8 @@ type registryFuncs interface {
 	// String returns the name of the plugin
 	String() string
 
-	// AppendFlags appends a list of cli.Flag's for micro.Service
-	AppendFlags(flags []cli.Flag) []cli.Flag
+	// MergeFlags merges a list of cli.Flag's for micro.Service
+	MergeFlags(flags []cli.Flag) []cli.Flag
 
 	// Init should be executed in micro.Init
 	Init(cli *cli.Context, service micro.Service) error
diff --git a/plugins/client/jwt/jwt.go b/plugins/client/jwt/jwt.go
index 1094455..62e21d3 100644
--- a/plugins/client/jwt/jwt.go
+++ b/plugins/client/jwt/jwt.go
@@ -43,7 +43,7 @@ func (p *jwtPlugin) String() string {
 	return "jwt"
 }
 
-func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
+func (p *jwtPlugin) MergeFlags(flags []cli.Flag) []cli.Flag {
 	return sutil.MergeFlags(flags,
 		&cli.StringFlag{
 			Name:    "auth2_jwt_pub_key",
diff --git a/plugins/router/jwt/jwt.go b/plugins/router/jwt/jwt.go
index cbcebc4..45adfdc 100644
--- a/plugins/router/jwt/jwt.go
+++ b/plugins/router/jwt/jwt.go
@@ -35,7 +35,7 @@ func (p *jwtPlugin) String() string {
 	return "jwt"
 }
 
-func (p *jwtPlugin) AppendFlags(flags []cli.Flag) []cli.Flag {
+func (p *jwtPlugin) MergeFlags(flags []cli.Flag) []cli.Flag {
 	return sutil.MergeFlag(flags, &cli.StringFlag{
 		Name:    "auth2_jwt_pub_key",
 		Usage:   "Public key PEM base64 encoded",
diff --git a/registry.go b/registry.go
index 44cb2c4..d4a4f34 100644
--- a/registry.go
+++ b/registry.go
@@ -49,7 +49,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 {
+func (r *AuthRegistry[T]) MergeFlags(flags []cli.Flag) []cli.Flag {
 	if r.forcedPlugin == "" {
 		flags = sutil.MergeFlag(flags, &cli.StringFlag{
 			Name:    fmt.Sprintf("auth2_%s", r.kind),
@@ -61,7 +61,7 @@ func (r *AuthRegistry[T]) AppendFlags(flags []cli.Flag) []cli.Flag {
 
 	for _, p := range r.plugins {
 		if p2, ok := any(p).(registryFuncs); ok {
-			flags = p2.AppendFlags(flags)
+			flags = p2.MergeFlags(flags)
 		}
 	}