caddyfile: Normalize & flatten all unmarshalers (#6037)

modules/caddyhttp/encode/caddyfile.go

@@ -54,62 +54,60 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
 //
 // Specifying the formats on the first line will use those formats' defaults.
 func (enc *Encode) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
-	var prefer []string
+	d.Next() // consume directive name
+
+	prefer := []string{}
+	for _, arg := range d.RemainingArgs() {
+		mod, err := caddy.GetModule("http.encoders." + arg)
+		if err != nil {
+			return d.Errf("finding encoder module '%s': %v", mod, err)
+		}
+		encoding, ok := mod.New().(Encoding)
+		if !ok {
+			return d.Errf("module %s is not an HTTP encoding", mod)
+		}
+		if enc.EncodingsRaw == nil {
+			enc.EncodingsRaw = make(caddy.ModuleMap)
+		}
+		enc.EncodingsRaw[arg] = caddyconfig.JSON(encoding, nil)
+		prefer = append(prefer, arg)
+	}
 
 	responseMatchers := make(map[string]caddyhttp.ResponseMatcher)
-
-	for d.Next() {
-		for _, arg := range d.RemainingArgs() {
-			mod, err := caddy.GetModule("http.encoders." + arg)
-			if err != nil {
-				return d.Errf("finding encoder module '%s': %v", mod, err)
+	for d.NextBlock(0) {
+		switch d.Val() {
+		case "minimum_length":
+			if !d.NextArg() {
+				return d.ArgErr()
 			}
-			encoding, ok := mod.New().(Encoding)
+			minLength, err := strconv.Atoi(d.Val())
+			if err != nil {
+				return err
+			}
+			enc.MinLength = minLength
+		case "match":
+			err := caddyhttp.ParseNamedResponseMatcher(d.NewFromNextSegment(), responseMatchers)
+			if err != nil {
+				return err
+			}
+			matcher := responseMatchers["match"]
+			enc.Matcher = &matcher
+		default:
+			name := d.Val()
+			modID := "http.encoders." + name
+			unm, err := caddyfile.UnmarshalModule(d, modID)
+			if err != nil {
+				return err
+			}
+			encoding, ok := unm.(Encoding)
 			if !ok {
-				return d.Errf("module %s is not an HTTP encoding", mod)
+				return d.Errf("module %s is not an HTTP encoding; is %T", modID, unm)
 			}
 			if enc.EncodingsRaw == nil {
 				enc.EncodingsRaw = make(caddy.ModuleMap)
 			}
-			enc.EncodingsRaw[arg] = caddyconfig.JSON(encoding, nil)
-			prefer = append(prefer, arg)
-		}
-
-		for d.NextBlock(0) {
-			switch d.Val() {
-			case "minimum_length":
-				if !d.NextArg() {
-					return d.ArgErr()
-				}
-				minLength, err := strconv.Atoi(d.Val())
-				if err != nil {
-					return err
-				}
-				enc.MinLength = minLength
-			case "match":
-				err := caddyhttp.ParseNamedResponseMatcher(d.NewFromNextSegment(), responseMatchers)
-				if err != nil {
-					return err
-				}
-				matcher := responseMatchers["match"]
-				enc.Matcher = &matcher
-			default:
-				name := d.Val()
-				modID := "http.encoders." + name
-				unm, err := caddyfile.UnmarshalModule(d, modID)
-				if err != nil {
-					return err
-				}
-				encoding, ok := unm.(Encoding)
-				if !ok {
-					return d.Errf("module %s is not an HTTP encoding; is %T", modID, unm)
-				}
-				if enc.EncodingsRaw == nil {
-					enc.EncodingsRaw = make(caddy.ModuleMap)
-				}
-				enc.EncodingsRaw[name] = caddyconfig.JSON(encoding, nil)
-				prefer = append(prefer, name)
-			}
+			enc.EncodingsRaw[name] = caddyconfig.JSON(encoding, nil)
+			prefer = append(prefer, name)
 		}
 	}
 

modules/caddyhttp/encode/gzip/gzip.go

@@ -44,17 +44,16 @@ func (Gzip) CaddyModule() caddy.ModuleInfo {
 
 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens.
 func (g *Gzip) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
-	for d.Next() {
-		if !d.NextArg() {
-			continue
-		}
-		levelStr := d.Val()
-		level, err := strconv.Atoi(levelStr)
-		if err != nil {
-			return err
-		}
-		g.Level = level
+	d.Next() // consume option name
+	if !d.NextArg() {
+		return nil
 	}
+	levelStr := d.Val()
+	level, err := strconv.Atoi(levelStr)
+	if err != nil {
+		return err
+	}
+	g.Level = level
 	return nil
 }