Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs …
Browse files Browse the repository at this point in the history 
…into formrecognizer_regeneration

* 'master' of https://github.com/Azure/azure-rest-api-specs:
  [Hub Generated] Review request for Microsoft.DigitalTwins to add version stable/2020-10-31 (Azure#10653)
  [SRP] Introduce 2020-08-01-preview version. (Azure#10570)
  Update Readmes for Python for Automanage (Azure#10633)
  Incident entities (Azure#10648)
  Fix Billing Swagger (Azure#10276)
  Connected machine az cli (Azure#10640)
  [Azure Stack] Updates to Azs.AzureBridge.Admin spec (Azure#9035)
  • Loading branch information
@iscai-msft
iscai-msft committed Sep 14, 2020
2 parents 9529562 + 9092e14 commit df27772
Show file tree
Hide file tree
Showing 146 changed files with 21,170 additions and 115 deletions.
4 changes: 1 addition & 3 deletions specification/automanage/resource-manager/readme.python.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ These settings apply only when `--python` is specified on the command line.
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
Use `--python-mode=update` if you already have a setup.py and just want to update the code itself.

``` yaml $(python) && !$(track2)
``` yaml $(python) && !$(track2)
python-mode: create
python:
azure-arm: true
Expand All @@ -29,8 +29,6 @@ no-namespace-folders: true
python:
no-namespace-folders: true
output-folder: $(python-sdks-folder)/automanage/azure-mgmt-automanage/azure/mgmt/automanage
no-namespace-folders: true
output-folder: $(python-sdks-folder)/automanage/azure-mgmt-automanage/azure/mgmt/automanage
```
``` yaml $(python) && $(python-mode) == 'create'
Expand Down
74 changes: 66 additions & 8 deletions ...source-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/Activation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"https"
],
"paths": {
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.AzureBridge.Admin/activations": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureBridge.Admin/activations": {
"get": {
"x-ms-examples": {
"Return product name.": {
Expand All @@ -27,7 +27,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ApiVersionParameter"
Expand All @@ -39,6 +39,12 @@
"schema": {
"$ref": "#/definitions/ActivationResourcesPage"
}
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -52,7 +58,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}": {
"get": {
"x-ms-examples": {
"Return activation name.": {
Expand All @@ -69,7 +75,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -85,8 +91,11 @@
"$ref": "#/definitions/ActivationResource"
}
},
"404": {
"description": "Not Found"
"default": {
"description": "Default Response.",
"schema": {
"$ref": "#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -112,7 +121,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -130,6 +139,12 @@
"schema": {
"$ref": "#/definitions/ActivationResource"
}
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -155,7 +170,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -170,6 +185,15 @@
"schema": {
"$ref": "#/definitions/ActivationResource"
}
},
"204": {
"description": "No Content"
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand Down Expand Up @@ -243,6 +267,40 @@
"description": "URI to the next page."
}
}
},
"ExtendedErrorInfo": {
"type": "object",
"description": "Error response.",
"properties": {
"error": {
"$ref": "#/definitions/ErrorDefinition",
"description": "The error details."
}
}
},
"ErrorDefinition": {
"type": "object",
"description": "Error definition.",
"properties": {
"code": {
"description": "Service specific error code which serves as the substatus for the HTTP error code.",
"type": "string",
"readOnly": true
},
"message": {
"description": "Description of the error.",
"type": "string",
"readOnly": true
},
"details": {
"description": "Internal error details.",
"type": "array",
"items": {
"$ref": "#/definitions/ErrorDefinition"
},
"readOnly": true
}
}
}
},
"parameters": {
Expand Down
34 changes: 15 additions & 19 deletions ...ource-manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/AzureBridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
"schema": {
"$ref": "#/definitions/OperationList"
}
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "Activation.json#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -50,17 +56,14 @@
"type": "object",
"properties": {
"id": {
"readOnly": true,
"description": "URI of the resource.",
"type": "string"
},
"name": {
"readOnly": true,
"description": "Name of the resource.",
"type": "string"
},
"type": {
"readOnly": true,
"description": "Type of resource.",
"type": "string"
},
Expand Down Expand Up @@ -361,8 +364,7 @@
},
"galleryPackageBlobSasUri": {
"description": "The URI to the .azpkg file that provides information required for showing product in the gallery.",
"type": "string",
"readOnly": true
"type": "string"
},
"productDetailsProperties": {
"description": "Specifies additional properties describing the product.",
Expand Down Expand Up @@ -401,8 +403,7 @@
},
"isSystemExtension": {
"description": "Specifies if product is a Virtual Machine Extension.",
"type": "boolean",
"readOnly": true
"type": "boolean"
},
"sourceBlob": {
"description": "Specifies a download location where content can be downloaded from.",
Expand All @@ -412,13 +413,11 @@
},
"supportMultipleExtensions": {
"description": "Indicates if specified product supports multiple extensions.",
"type": "boolean",
"readOnly": true
"type": "boolean"
},
"version": {
"description": "Specifies product version.",
"type": "string",
"readOnly": true
"type": "string"
},
"vmOsType": {
"description": "Specifies operating system used by the product.",
Expand All @@ -427,8 +426,7 @@
},
"vmScaleSetEnabled": {
"description": "Indicates if virtual machine Scale Set is enabled in the specified product.",
"type": "boolean",
"readOnly": true
"type": "boolean"
}
}
},
Expand All @@ -438,8 +436,7 @@
"properties": {
"version": {
"description": "Specifies product version.",
"type": "string",
"readOnly": true
"type": "string"
},
"osDiskImage": {
"description": "OS disk image used by product.",
Expand Down Expand Up @@ -475,8 +472,7 @@
"properties": {
"uri": {
"description": "The URI.",
"type": "string",
"readOnly": true
"type": "string"
}
}
},
Expand Down Expand Up @@ -559,9 +555,9 @@
"type": "string",
"x-ms-parameter-location": "method"
},
"ResourceGroupParameter": {
"ResourceGroupNameParameter": {
"description": "The resource group the resource is located under.",
"name": "resourceGroup",
"name": "resourceGroupName",
"in": "path",
"type": "string",
"required": true,
Expand Down
41 changes: 31 additions & 10 deletions ...manager/azurebridge/Microsoft.AzureBridge.Admin/preview/2016-01-01/DownloadedProduct.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"https"
],
"paths": {
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}/downloadedProducts": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}/downloadedProducts": {
"get": {
"x-ms-examples": {
"Get a list of downloaded products.": {
Expand All @@ -27,7 +27,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -42,6 +42,12 @@
"schema": {
"$ref": "#/definitions/DownloadedProductResourcesPage"
}
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "Activation.json#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -55,7 +61,7 @@
}
}
},
"/subscriptions/{subscriptionId}/resourcegroups/{resourceGroup}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}/downloadedProducts/{productName}": {
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureBridge.Admin/activations/{activationName}/downloadedProducts/{productName}": {
"get": {
"x-ms-examples": {
"Gets the specified downloaded product.": {
Expand All @@ -72,7 +78,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -91,8 +97,11 @@
"$ref": "AzureBridge.json#/definitions/DownloadedProductResource"
}
},
"404": {
"description": "Not Found"
"default": {
"description": "Default Response.",
"schema": {
"$ref": "Activation.json#/definitions/ExtendedErrorInfo"
}
}
},
"produces": [
Expand All @@ -118,7 +127,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -143,8 +152,14 @@
"$ref": "AzureBridge.json#/definitions/DownloadedProductResource"
}
},
"404": {
"description": "Not Found"
"204": {
"description": "No Content"
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "Activation.json#/definitions/ExtendedErrorInfo"
}
}
},
"x-ms-long-running-operation": true,
Expand All @@ -171,7 +186,7 @@
"$ref": "AzureBridge.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ResourceGroupParameter"
"$ref": "AzureBridge.json#/parameters/ResourceGroupNameParameter"
},
{
"$ref": "AzureBridge.json#/parameters/ActivationNameParameter"
Expand All @@ -198,6 +213,12 @@
"schema": {
"$ref": "AzureBridge.json#/definitions/DownloadedProductResource"
}
},
"default": {
"description": "Default Response.",
"schema": {
"$ref": "Activation.json#/definitions/ExtendedErrorInfo"
}
}
},
"x-ms-long-running-operation": true,
Expand Down
Loading

0 comments on commit df27772

Please sign in to comment.