plugin/grpc: bugfix setup parser (#2697)

Fix setup parser. Config params are not being setting.

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
 }
 

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, "", ""},