Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 08:14:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

plugin/grpc: bugfix setup parser (#2697)

Browse Source 
Fix setup parser. Config params are not being setting.
This commit is contained in:
Iñigo
2019-03-15 08:55:26 +01:00
committed by Miek Gieben
parent 7b6cb76237
commit 287e280106
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugin/grpc/setup.go
View File

@@ -81,6 +81,12 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) {
return g, err return g, err
} }
for c.NextBlock() {
if err := parseBlock(c, g); err != nil {
return g, err
}
}
if g.tlsServerName != "" { if g.tlsServerName != "" {
if g.tlsConfig == nil { if g.tlsConfig == nil {
g.tlsConfig = new(tls.Config) g.tlsConfig = new(tls.Config)
@@ -95,12 +101,6 @@ func parseGRPCStanza(c *caddyfile.Dispenser) (*GRPC, error) {
g.proxies = append(g.proxies, pr) g.proxies = append(g.proxies, pr)
} }
for c.NextBlock() {
if err := parseBlock(c, g); err != nil {
return g, err
}
}
return g, nil return g, nil
} }

3
plugin/grpc/setup_test.go
View File

@@ -74,9 +74,6 @@ func TestSetupTLS(t *testing.T) {
tls_servername dns tls_servername dns
}`, false, "dns", ""}, }`, false, "dns", ""},
{`grpc . 127.0.0.1 { {`grpc . 127.0.0.1 {
tls_servername dns
}`, false, "", ""},
{`grpc . 127.0.0.1 {
tls tls
}`, false, "", ""}, }`, false, "", ""},
{`grpc . 127.0.0.1`, false, "", ""}, {`grpc . 127.0.0.1`, false, "", ""},