Skip to content

Commit

Permalink
fix missing type object issues (Azure#14773)
Browse files Browse the repository at this point in the history 
* fix missing type object issues

* fix in privatelink

Co-authored-by: jianye xi <jianyxi@microsoft.com>
  • Loading branch information
@jianyexi @mkarmark
2 people authored and mkarmark committed Jul 20, 2021
1 parent 3bbcc79 commit 20c9cc9
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 0 deletions.
8 changes: 8 additions & 0 deletions specification/common-types/resource-management/v1/privatelinks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"paths": {},
"definitions": {
"PrivateEndpoint": {
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand All @@ -17,6 +18,7 @@
"description": "The Private Endpoint resource."
},
"PrivateEndpointConnection": {
"type": "object",
"properties": {
"properties": {
"$ref": "#/definitions/PrivateEndpointConnectionProperties",
Expand All @@ -32,6 +34,7 @@
"description": "The Private Endpoint Connection resource."
},
"PrivateEndpointConnectionProperties": {
"type": "object",
"properties": {
"privateEndpoint": {
"$ref": "#/definitions/PrivateEndpoint",
Expand All @@ -52,6 +55,7 @@
"description": "Properties of the PrivateEndpointConnectProperties."
},
"PrivateLinkServiceConnectionState": {
"type": "object",
"properties": {
"status": {
"$ref": "#/definitions/PrivateEndpointServiceConnectionStatus",
Expand Down Expand Up @@ -97,6 +101,7 @@
}
},
"PrivateLinkResource": {
"type": "object",
"properties": {
"properties": {
"$ref": "#/definitions/PrivateLinkResourceProperties",
Expand All @@ -112,6 +117,7 @@
"description": "A private link resource"
},
"PrivateLinkResourceProperties": {
"type": "object",
"properties": {
"groupId": {
"description": "The private link resource group id.",
Expand All @@ -137,6 +143,7 @@
"description": "Properties of a private link resource."
},
"PrivateEndpointConnectionListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
Expand All @@ -149,6 +156,7 @@
"description": "List of private endpoint connection associated with the specified storage account"
},
"PrivateLinkResourceListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
Expand Down
12 changes: 12 additions & 0 deletions specification/common-types/resource-management/v1/types.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"Resource": {
"title": "Resource",
"description": "Common fields that are returned in the response for all Azure Resource Manager resources",
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand All @@ -32,6 +33,7 @@
"x-ms-client-name": "AzureEntityResource",
"title": "Entity Resource",
"description": "The resource model definition for an Azure Resource Manager resource with an etag.",
"type": "object",
"properties": {
"etag": {
"type": "string",
Expand All @@ -48,6 +50,7 @@
"TrackedResource": {
"title": "Tracked Resource",
"description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'",
"type": "object",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -82,6 +85,7 @@
"ProxyResource": {
"title": "Proxy Resource",
"description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
Expand All @@ -90,6 +94,7 @@
},
"ResourceModelWithAllowedPropertySet": {
"description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.",
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand Down Expand Up @@ -181,6 +186,7 @@
},
"Sku": {
"description": "The resource model definition representing SKU",
"type": "object",
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -220,6 +226,7 @@
},
"Identity": {
"description": "Identity for the resource.",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
Expand All @@ -245,6 +252,7 @@
}
},
"Plan": {
"type": "object",
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -277,6 +285,7 @@
"ErrorResponse": {
"title": "Error Response",
"description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.)",
"type": "object",
"properties": {
"code": {
"readOnly": true,
Expand Down Expand Up @@ -312,6 +321,7 @@
}
},
"ErrorAdditionalInfo": {
"type": "object",
"properties": {
"type": {
"readOnly": true,
Expand Down Expand Up @@ -343,6 +353,7 @@
},
"display": {
"description": "Localized display information for this particular operation.",
"type": "object",
"properties": {
"provider": {
"description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".",
Expand Down Expand Up @@ -396,6 +407,7 @@
},
"OperationListResult": {
"description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.",
"type": "object",
"properties": {
"value": {
"type": "array",
Expand Down
8 changes: 8 additions & 0 deletions specification/common-types/resource-management/v2/privatelinks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"paths": {},
"definitions": {
"PrivateEndpoint": {
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand All @@ -17,6 +18,7 @@
"description": "The Private Endpoint resource."
},
"PrivateEndpointConnection": {
"type": "object",
"properties": {
"properties": {
"$ref": "#/definitions/PrivateEndpointConnectionProperties",
Expand All @@ -32,6 +34,7 @@
"description": "The Private Endpoint Connection resource."
},
"PrivateEndpointConnectionProperties": {
"type": "object",
"properties": {
"privateEndpoint": {
"$ref": "#/definitions/PrivateEndpoint",
Expand All @@ -52,6 +55,7 @@
"description": "Properties of the PrivateEndpointConnectProperties."
},
"PrivateLinkServiceConnectionState": {
"type": "object",
"properties": {
"status": {
"$ref": "#/definitions/PrivateEndpointServiceConnectionStatus",
Expand Down Expand Up @@ -97,6 +101,7 @@
}
},
"PrivateLinkResource": {
"type": "object",
"properties": {
"properties": {
"$ref": "#/definitions/PrivateLinkResourceProperties",
Expand All @@ -112,6 +117,7 @@
"description": "A private link resource"
},
"PrivateLinkResourceProperties": {
"type": "object",
"properties": {
"groupId": {
"description": "The private link resource group id.",
Expand All @@ -137,6 +143,7 @@
"description": "Properties of a private link resource."
},
"PrivateEndpointConnectionListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
Expand All @@ -149,6 +156,7 @@
"description": "List of private endpoint connection associated with the specified storage account"
},
"PrivateLinkResourceListResult": {
"type": "object",
"properties": {
"value": {
"type": "array",
Expand Down
13 changes: 13 additions & 0 deletions specification/common-types/resource-management/v2/types.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"Resource": {
"title": "Resource",
"description": "Common fields that are returned in the response for all Azure Resource Manager resources",
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand All @@ -32,6 +33,7 @@
"x-ms-client-name": "AzureEntityResource",
"title": "Entity Resource",
"description": "The resource model definition for an Azure Resource Manager resource with an etag.",
"type": "object",
"properties": {
"etag": {
"type": "string",
Expand All @@ -48,6 +50,7 @@
"TrackedResource": {
"title": "Tracked Resource",
"description": "The resource model definition for an Azure Resource Manager tracked top level resource which has 'tags' and a 'location'",
"type": "object",
"properties": {
"tags": {
"type": "object",
Expand Down Expand Up @@ -82,6 +85,7 @@
"ProxyResource": {
"title": "Proxy Resource",
"description": "The resource model definition for a Azure Resource Manager proxy resource. It will not have tags and a location",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Resource"
Expand All @@ -90,6 +94,7 @@
},
"ResourceModelWithAllowedPropertySet": {
"description": "The resource model definition containing the full set of allowed properties for a resource. Except properties bag, there cannot be a top level property outside of this set.",
"type": "object",
"properties": {
"id": {
"readOnly": true,
Expand Down Expand Up @@ -181,6 +186,7 @@
},
"Sku": {
"description": "The resource model definition representing SKU",
"type": "object",
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -220,6 +226,7 @@
},
"Identity": {
"description": "Identity for the resource.",
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
Expand All @@ -245,6 +252,7 @@
}
},
"Plan": {
"type": "object",
"properties": {
"name": {
"type": "string",
Expand Down Expand Up @@ -276,6 +284,7 @@
},
"ErrorDetail": {
"description": "The error detail.",
"type": "object",
"properties": {
"code": {
"readOnly": true,
Expand Down Expand Up @@ -313,6 +322,7 @@
"ErrorResponse": {
"title": "Error response",
"description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).",
"type": "object",
"properties": {
"error": {
"description": "The error object.",
Expand All @@ -321,6 +331,7 @@
}
},
"ErrorAdditionalInfo": {
"type": "object",
"properties": {
"type": {
"readOnly": true,
Expand Down Expand Up @@ -352,6 +363,7 @@
},
"display": {
"description": "Localized display information for this particular operation.",
"type": "object",
"properties": {
"provider": {
"description": "The localized friendly form of the resource provider name, e.g. \"Microsoft Monitoring Insights\" or \"Microsoft Compute\".",
Expand Down Expand Up @@ -405,6 +417,7 @@
},
"OperationListResult": {
"description": "A list of REST API operations supported by an Azure Resource Provider. It contains an URL link to get the next set of results.",
"type": "object",
"properties": {
"value": {
"type": "array",
Expand Down

0 comments on commit 20c9cc9

Please sign in to comment.