diff options
| author |  Iñigo <inigohu@gmail.com>
| 2019-03-15 08:55:26 +0100 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2019-03-15 07:55:26 +0000 |
| commit | 287e280106e70660836664cca46ae7a0c7d311f0 (patch) | |
| tree | 8e15f0b623fb318af5d5dec68db21b4ef48c3f37 | |
| parent | 7b6cb76237d151ffa056c742ec281a17548fa089 (diff) | |
| download | coredns-287e280106e70660836664cca46ae7a0c7d311f0.tar.gz coredns-287e280106e70660836664cca46ae7a0c7d311f0.tar.zst coredns-287e280106e70660836664cca46ae7a0c7d311f0.zip | |
plugin/grpc: bugfix setup parser (#2697)
Fix setup parser. Config params are not being setting.
| -rw-r--r-- | plugin/grpc/setup.go | 12 | ||||
| -rw-r--r-- | plugin/grpc/setup_test.go | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/plugin/grpc/setup.go b/plugin/grpc/setup.go index fe9f6d959..8d8a8453f 100644 --- a/plugin/grpc/setup.go +++ b/plugin/grpc/setup.go @@ -81,6 +81,12 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) { return g, err } + for c.NextBlock() { + if err := parseBlock(c, g); err != nil { + return g, err + } + } + if g.tlsServerName != "" { if g.tlsConfig == nil { g.tlsConfig = new(tls.Config) @@ -95,12 +101,6 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) { g.proxies = append(g.proxies, pr) } - for c.NextBlock() { - if err := parseBlock(c, g); err != nil { - return g, err - } - } - return g, nil } diff --git a/plugin/grpc/setup_test.go b/plugin/grpc/setup_test.go index fb470a541..8ec878b7d 100644 --- a/plugin/grpc/setup_test.go +++ b/plugin/grpc/setup_test.go @@ -74,9 +74,6 @@ func TestSetupTLS(t *testing.T) { tls_servername dns }`, false, "dns", ""}, {`grpc . 127.0.0.1 { -tls_servername dns -}`, false, "", ""}, - {`grpc . 127.0.0.1 { tls }`, false, "", ""}, {`grpc . 127.0.0.1`, false, "", ""}, |