tools/importer: skip build model if input schema is only for property
#3041
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1861,3 +1861,30 @@ func TestParseModelWithLocation(t *testing.T) { | |
| t.Fatalf("expected example.Fields['Location'] to be a Location but got %q", string(*field.CustomFieldType)) | ||
| } | ||
| } | ||
|
|
||
| func TestParseModelBug2675DuplicateModel(t *testing.T) { | ||
| result, err := ParseSwaggerFileForTesting(t, "models_bug_2675_duplicate_model.json") | ||
| if err != nil { | ||
| t.Fatalf("parsing: %+v", err) | ||
| } | ||
| if result == nil { | ||
| t.Fatal("result was nil") | ||
| } | ||
|
|
||
| example, ok := result.Resources["Example"] | ||
| if !ok { | ||
| t.Fatal("the Resource 'Example' was not found") | ||
| } | ||
|
|
||
| if len(example.Operations) != 3 { | ||
| t.Fatalf("expected the resource `Example` to have 3 operation but got %d", len(example.Operations)) | ||
| } | ||
|
|
||
| if len(example.Models) != 7 { | ||
| t.Fatalf("expected the resource `Example` to have 7 models but got %d", len(example.Models)) | ||
| } | ||
|
|
||
| if _, ok := example.Models["ExampleEnvironmentUpdatePropertiesCreatorRoleAssignment"]; !ok { | ||
| t.Fatalf("expected the resource `Example` to have a model named `ExampleEnvironmentUpdatePropertiesCreatorRoleAssignment` but didn't get one") | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -346,11 +346,11 @@ func (p operationsParser) optionsForOperation(input parsedOperation, logger hclo | |
|
|
||
| // looks like these can be dates etc too | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json- "name": "reportedEndTime", | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json- "in": "query", | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json- "required": true, | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json- "type": "string", | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json: "format": "date-time", | ||
| // ./commerce/resource-manager/Microsoft.Commerce/preview/2015-06-01-preview/commerce.json- "description": "The end of the time range to retrieve data for." | ||
| objectDefinition, err := p.determineObjectDefinitionForOption(param) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("determining field type for operation: %+v", err) | ||
|
|
@@ -417,7 +417,8 @@ func (p operationsParser) requestObjectForOperation(input parsedOperation, known | |
|
|
||
| for _, param := range unexpandedOperation.Parameters { | ||
| if strings.EqualFold(param.In, "body") { | ||
| parsingModel := true | ||
| objectDefinition, result, err := p.swaggerDefinition.parseObjectDefinition(param.Schema.Title, param.Schema.Title, param.Schema, known, parsingModel) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("parsing request object for parameter %q: %+v", param.Name, err) | ||
| } | ||
|
|
@@ -473,7 +474,8 @@ func (p operationsParser) responseObjectForOperation(input parsedOperation, know | |
| continue | ||
| } | ||
|
|
||
| parsingModel := true | ||
| objectDefinition, nestedResult, err := p.swaggerDefinition.parseObjectDefinition(details.ResponseProps.Schema.Title, details.ResponseProps.Schema.Title, details.ResponseProps.Schema, result, parsingModel) | ||
| if err != nil { | ||
| return nil, nil, fmt.Errorf("parsing response object from status code %d: %+v", statusCode, err) | ||
| } | ||
|
|
@@ -520,7 +522,7 @@ type parsedOperation struct { | |
| func (d *SwaggerDefinition) findOperationsMatchingTag(tag *string) *[]parsedOperation { | ||
| result := make([]parsedOperation, 0) | ||
| for httpMethod, operation := range d.swaggerSpecExpanded.Operations() { | ||
| // operation = inferMissingTags(operation, tag) | ||
| for uri, operationDetails := range operation { | ||
| if !operationMatchesTag(operationDetails, tag) { | ||
| continue | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| { | ||
| "swagger": "2.0", | ||
| "info": { | ||
| "title": "Example", | ||
| "description": "Example", | ||
| "version": "2020-01-01" | ||
| }, | ||
| "host": "management.mysite.com", | ||
| "schemes": [ | ||
| "https" | ||
| ], | ||
| "consumes": [ | ||
| "application/json" | ||
| ], | ||
| "produces": [ | ||
| "application/json" | ||
| ], | ||
| "security": [], | ||
| "securityDefinitions": {}, | ||
| "paths": { | ||
| "/environments/{environmentName}": { | ||
| "get": { | ||
| "tags": [ | ||
| "Example" | ||
| ], | ||
| "description": "Gets an example environment.", | ||
| "parameters": [ | ||
| { | ||
| "name": "environmentName", | ||
| "in": "path", | ||
| "required": true, | ||
| "type": "string", | ||
| "x-ms-parameter-location": "method" | ||
| } | ||
| ], | ||
| "operationId": "Example_Get", | ||
| "responses": { | ||
| "200": { | ||
| "description": "OK. The request has succeeded.", | ||
| "schema": { | ||
| "$ref": "#/definitions/ExampleEnvironment" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "put": { | ||
| "tags": [ | ||
| "Example" | ||
| ], | ||
| "description": "Creates or updates an example environment.", | ||
| "parameters": [ | ||
| { | ||
| "name": "environmentName", | ||
| "in": "path", | ||
| "required": true, | ||
| "type": "string", | ||
| "x-ms-parameter-location": "method" | ||
| }, | ||
| { | ||
| "name": "body", | ||
| "in": "body", | ||
| "required": true, | ||
| "schema": { | ||
| "$ref": "#/definitions/ExampleEnvironment" | ||
| } | ||
| } | ||
| ], | ||
| "operationId": "Example_CreateOrUpdate", | ||
| "responses": { | ||
| "200": { | ||
| "description": "Succeeded", | ||
| "schema": { | ||
| "$ref": "#/definitions/ExampleEnvironment" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "patch": { | ||
| "tags": [ | ||
| "Example" | ||
| ], | ||
| "description": "Patches an example environment.", | ||
| "parameters": [ | ||
| { | ||
| "name": "environmentName", | ||
| "in": "path", | ||
| "required": true, | ||
| "type": "string", | ||
| "x-ms-parameter-location": "method" | ||
| }, | ||
| { | ||
| "name": "body", | ||
| "in": "body", | ||
| "description": "Updatable project environment type properties.", | ||
| "required": true, | ||
| "schema": { | ||
| "$ref": "#/definitions/ExampleEnvironmentUpdate" | ||
| } | ||
| } | ||
| ], | ||
| "operationId": "Example_Update", | ||
| "responses": { | ||
| "200": { | ||
| "description": "The resource was updated.", | ||
| "schema": { | ||
| "$ref": "#/definitions/ExampleEnvironment" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "definitions": { | ||
| "ExampleEnvironment": { | ||
| "type": "object", | ||
| "properties": { | ||
| "properties": { | ||
| "x-ms-client-flatten": true, | ||
| "$ref": "#/definitions/ExampleEnvironmentProperties" | ||
| }, | ||
| "location": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| }, | ||
| "ExampleEnvironmentUpdateProperties": { | ||
| "type": "object", | ||
| "properties": { | ||
| "deploymentTargetId": { | ||
| "type": "string" | ||
| }, | ||
| "creatorRoleAssignment": { | ||
| "type": "object", | ||
| "properties": { | ||
| "roles": { | ||
| "type": "object", | ||
| "additionalProperties": { | ||
| "$ref": "#/definitions/EnvironmentRole" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "userRoleAssignments": { | ||
| "type": "object", | ||
| "additionalProperties": { | ||
| "$ref": "#/definitions/UserRoleAssignment" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "ExampleEnvironmentProperties": { | ||
| "type": "object", | ||
| "allOf": [ | ||
| { | ||
| "$ref": "#/definitions/ExampleEnvironmentUpdateProperties" | ||
| } | ||
| ], | ||
| "properties": { | ||
| "provisioningState": { | ||
| "type": "string", | ||
| "readOnly": true | ||
| } | ||
| } | ||
| }, | ||
| "ExampleEnvironmentUpdate": { | ||
| "type": "object", | ||
| "properties": { | ||
| "properties": { | ||
| "x-ms-client-flatten": true, | ||
| "$ref": "#/definitions/ExampleEnvironmentUpdateProperties" | ||
| }, | ||
| "example": { | ||
| "type": "string" | ||
| } | ||
| } | ||
| }, | ||
| "UserRoleAssignment": { | ||
| "type": "object", | ||
| "x-ms-client-name": "userRoleAssignmentValue", | ||
| "properties": { | ||
| "roles": { | ||
| "type": "object", | ||
| "additionalProperties": { | ||
| "$ref": "#/definitions/EnvironmentRole" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "EnvironmentRole": { | ||
| "type": "object", | ||
| "properties": { | ||
| "roleName": { | ||
| "type": "string", | ||
| "readOnly": true | ||
| }, | ||
| "description": { | ||
| "type": "string", | ||
| "readOnly": true | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "parameters": { | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
presumably this should be passing
parsingModelin when looping around? else we'll potentially be passingtruewhen thefalsething:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should always pass a
truehere, because the Schame represented bytopLevelObjectis what the*objectNamewant. that means we can usetopLevelObjectto parse model of*objectName. also as other two calls below, the inner/inheritedModel is corresponding to the modelName, and they should always pass atrue.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Importing the full set of Services there's no difference with this logic, but threading this through causes:
So this looks fine 👍