diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/MoveResourcesPost.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/MoveResourcesPost.json deleted file mode 100644 index c0b3fe732dee..000000000000 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/MoveResourcesPost.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parameters": { - "api-version": "2018-08-20-preview", - "subscriptionId": "subid", - "resourceGroupName": "resourceGroup", - "moveResourcesInputs": { - "targetSubscriptionId": "newSubscriptionId", - "targetResourceGroupName": "newResourceGroup", - "resourceIdsToMove": [ - "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.HealthcareApis/services/service1" - ] - } - }, - "responses": { - "202": {} - } -} diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json index f64fb2404040..432394634ab2 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceCreate.json @@ -16,7 +16,22 @@ { "objectId": "5b307da8-43d4-492b-8b66-b0294ade872f" } - ] + ], + "cosmosDbConfiguration": { + "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false + } } } }, @@ -42,6 +57,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } @@ -67,6 +94,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceGet.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceGet.json index cd19a503e675..08bc75f6c0e8 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceGet.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceGet.json @@ -27,6 +27,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceList.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceList.json index 1bb954eb9eaa..6df13aab9778 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceList.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceList.json @@ -27,6 +27,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceListByResourceGroup.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceListByResourceGroup.json index d814b8550a41..c0f8a9abc692 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceListByResourceGroup.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServiceListByResourceGroup.json @@ -28,6 +28,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServicePatch.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServicePatch.json index 4e358150decc..18ab73972947 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServicePatch.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/examples/ServicePatch.json @@ -36,6 +36,18 @@ ], "cosmosDbConfiguration": { "offerThroughput": 1000 + }, + "authenticationConfiguration": { + "authority": "https://login.microsoftonline.com/common", + "audience": "https://azurehealthcareapis.com", + "smartProxyEnabled": true + }, + "corsConfiguration": { + "origins": ["*"], + "headers": ["*"], + "methods": ["DELETE", "GET", "OPTIONS", "PATCH", "POST", "PUT"], + "maxAge": 1440, + "allowCredentials": false } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json index 9512f0a86092..8f0593080242 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json @@ -392,52 +392,6 @@ "deprecated": false } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthcareApis/moveResources": { - "post": { - "tags": [ - "Proxy" - ], - "description": "Moves resources to another subscription and/or resource group.", - "operationId": "Services_MoveResources", - "x-ms-examples": { - "ServiceList": { - "$ref": "./examples/MoveResourcesPost.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/api-version" - }, - { - "$ref": "#/parameters/subscriptionId" - }, - { - "$ref": "#/parameters/resourceGroupName" - }, - { - "name": "moveResourcesInputs", - "in": "body", - "description": "Set the move resource structure to the name of the service instance to check.", - "required": true, - "schema": { - "$ref": "#/definitions/MoveResourcesParameters" - } - } - ], - "responses": { - "202": { - "description": "Accepted - Move request accepted; the operation will complete asynchronously." - }, - "default": { - "description": "DefaultErrorResponse", - "schema": { - "$ref": "#/definitions/ErrorDetails" - } - } - }, - "deprecated": false - } - }, "/subscriptions/{subscriptionId}/providers/Microsoft.HealthcareApis/locations/{locationName}/operationresults/{operationResultId}": { "get": { "tags": [ @@ -486,55 +440,6 @@ }, "deprecated": false } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.HealthcareApis/locations/{locationName}/moveResourcesStatus/{operationResultId}": { - "get": { - "tags": [ - "Resource" - ], - "description": "Get the operation result for a long running move operation.", - "operationId": "MoveResourcesStatus_Get", - "x-ms-examples": { - "OperationResultsGet": { - "$ref": "./examples/OperationResultsGet.json" - } - }, - "parameters": [ - { - "$ref": "#/parameters/api-version" - }, - { - "$ref": "#/parameters/subscriptionId" - }, - { - "$ref": "#/parameters/locationName" - }, - { - "$ref": "#/parameters/operationResultId" - } - ], - "responses": { - "200": { - "description": "The body contains all of the properties of the operation result.", - "schema": { - "$ref": "#/definitions/OperationResultsDescription" - } - }, - "404": { - "description": "No operation result was found matching operationResultId.", - "schema": { - "$ref": "#/definitions/ErrorDetails" - } - }, - "default": { - "description": "Default error response", - "schema": { - "$ref": "#/definitions/ErrorDetails" - } - } - }, - "deprecated": false - } } }, "definitions": { @@ -569,6 +474,14 @@ "cosmosDbConfiguration": { "$ref": "#/definitions/ServiceCosmosDbConfigurationInfo", "description": "The settings for the Cosmos DB database backing the service." + }, + "authenticationConfiguration": { + "$ref": "#/definitions/ServiceAuthenticationConfigurationInfo", + "description": "The authentication configuration for the service instance." + }, + "corsConfiguration": { + "$ref": "#/definitions/ServiceCorsConfigurationInfo", + "description": "The settings for the CORS configuration of the service instance." } }, "required": [ @@ -603,10 +516,88 @@ "offerThroughput": { "type": "integer", "description": "The provisioned throughput for the backing database.", + "readOnly": false, + "minimum": 400, + "maximum": 10000 + } + } + }, + "ServiceAuthenticationConfigurationInfo": { + "description": "Authentication configuration information", + "type": "object", + "properties": { + "authority": { + "type": "string", + "description": "The authority url for the service", + "readOnly": false + }, + "audience": { + "type": "string", + "description": "The audience url for the service", + "readOnly": false + }, + "smartProxyEnabled": { + "type": "boolean", + "description": "If the SMART on FHIR proxy is enabled", + "readOnly": false + } + } + }, + "ServiceCorsConfigurationInfo": { + "description": "The settings for the CORS configuration of the service instance.", + "type": "object", + "properties": { + "origins": { + "type": "array", + "description": "The origins to be allowed via CORS.", + "readOnly": false, + "items": { + "$ref": "#/definitions/ServiceCorsConfigurationOriginEntry" + } + }, + "headers": { + "type": "array", + "description": "The headers to be allowed via CORS.", + "readOnly": false, + "items": { + "$ref": "#/definitions/ServiceCorsConfigurationHeaderEntry" + } + }, + "methods": { + "type": "array", + "description": "The methods to be allowed via CORS.", + "readOnly": false, + "items": { + "$ref": "#/definitions/ServiceCorsConfigurationMethodEntry" + } + }, + "maxAge": { + "type": "integer", + "description": "The max age to be allowed via CORS.", + "readOnly": false, + "minimum": 0, + "maximum": 99999 + }, + "allowCredentials": { + "type": "boolean", + "description": "If credentials are allowed via CORS.", "readOnly": false } } }, + "ServiceCorsConfigurationOriginEntry": { + "description": "An origin for CORS.", + "type": "string", + "pattern": "^(?:(?:(?:[hH][tT][tT][pP](?:[sS]|))\\:\\/\\/(?:[a-zA-Z0-9-]+[.]?)+(?:\\:[0-9]{1,5})?|[*]))$" + }, + "ServiceCorsConfigurationHeaderEntry": { + "description": "A header for CORS.", + "type": "string" + }, + "ServiceCorsConfigurationMethodEntry": { + "description": "A method for CORS.", + "type": "string" + }, "ServicesDescription": { "description": "The description of the service.", "type": "object", @@ -851,34 +842,6 @@ } } }, - "MoveResourcesParameters": { - "description": "Input values.", - "type": "object", - "properties": { - "targetSubscriptionId": { - "description": "The target subscription to move resources to.", - "type": "string" - }, - "targetResourceGroupName": { - "description": "The target resource group to move resources to.", - "type": "string" - }, - "resourceIdsToMove": { - "description": "The list of resources to move.", - "type": "array", - "minItems": 1, - "maxItems": 250, - "items": { - "type": "string" - } - } - }, - "required": [ - "targetSubscriptionId", - "targetResourceGroupName", - "resourceIdsToMove" - ] - }, "OperationResultsDescription": { "description": "The properties indicating the operation result of an operation on a service.", "type": "object", @@ -927,8 +890,7 @@ "in": "path", "description": "The subscription identifier.", "required": true, - "type": "string", - "format": "uuid" + "type": "string" }, "api-version": { "name": "api-version", diff --git a/specification/healthcareapis/resource-manager/readme.go.md b/specification/healthcareapis/resource-manager/readme.go.md index 9f499c737b1f..59f303cd7ff2 100644 --- a/specification/healthcareapis/resource-manager/readme.go.md +++ b/specification/healthcareapis/resource-manager/readme.go.md @@ -12,14 +12,14 @@ These settings apply only when `--go` is specified on the command line. ``` yaml $(go) && $(multiapi) batch: - - tag: package-2018-08 + - tag: package-2018-08-preview ``` -### Tag: package-2018-08 +### Tag: package-2018-08-preview -These settings apply only when `--tag=package-2018-08 --go` is specified on the command line. +These settings apply only when `--tag=package-2018-08-preview --go` is specified on the command line. Please also specify `--go-sdk-folder=`. -``` yaml $(tag) == 'package-2018-08' && $(go) +``` yaml $(tag) == 'package-2018-08-preview' && $(go) output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2018-08-20-preview/$(namespace) ``` \ No newline at end of file diff --git a/specification/healthcareapis/resource-manager/readme.md b/specification/healthcareapis/resource-manager/readme.md index e94b13939883..cb00819f4447 100644 --- a/specification/healthcareapis/resource-manager/readme.md +++ b/specification/healthcareapis/resource-manager/readme.md @@ -28,16 +28,16 @@ These are the global settings for the HANA on Azure API. title: HealthcareApisManagementClient description: Azure Healthcare APIs Client openapi-type: arm -tag: package-2018-08 +tag: package-2018-08-preview azure-arm: true ``` ### Tag: package-2018-08-preview -These settings apply only when `--tag=package-2018-08` is specified on the command line. +These settings apply only when `--tag=package-2018-08-preview` is specified on the command line. -``` yaml $(tag) == 'package-2018-08' +``` yaml $(tag) == 'package-2018-08-preview' input-file: - Microsoft.HealthcareApis/preview/2018-08-20-preview/healthcare-apis.json ``` @@ -108,15 +108,15 @@ output-folder: $(azure-libraries-for-java-folder)/azure-mgmt-healthcareapis ``` yaml $(java) && $(multiapi) batch: - - tag: package-2018-08 + - tag: package-2018-08-preview ``` -### Tag: package-2018-08 and java +### Tag: package-2018-08-preview and java -These settings apply only when `--tag=package-2018-08 --java` is specified on the command line. +These settings apply only when `--tag=package-2018-08-preview --java` is specified on the command line. Please also specify `--azure-libraries-for-java=`. -``` yaml $(tag) == 'package-2018-08' && $(java) && $(multiapi) +``` yaml $(tag) == 'package-2018-08-preview' && $(java) && $(multiapi) java: namespace: com.microsoft.azure.management.healthcareapis.v2018_08_20_preview output-folder: $(azure-libraries-for-java-folder)/healthcareapis/resource-manager/v2018_08_20_preview diff --git a/specification/healthcareapis/resource-manager/readme.python.md b/specification/healthcareapis/resource-manager/readme.python.md new file mode 100644 index 000000000000..efe1e791be4e --- /dev/null +++ b/specification/healthcareapis/resource-manager/readme.python.md @@ -0,0 +1,27 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. +Use `--python-mode=update` if you already have a setup.py and just want to update the code itself. + +``` yaml $(python) +python-mode: create +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 2 + namespace: azure.mgmt.healthcareapis + package-name: azure-mgmt-healthcareapis + clear-output-folder: true + package-version: 0.1.0 +``` +``` yaml $(python) && $(python-mode) == 'update' +python: + no-namespace-folders: true + output-folder: $(python-sdks-folder)/healthcareapis/azure-mgmt-healthcareapis/azure/mgmt/healthcareapis +``` +``` yaml $(python) && $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/healthcareapis/azure-mgmt-healthcareapis +```