Skip to content

Commit 9899092

Browse files
committed
fixed body_key_ persisting after templating
1 parent 7940342 commit 9899092

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

internals/proxy/middlewares/template.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -150,38 +150,38 @@ func TemplateBody(body map[string]any, headers map[string]any, VARIABLES map[str
150150
var modified bool
151151

152152
// Normalize #Var and @Var to .header_key_Var and .body_key_Var
153-
bodyData, err := normalizeData("@", "body_key_", body)
153+
normalizedBody, err := normalizeData("@", "body_key_", body)
154154

155-
log.Dev("Normalized:\n", jsonutils.ToJson(bodyData))
155+
log.Dev("Normalized:\n", jsonutils.ToJson(normalizedBody))
156156

157157
if err != nil {
158158
return body, false, err
159159
}
160160

161-
headerData, err := normalizeData("#", "header_key_", headers)
161+
normalizedHeaders, err := normalizeData("#", "header_key_", headers)
162162

163163
if err != nil {
164164
return body, false, err
165165
}
166166

167167
// Prefix Body Data with body_key_
168-
bodyData = prefixData("body_key_", bodyData)
168+
prefixedBody := prefixData("body_key_", normalizedBody)
169169

170170
// Prefix Header Data with header_key_
171-
headerData = prefixData("header_key_", headerData)
171+
prefixedHeaders := prefixData("header_key_", normalizedHeaders)
172172

173173
variables := VARIABLES
174174

175-
maps.Copy(variables, bodyData)
176-
maps.Copy(variables, headerData)
175+
maps.Copy(variables, prefixedBody)
176+
maps.Copy(variables, prefixedHeaders)
177177

178-
log.Dev("Body:\n", jsonutils.ToJson(bodyData))
179-
log.Dev("Headers:\n", jsonutils.ToJson(headerData))
178+
log.Dev("Body:\n", jsonutils.ToJson(prefixedBody))
179+
log.Dev("Headers:\n", jsonutils.ToJson(prefixedHeaders))
180180

181-
templatedData, err := templating.RenderJSON("body", body, variables)
181+
templatedData, err := templating.RenderJSON("body", normalizedBody, variables)
182182

183183
if err != nil {
184-
return bodyData, false, err
184+
return body, false, err
185185
}
186186

187187
beforeStr := jsonutils.ToJson(body)

0 commit comments

Comments
 (0)