Skip to content

Commit

Permalink
Merge pull request Azure#15 from amarzavery/master
Browse files Browse the repository at this point in the history
Merging changes from public repo to private
  • Loading branch information
amarzavery authored Sep 10, 2016
2 parents b1c9695 + 97e069d commit a349987
Show file tree
Hide file tree
Showing 47 changed files with 43,309 additions and 1,679 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ This repository is the canonical source for REST API specifications for Microsof
## Creating the Swagger Specification for Azure
- This [document](./documentation/creating-swagger.md) will help you understand how AutoRest converts Swagger in to code.
- If you are using **swashbuckle** to generate a swagger spec from your .NET WEB API then please take a look at this [repo]( https://github.com/Azure/swashbuckle-resource-provider).
- Swagger spec for every api-version should be in a serate folder named with the api-version.
- It is time consuming to review the file line by line for every api-version. When you are creating the swagger spec for the new api-version, please copy the swagger spec from the previous version in to the new api-versioned folder and commit it. After that overwrite it with the changes for the new api-version. This makes it easy for us to review the changes.

## Directory Structure

Expand Down
2 changes: 1 addition & 1 deletion arm-commerce/2015-06-01-preview/swagger/commerce.json
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
"in": "path",
"required": true,
"type": "string",
"description": "It uniquely identifes Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
"description": "It uniquely identifies Microsoft Azure subscription. The subscription ID forms part of the URI for every service call."
},
"ApiVersionParameter": {
"name": "api-version",
Expand Down
4 changes: 2 additions & 2 deletions arm-compute/compositeComputeClient.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Composite Swagger for Compute Client"
},
"documents": [
"./arm-compute/2016-03-30/swagger/compute.json",
"./arm-compute/2016-03-30/swagger/containerService.json"
"./2016-03-30/swagger/compute.json",
"./2016-03-30/swagger/containerService.json"
]
}
3 changes: 0 additions & 3 deletions arm-compute/quickstart-templates/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,6 @@
]
}
},
"required": [
"mode"
],
"description": "Deployment properties."
},
"Deployment": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,11 @@
],
"properties": {
"columns": {
"$ref": "#/definitions/TypeFieldInfo",
"type": "array",
"readOnly": true,
"items": {
"$ref": "#/definitions/TypeFieldInfo"
},
"description": "the type field information associated with this table type."
}
},
Expand Down
Loading

0 comments on commit a349987

Please sign in to comment.