Skip to content

Commit

Permalink
Fix/handle initial digit of operation (oapi-codegen#735)
Browse files Browse the repository at this point in the history
* test: internal/test/issues/issue-head-digit-of-operation-id

* fix: escape digit from head of operationId

* chore: add issue.gen.go(head-digit-of-operation-id)

* fix: use typeNamePrefix() to remove head digit

* stop direct writing for less confusion.
* cd ./internal/test; go generate ./...

* chore: make generate with go 1.16.9
  • Loading branch information
masu-mi committed Oct 27, 2022
1 parent f91ab39 commit f0739f5
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
package: head_digit_of_operation_id
generate:
strict-server: true
output: issue.gen.go
output-options:
skip-prune: true
3 changes: 3 additions & 0 deletions internal/test/issues/issue-head-digit-of-operation-id/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package head_digit_of_operation_id

//go:generate go run github.com/deepmap/oapi-codegen/cmd/oapi-codegen --config=config.yaml spec.yaml
23 changes: 23 additions & 0 deletions internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
openapi: 3.0.2
info:
version: "0.0.1"
paths:
/3gpp/foo:
get:
operationId: 3GPPFoo
2 changes: 1 addition & 1 deletion pkg/codegen/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,10 @@ func OperationDefinitions(swagger *openapi3.T) ([]OperationDefinition, error) {
return nil, fmt.Errorf("error generating default OperationID for %s/%s: %s",
opName, requestPath, err)
}
op.OperationID = op.OperationID
} else {
op.OperationID = ToCamelCase(op.OperationID)
}
op.OperationID = typeNamePrefix(op.OperationID) + op.OperationID

// These are parameters defined for the specific path method that
// we're iterating over.
Expand Down

0 comments on commit f0739f5

Please sign in to comment.