Skip to content

Commit

Permalink
Update to use unique resource names to avoid collisions; Add Subscrip…
Browse files Browse the repository at this point in the history 
…tionId to ScaleUnits route
  • Loading branch information
@travist13
travist13 committed Jul 29, 2021
1 parent b5b3ae9 commit b0a4db8
Show file tree
Hide file tree
Showing 15 changed files with 230 additions and 561 deletions.
96 changes: 67 additions & 29 deletions .../resource-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"operationId": "Operations_List",
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -40,9 +40,9 @@
}
},
"default": {
"description": "Default 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.).",
"schema": {
"$ref": "#/definitions/ErrorDetails"
"$ref": "Compute.json#/definitions/CrpErrorResponse"
}
}
},
Expand Down Expand Up @@ -79,6 +79,32 @@
},
"x-ms-azure-resource": true
},
"CrpResource": {
"description": "Base resource object.",
"type": "object",
"properties": {
"id": {
"readOnly": true,
"description": "ID of the resource.",
"type": "string"
},
"name": {
"readOnly": true,
"description": "Name of the resource.",
"type": "string"
},
"type": {
"readOnly": true,
"description": "Type of Resource.",
"type": "string"
},
"location": {
"description": "Location of the resource.",
"type": "string"
}
},
"x-ms-azure-resource": true
},
"ProvisioningState": {
"description": "The provisioning state of the resource.",
"enum": [
Expand All @@ -94,6 +120,7 @@
},
"Operation": {
"description": "Describes the supported REST operation.",
"type": "object",
"properties": {
"name": {
"description": "The name of the operation being performed on this particular object. This name should match the name that appears in RBAC or the event service.",
Expand All @@ -112,6 +139,7 @@
},
"Display": {
"description": "Contains the localized display information for this particular operation or action.",
"type": "object",
"properties": {
"provider": {
"description": "The localized, friendly version of the resource provider name. The provider name is expected to include the name of the publisher or company responsible. The provider name format should use title case and begin with \"Microsoft\" for first-party services. For example, the provider name may be\"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"",
Expand All @@ -133,6 +161,7 @@
},
"OperationList": {
"description": "List of Operations",
"type": "object",
"properties": {
"value": {
"description": "Array of operations",
Expand All @@ -147,36 +176,53 @@
}
}
},
"ErrorDetails": {
"description": "Error details.",
"type": "object",
"properties": {
"error": {
"description": "Object containing error details.",
"$ref": "#/definitions/ErrorDetailsInternal"
}
}
},
"ErrorDetailsInternal": {
"description": "Error details.",
"ErrorDetail": {
"description": "The error detail.",
"type": "object",
"properties": {
"code": {
"description": "The error code.",
"readOnly": true,
"type": "string",
"readOnly": true
"description": "The error code."
},
"message": {
"description": "The error message.",
"readOnly": true,
"type": "string",
"readOnly": true
"description": "The error message."
},
"target": {
"description": "The target of the particular error.",
"readOnly": true,
"type": "string",
"readOnly": true
"description": "The error target."
}
}
},
"CrpErrorResponse": {
"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.",
"$ref": "#/definitions/ErrorDetail"
}
}
},
"ErrorAdditionalInfo": {
"type": "object",
"properties": {
"type": {
"readOnly": true,
"type": "string",
"description": "The additional info type."
},
"info": {
"readOnly": true,
"type": "object",
"description": "The additional info."
}
},
"description": "The resource management error additional info."
}
},
"parameters": {
Expand All @@ -187,14 +233,6 @@
"required": true,
"type": "string"
},
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"description": "Client API Version.",
"required": true,
"type": "string",
"default": "2015-12-01-preview"
},
"LocationParameter": {
"description": "Location of the resource.",
"name": "location",
Expand Down
57 changes: 13 additions & 44 deletions ...ce-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/PlatformImages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"$ref": "Compute.json#/parameters/LocationParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -47,9 +47,9 @@
}
},
"default": {
"description": "Default 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.).",
"schema": {
"$ref": "#/definitions/ErrorDetails"
"$ref": "Compute.json#/definitions/CrpErrorResponse"
}
}
}
Expand Down Expand Up @@ -88,7 +88,7 @@
"$ref": "Compute.json#/parameters/VersionParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -99,9 +99,9 @@
}
},
"default": {
"description": "Default 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.).",
"schema": {
"$ref": "#/definitions/ErrorDetails"
"$ref": "Compute.json#/definitions/CrpErrorResponse"
}
}
}
Expand Down Expand Up @@ -138,7 +138,7 @@
"$ref": "Compute.json#/parameters/VersionParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewPlatformImageParameter"
Expand All @@ -164,9 +164,9 @@
}
},
"default": {
"description": "Default 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.).",
"schema": {
"$ref": "#/definitions/ErrorDetails"
"$ref": "Compute.json#/definitions/CrpErrorResponse"
}
}
},
Expand Down Expand Up @@ -204,14 +204,14 @@
"$ref": "Compute.json#/parameters/VersionParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
"default": {
"description": "Default 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.).",
"schema": {
"$ref": "#/definitions/ErrorDetails"
"$ref": "Compute.json#/definitions/CrpErrorResponse"
}
},
"200": {
Expand All @@ -234,7 +234,7 @@
},
"allOf": [
{
"$ref": "Compute.json#/definitions/Resource"
"$ref": "Compute.json#/definitions/CrpResource"
}
]
},
Expand Down Expand Up @@ -331,37 +331,6 @@
"$ref": "#/definitions/PlatformImageProperties"
}
}
},
"ErrorDetails": {
"description": "Error details.",
"type": "object",
"properties": {
"error": {
"description": "Object containing error details.",
"$ref": "#/definitions/ErrorDetailsInternal"
}
}
},
"ErrorDetailsInternal": {
"description": "Error details.",
"type": "object",
"properties": {
"code": {
"description": "The error code.",
"type": "string",
"readOnly": true
},
"message": {
"description": "The error message.",
"type": "string",
"readOnly": true
},
"target": {
"description": "The target of the particular error.",
"type": "string",
"readOnly": true
}
}
}
},
"parameters": {
Expand Down
10 changes: 5 additions & 5 deletions ...n/resource-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/Quotas.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"$ref": "#/parameters/QuotaParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -80,7 +80,7 @@
"$ref": "#/parameters/QuotaParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/NewQuotaParameter"
Expand Down Expand Up @@ -124,7 +124,7 @@
"$ref": "#/parameters/QuotaParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -161,7 +161,7 @@
"$ref": "Compute.json#/parameters/LocationParameter"
},
{
"$ref": "Compute.json#/parameters/ApiVersionParameter"
"$ref": "../../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -191,7 +191,7 @@
},
"allOf": [
{
"$ref": "Compute.json#/definitions/Resource"
"$ref": "Compute.json#/definitions/CrpResource"
}
]
},
Expand Down
Loading

0 comments on commit b0a4db8

Please sign in to comment.