Merge pull request #334 from tdakkota/fix/string-quoting

fix(gen): parameter name quoting
ogen-go · May 12, 2022 · 5e9bfed · 5e9bfed
2 parents f58827b + 555840b
commit 5e9bfed
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 5 deletions.
diff --git a/...sitive/test_field_with_backtick_name.json → ...data/positive/test_quoted_field_name.json b/...sitive/test_field_with_backtick_name.json → ...data/positive/test_quoted_field_name.json
@@ -5,10 +5,58 @@
     "version": "v0.1.0"
   },
   "paths": {
-    "/healthz": {
+    "/healthz/{`param3}/{\"param4}": {
       "get": {
         "operationId": "probeLiveness",
         "description": "Liveness probe for kubernetes",
+        "parameters": [
+          {
+            "name": "`param1",
+            "in": "query",
+            "style": "form",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "\"param2",
+            "in": "query",
+            "style": "form",
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "`param3",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "\"param4",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "`param5",
+            "in": "header",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "\"param6",
+            "in": "header",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "User info",
@@ -17,7 +65,7 @@
                 "schema": {
                   "type": "object",
                   "required": [
-                    "object with `additionalProperties: { type: object, properties: ... }`",
+                    "object with `additionalProperties: { type: object, properties: ... }`"
                   ],
                   "properties": {
                     "object with `additionalProperties: { type: object, properties: ... }`": {
@@ -33,6 +81,12 @@
                           }
                         }
                       }
+                    },
+                    "`param1": {
+                      "type": "integer"
+                    },
+                    "\"param2": {
+                      "type": "integer"
                     }
                   }
                 }

diff --git a/gen/_template/param_dec.tmpl b/gen/_template/param_dec.tmpl
@@ -27,9 +27,9 @@ func decode{{ $op.Name }}Params(args [{{ $op.PathParamsCount }}]string, r *http.
 	{{- end }}
 	// Decode {{ $loc }}.
 	{{- if $p.Spec.In.Query }}{{/* Switch location */}}
-	{	
+	{
 		cfg := uri.QueryParameterDecodingConfig{
-			Name:    "{{ $p.Spec.Name }}",
+			Name:    {{ quote $p.Spec.Name }},
 			Style:   uri.QueryStyle{{ capitalize $p.Spec.Style.String }},
 			Explode: {{ if $p.Spec.Explode }}true{{ else }}false{{ end }},
 			{{- if isObjectParam $p }}

diff --git a/gen/_template/param_enc.tmpl b/gen/_template/param_enc.tmpl
@@ -32,7 +32,7 @@ q := uri.NewQueryEncoder()
 {
 	// Encode {{ quote $param.Spec.Name }} parameter.
 	cfg := uri.QueryParameterEncodingConfig{
-		Name:    "{{ $param.Spec.Name }}",
+		Name:    {{ quote $param.Spec.Name }},
 		Style:   uri.QueryStyle{{ capitalize $param.Spec.Style.String }},
 		Explode: {{ if $param.Spec.Explode }}true{{ else }}false{{ end }},
 	}