Skip to content

Commit

Permalink
Update v2/types.json to align with v1/types.json (#12048)
Browse files Browse the repository at this point in the history
* Update types.json

* Update types.json

* Update types.json

* Update types.json

* Update types.json
  • Loading branch information
jianyexi authored Dec 10, 2020
1 parent 87433cf commit 482bb06
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"create",
"update"
],
"description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
"description": "The fully qualified resource ID of the resource that manages this resource. Indicates if this resource is managed by another Azure resource. If this is present, complete mode deployment will not delete the resource if it is removed from the template since it is managed by another resource."
},
"kind": {
"type": "string",
Expand Down
11 changes: 8 additions & 3 deletions specification/common-types/resource-management/v2/types.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"paths": {},
"definitions": {
"Resource": {
"title": "Resource",
"description": "Common fields that are returned in the response for all Azure Resource Manager resources",
"properties": {
"id": {
Expand All @@ -29,6 +30,7 @@
},
"AzureEntityResource": {
"x-ms-client-name": "AzureEntityResource",
"title": "Entity Resource",
"description": "The resource model definition for an Azure Resource Manager resource with an etag.",
"properties": {
"etag": {
Expand All @@ -44,7 +46,8 @@
]
},
"TrackedResource": {
"description": "The resource model definition for an Azure Resource Manager tracked top level resource",
"title": "Tracked Resource",
"description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -77,7 +80,8 @@
]
},
"ProxyResource": {
"description": "The resource model definition for an Azure Resource Manager proxy resource. It will have everything other than required location and tags",
"title": "Proxy Resource",
"description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location",
"allOf": [
{
"$ref": "#/definitions/Resource"
Expand Down Expand Up @@ -207,7 +211,7 @@
"capacity": {
"type": "integer",
"format": "int32",
"description": "If the SKU supports scale out/in then the capacity integer indicates the current scaling-factor of the resource. If scale out/in is not possible for the resource this may be omitted."
"description": "If the SKU supports scale out/in then the capacity integer should be included. If scale out/in is not possible for the resource this may be omitted."
}
},
"required": [
Expand Down Expand Up @@ -332,6 +336,7 @@
"description": "The resource management error additional info."
},
"Operation": {
"title": "REST API Operation",
"description": "Details of a REST API operation, returned from the Resource Provider Operations API",
"type": "object",
"properties": {
Expand Down

0 comments on commit 482bb06

Please sign in to comment.