Skip to content

Fix handling of reference types #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
technicianted wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix handling of reference types #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openapiGenerator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ func (g *openapiGenerator) generateMessageSchema(message *protomodel.MessageDesc

for _, field := range message.Fields {
sr := g.fieldTypeRef(field)
o.WithProperty(g.fieldName(field), sr.Value)
o.WithPropertyRef(g.fieldName(field), sr)
}

return o
Expand Down
61 changes: 2 additions & 59 deletions testdata/golden/openapiv3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,53 +35,7 @@
"type": "string"
},
"test2": {
"properties": {
"field1": {
"description": "field1 is a field",
"format": "int32",
"type": "integer"
},
"field10": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"field3": {
"type": "number"
},
"field4": {
"type": "number"
},
"field5": {
"format": "int32",
"type": "integer"
},
"field6": {
"format": "int32",
"type": "integer"
},
"field7": {
"format": "int32",
"type": "integer"
},
"field8": {
"format": "int32",
"type": "integer"
},
"field9": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"str": {
"description": "an array of strings",
"items": {
"type": "string"
},
"type": "array"
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg.Test2"
}
},
"type": "object"
Expand Down Expand Up @@ -235,18 +189,7 @@
"type": "object"
},
"messageOneOfField": {
"description": "messageoneof comment",
"properties": {
"name": {
"type": "string"
},
"number": {
"description": "Valid port number",
"format": "int32",
"type": "integer"
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg2.MessageOneOf"
},
"oneoffield1": {
"type": "string"
Expand Down
61 changes: 2 additions & 59 deletions testdata/golden/testRef/openapiv3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,53 +35,7 @@
"type": "string"
},
"test2": {
"properties": {
"field1": {
"description": "field1 is a field",
"format": "int32",
"type": "integer"
},
"field10": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"field3": {
"type": "number"
},
"field4": {
"type": "number"
},
"field5": {
"format": "int32",
"type": "integer"
},
"field6": {
"format": "int32",
"type": "integer"
},
"field7": {
"format": "int32",
"type": "integer"
},
"field8": {
"format": "int32",
"type": "integer"
},
"field9": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"str": {
"description": "an array of strings",
"items": {
"type": "string"
},
"type": "array"
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg.Test2"
}
},
"type": "object"
Expand Down Expand Up @@ -226,18 +180,7 @@
"type": "object"
},
"messageOneOfField": {
"description": "messageoneof comment",
"properties": {
"name": {
"type": "string"
},
"number": {
"description": "Valid port number",
"format": "int32",
"type": "integer"
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg2.MessageOneOf"
},
"oneoffield1": {
"type": "string"
Expand Down
48 changes: 1 addition & 47 deletions testdata/golden/testpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,53 +35,7 @@
"type": "string"
},
"test2": {
"properties": {
"field1": {
"description": "field1 is a field",
"format": "int32",
"type": "integer"
},
"field10": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"field3": {
"type": "number"
},
"field4": {
"type": "number"
},
"field5": {
"format": "int32",
"type": "integer"
},
"field6": {
"format": "int32",
"type": "integer"
},
"field7": {
"format": "int32",
"type": "integer"
},
"field8": {
"format": "int32",
"type": "integer"
},
"field9": {
"format": "int64",
"type": "integer",
"x-kubernetes-int-or-string": true
},
"str": {
"description": "an array of strings",
"items": {
"type": "string"
},
"type": "array"
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg.Test2"
}
},
"type": "object"
Expand Down
17 changes: 1 addition & 16 deletions testdata/golden/testpkg2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,7 @@
"type": "object"
},
"messageOneOfField": {
"description": "messageoneof comment",
"properties": {
"port": {
"oneOf": [
{
"description": "Valid port number",
"format": "int32",
"type": "integer"
},
{
"type": "string"
}
]
}
},
"type": "object"
"$ref": "#/components/schemas/testpkg2.MessageOneOf"
},
"str": {
"description": "an array of strings",
Expand Down