3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-06 10:21:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

let pass custom grpc dial opts (#2144)

Browse source
This commit is contained in:
wasaga 2021-04-27 18:26:27 -04:00 • committed by GitHub
parent 7973ab43fe
commit 1b698053f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/grpc/client.go
View file

@ -59,7 +59,7 @@ type Options struct {
} }
// NewGRPCClientConn returns a new gRPC pomerium service client connection. // NewGRPCClientConn returns a new gRPC pomerium service client connection.
func NewGRPCClientConn(opts *Options) (*grpc.ClientConn, error) { func NewGRPCClientConn(opts *Options, other ...grpc.DialOption) (*grpc.ClientConn, error) {
ctx := context.TODO() ctx := context.TODO()
if len(opts.Addrs) == 0 { if len(opts.Addrs) == 0 {
return nil, errors.New("internal/grpc: connection address required") return nil, errors.New("internal/grpc: connection address required")
@ -105,6 +105,8 @@ func NewGRPCClientConn(opts *Options) (*grpc.ClientConn, error) {
grpc.WithDisableServiceConfig(), grpc.WithDisableServiceConfig(),
} }
dialOptions = append(dialOptions, other...)
if opts.WithInsecure { if opts.WithInsecure {
log.Info(ctx).Str("addr", connAddr).Msg("internal/grpc: grpc with insecure") log.Info(ctx).Str("addr", connAddr).Msg("internal/grpc: grpc with insecure")
dialOptions = append(dialOptions, grpc.WithInsecure()) dialOptions = append(dialOptions, grpc.WithInsecure())