Skip to content

openapi2conv: fix allOf inside additionalProperties #1103

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

openapi2conv: fix allOf inside additionalProperties #1103

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
8 changes: 8 additions & 0 deletions openapi2conv/openapi2_conv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,14 @@ func convertRefsInV3SchemaRef(from *openapi3.SchemaRef) *openapi3.SchemaRef {
to.Value.Items.Ref = ToV3Ref(to.Value.Items.Ref)
}
to.Value.AdditionalProperties = toV3AdditionalProperties(to.Value.AdditionalProperties)

if len(to.Value.AllOf) > 0 {
allOf := make(openapi3.SchemaRefs, len(to.Value.AllOf))
for i, schemaRef := range to.Value.AllOf {
allOf[i] = convertRefsInV3SchemaRef(schemaRef)
}
to.Value.AllOf = allOf
}
}
return &to
}
Expand Down
81 changes: 81 additions & 0 deletions openapi2conv/openapi2_conv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,87 @@ func TestConvOpenAPIV2ToV3WithNestedAdditionalPropertiesSchemaRef(t *testing.T)
require.Equal(t, "#/components/schemas/Foo", responseSchema.AdditionalProperties.Schema.Value.AdditionalProperties.Schema.Ref)
}

func TestConvOpenAPIV2ToV3WithAllOfInsideAdditionalProperties(t *testing.T) {
v2 := []byte(`
{
"basePath": "/v2",
"host": "test.example.com",
"info": {
"title": "MyAPI",
"version": "0.1"
},
"paths": {
"/v1/objStatus": {
"get": {
"produces": [
"application/json"
],
"responses": {
"200": {
"schema": {
"type": "object",
"properties": {
"result": {
"type": "object",
"additionalProperties": {
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ObjectInfo"
}
],
"additionalProperties": {
"allOf": [
{
"$ref": "#/definitions/ObjectInfo"
}
]
}
}
}
}
},
"description": "Success"
}
}
}
}
},
"definitions": {
"ObjectInfo": {
"type": "object",
"properties": {
"object_id": {
"type": "string",
"format": "uuid"
}
}
}
},
"schemes": [
"http"
],
"swagger": "2.0"
}
`)

var doc2 openapi2.T
err := json.Unmarshal(v2, &doc2)
require.NoError(t, err)

doc3, err := ToV3(&doc2)
require.NoError(t, err)
err = doc3.Validate(context.Background())
require.NoError(t, err)

responseSchema := doc3.Paths.Value("/v1/objStatus").Get.Responses.Value("200").Value.Content.Get("application/json").Schema.Value
require.Equal(t, &openapi3.Types{"object"}, responseSchema.Type)
resultSchema := responseSchema.Properties["result"].Value
require.Equal(t, &openapi3.Types{"object"}, resultSchema.Type)
require.Equal(t, "#/components/schemas/ObjectInfo", resultSchema.AdditionalProperties.Schema.Value.AllOf[0].Ref)
require.Equal(t, "#/components/schemas/ObjectInfo", resultSchema.AdditionalProperties.Schema.Value.AdditionalProperties.Schema.Value.AllOf[0].Ref)
}

const exampleV2 = `
{
"basePath": "/v2",
Expand Down
Loading