From b11cba60431d58403b6d21cb50c86b8e4a1942f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Thu, 22 Sep 2022 18:06:00 +0200 Subject: [PATCH] Update auth2, use MergeFlags instead of AppendFlags --- README.md | 4 ++-- cmd/microrouterd/main.go | 2 +- go.mod | 2 +- go.sum | 12 +++++------- internal/ilogger/ilogger.go | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 05d7536..4f492aa 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ docker-compose: services: router: restart: unless-stopped - image: docker.io/jomicro/router:0.3.2 + image: docker.io/jomicro/router:0.3.3 environment: - MICRO_TRANSPORT=grpc - MICRO_REGISTRY=nats @@ -46,7 +46,7 @@ services: services: router: restart: unless-stopped - image: docker.io/jomicro/router:0.3.2 + image: docker.io/jomicro/router:0.3.3 environment: - MICRO_AUTH2_CLIENT=jwt - MICRO_AUTH2_ROUTER=jwt diff --git a/cmd/microrouterd/main.go b/cmd/microrouterd/main.go index 32efe56..954b691 100644 --- a/cmd/microrouterd/main.go +++ b/cmd/microrouterd/main.go @@ -86,7 +86,7 @@ func main() { routerAuthReg := auth2.RouterAuthRegistry() - flags := ilogger.AppendFlags(routerAuthReg.AppendFlags(auth2.ClientAuthRegistry().AppendFlags([]cli.Flag{ + flags := ilogger.MergeFlags(routerAuthReg.MergeFlags(auth2.ClientAuthRegistry().MergeFlags([]cli.Flag{ // General &cli.BoolFlag{ Name: "router_debugmode", diff --git a/go.mod b/go.mod index 8044f80..e1f5cbd 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/urfave/cli/v2 v2.16.3 go-micro.dev/v4 v4.8.1 google.golang.org/protobuf v1.28.1 - jochum.dev/jo-micro/auth2 v0.0.2 + jochum.dev/jo-micro/auth2 v0.1.0 ) require ( diff --git a/go.sum b/go.sum index 05a30ae..746b755 100644 --- a/go.sum +++ b/go.sum @@ -93,7 +93,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -222,8 +221,6 @@ golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5o golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9 h1:asZqf0wXastQr+DudYagQS8uBO8bHKeYD1vbAvGmFL8= -golang.org/x/net v0.0.0-20220920203100-d0c6ba3f52d9/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps= golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -275,8 +272,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006 h1:mmbq5q8M1t7dhkLw320YK4PsOXm6jdnUAkErImaIqOg= -google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ= google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ= google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= @@ -306,7 +302,9 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -jochum.dev/jo-micro/auth2 v0.0.1 h1:ykbesLmN7eIYCqa33aAw0gKXQ58TnF86qCPUpuzdbeM= -jochum.dev/jo-micro/auth2 v0.0.1/go.mod h1:kcaGL8YlOAmM7ROOYwhlT4Ar/FGM+1CRMDjb72eoVfc= jochum.dev/jo-micro/auth2 v0.0.2 h1:leaEyRmZGD0rpiD2ZvQMCaDCbOlHAYWRqKw99fWik+M= jochum.dev/jo-micro/auth2 v0.0.2/go.mod h1:z2qub/2K5+C9bpoDImWWPpKFPxds6LQN1Qx6X8c1xEc= +jochum.dev/jo-micro/auth2 v0.0.3 h1:PmLsCyxefJMtuZYBVUiuUpTN1axko7qKy940FVcW8uQ= +jochum.dev/jo-micro/auth2 v0.0.3/go.mod h1:z2qub/2K5+C9bpoDImWWPpKFPxds6LQN1Qx6X8c1xEc= +jochum.dev/jo-micro/auth2 v0.1.0 h1:/uLfWsi7m1JjnrdNbLgpplnfMP9kWPztTTWNSPT+chw= +jochum.dev/jo-micro/auth2 v0.1.0/go.mod h1:z2qub/2K5+C9bpoDImWWPpKFPxds6LQN1Qx6X8c1xEc= diff --git a/internal/ilogger/ilogger.go b/internal/ilogger/ilogger.go index e42d028..94d54d9 100644 --- a/internal/ilogger/ilogger.go +++ b/internal/ilogger/ilogger.go @@ -16,7 +16,7 @@ import ( var myLogger *logrus.Logger = nil var initialized = false -func AppendFlags(flags []cli.Flag) []cli.Flag { +func MergeFlags(flags []cli.Flag) []cli.Flag { return util.MergeFlag(flags, &cli.StringFlag{ Name: "router_loglevel", Value: "info",