fix: 🎨 Minor changes

Author: adrienyhuel

README.md

@@ -33,7 +33,7 @@ Apache Common Log Format. The body of the block accepts the custom `placeholder`
 log {
 	format transform [<template>] {
 		placeholder <string>
-		unescape_strings <bool>
+		unescape_strings
 		# other fields accepted by JSON encoder
 	}
 }

caddyfile.go

@@ -17,8 +17,6 @@ package transformencoder
 import (
 	"strings"
 
-	"strconv"
-
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
 )
 
@@ -49,19 +47,11 @@ func (se *TransformEncoder) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 				d.Delete()
 				d.Delete()
 			case "unescape_strings":
-				// require an argument
-				if !d.NextArg() {
-					return d.ArgErr()
-				}
-				b, err := strconv.ParseBool(d.Val())
-				if nil == err {
-					se.UnescapeStrings = b
-				}
 				if d.NextArg() {
 					return d.ArgErr()
 				}
 				d.Delete()
-				d.Delete()
+				se.UnescapeStrings = true
 			default:
 				d.RemainingArgs() //consume line without getting values
 			}

caddyfile_test.go

@@ -304,7 +304,7 @@ func TestUnmarshalCaddyfile(t *testing.T) {
 			},
 			args: args{
 				d: caddyfile.NewTestDispenser(`transform {
-					unescape_strings true
+					unescape_strings
 				}`),
 			},
 			wantErr: false,
@@ -317,7 +317,7 @@ func TestUnmarshalCaddyfile(t *testing.T) {
 			},
 			args: args{
 				d: caddyfile.NewTestDispenser(`transform "{obj1>obj2>[0]}" {
-					unescape_strings true
+					unescape_strings
 				}`),
 			},
 			wantErr: false,
@@ -337,7 +337,7 @@ func TestUnmarshalCaddyfile(t *testing.T) {
 				d: caddyfile.NewTestDispenser(`transform "{obj1>obj2>[0]}" {
 					time_local
 					placeholder -
-					unescape_strings true
+					unescape_strings
 					time_format iso8601
 				}`),
 			},

formatencoder.go

@@ -158,10 +158,9 @@ func getValue(buf *buffer.Buffer, key string, unescapeStrings bool) (interface{}
 	case jsonparser.String:
 		if !unescapeStrings {
 			return value, true
-		} else {
-			str, _ := jsonparser.ParseString(value)
-			return str, true
 		}
+		str, _ := jsonparser.ParseString(value)
+		return str, true
 	case jsonparser.Array, jsonparser.Boolean, jsonparser.Null, jsonparser.Number, jsonparser.Object, jsonparser.Unknown:
 		// if a value exists, return it as is. A byte is a byte is a byte. The replacer handles them just fine.
 		return value, true

formatencoder_test.go

@@ -33,7 +33,7 @@ func TestEncodeEntry(t *testing.T) {
 		expectedLogString string
 	}{
 		{
-			name: "transform: no args",
+			name: "encode entry: no unescape field",
 			se: TransformEncoder{
 				Encoder:  new(logging.JSONEncoder),
 				Template: "{msg} {username}",
@@ -47,7 +47,7 @@ func TestEncodeEntry(t *testing.T) {
 			expectedLogString: "lob\\nlaw john\\ndoe\n",
 		},
 		{
-			name: "transform: no args",
+			name: "encode entry: unescape field",
 			se: TransformEncoder{
 				Encoder:         new(logging.JSONEncoder),
 				Template:        "{msg} {username}",