Fix/handle initial digit of http header (#733)

masu-mi · web-flow · commit 3bc29a433514 · 2022-09-01T13:42:33.000-07:00
* test: internal/test/issues/issue-head-digit-of-httpheader

* fix: escape head digit from Request Header name

* chore: add issue.gen.go(initial-digit-of-http-header)
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/config.yaml b/internal/test/issues/issue-head-digit-of-httpheader/config.yaml
@@ -0,0 +1,7 @@
+---
+package: head_digit_of_httpheader
+generate:
+  strict-server: true
+output: issue.gen.go
+output-options:
+  skip-prune: true
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/doc.go b/internal/test/issues/issue-head-digit-of-httpheader/doc.go
@@ -0,0 +1,3 @@
+package head_digit_of_httpheader
+
+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go
diff --git a/internal/test/issues/issue-head-digit-of-httpheader/spec.yaml b/internal/test/issues/issue-head-digit-of-httpheader/spec.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.2
+info:
+  version: "0.0.1"
+paths:
+  /foo:
+    get:
+      responses:
+        200:
+          $ref: "#/components/responses/200"
+components:
+  responses:
+    "200":
+      headers:
+        "000-foo":
+          schema:
+            type: string
diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go
@@ -751,7 +751,7 @@ func GenerateResponseDefinitions(operationID string, responses openapi3.Response
 			if err != nil {
 				return nil, fmt.Errorf("error generating response header definition: %w", err)
 			}
-			headerDefinition := ResponseHeaderDefinition{Name: headerName, GoName: ToCamelCase(headerName), Schema: contentSchema}
+			headerDefinition := ResponseHeaderDefinition{Name: headerName, GoName: SchemaNameToTypeName(headerName), Schema: contentSchema}
 			responseHeaderDefinitions = append(responseHeaderDefinitions, headerDefinition)
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+package head_digit_of_httpheader`
	`2`	`+`
	`3`	`+//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml`
Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,7 @@ func GenerateResponseDefinitions(operationID string, responses openapi3.Response`
`751`	`751`	`if err != nil {`
`752`	`752`	`return nil, fmt.Errorf("error generating response header definition: %w", err)`
`753`	`753`	`}`
`754`		`- headerDefinition := ResponseHeaderDefinition{Name: headerName, GoName: ToCamelCase(headerName), Schema: contentSchema}`
	`754`	`+ headerDefinition := ResponseHeaderDefinition{Name: headerName, GoName: SchemaNameToTypeName(headerName), Schema: contentSchema}`
`755`	`755`	`responseHeaderDefinitions = append(responseHeaderDefinitions, headerDefinition)`
`756`	`756`	`}`
`757`	`757`