From 7c683f5a5a241138b965117f013d9af75377e740 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 30 Dec 2020 09:42:38 +0000 Subject: [PATCH] CodeGen from PR 11549 in Azure/azure-rest-api-specs Api Management - make /tenant endpoints ARM compliant in 2020-06-01-preview version (#11549) * Adds base for updating Microsoft.ApiManagement from version stable/2019-12-01 to version 2020-06-01-preview * Updates readme * Updates API version in new specs and examples * Add support in API Management for Availability Zones (#10284) * apim in azs * fix prettier check * PATCH should return 200 OK (#10328) * add support for PATCH returning 200 OK * CI fixes prettier fix CI fixes part 2 * Password no longer a mandatory property when uploading Certificates * add missing x-ms-odata extension for filter support * +gatewayhostnameconfiguration protocol changes (#10292) * [2020-06-01-preview] Update Oauth Server secrets Contract (#10602) * Oauth server secrets contract * fix azureMonitor enum * API Management Service Deleted Services Resource (#10607) * API Management Service Deleted Services Resource * Path fix * Lint + custom-words fixes * Location URI parameter for deletedservices Resource * GET for deletedservices by service name * Remove resourceGroupName from resource path * fixes * schema for purge operation * perttier applied * 204 response code added Co-authored-by: REDMOND\glfeokti * OperationNameFormat property added to Diagnostic contract (#10641) * OperationNameFormat property added to Diagnostic contract * add azuremonitor to update contract Co-authored-by: REDMOND\glfeokti * [Microsoft.ApiManagement][2020-06-01-preview] Change Network Status response contract (#10331) * Change Network Status response contract * Update examples for network status contract * ApiManagement - tenant/settings endpoints * ApiManagement - tenant/settings endpoints fix * ApiManagement - tenant/settings endpoints fix prettier * ApiManagement - tenant/settings endpoints fix 3 * ApiManagement - tenant/settings endpoints fix 4 * ApiManagement - tenant/settings endpoints fix 5 Co-authored-by: Samir Solanki Co-authored-by: maksimkim Co-authored-by: promoisha Co-authored-by: REDMOND\glfeokti Co-authored-by: RupengLiu Co-authored-by: vfedonkin --- .../2016-07-07/Microsoft.ApiManagement.json | 2 +- .../2016-10-10/Microsoft.ApiManagement.json | 2 +- .../2017-03-01/Microsoft.ApiManagement.json | 2 +- .../2018-01-01/Microsoft.ApiManagement.json | 2 +- .../Microsoft.ApiManagement.json | 2 +- .../2019-01-01/Microsoft.ApiManagement.json | 2 +- .../Microsoft.ApiManagement.json | 2 +- .../2019-12-01/Microsoft.ApiManagement.json | 2 +- .../Microsoft.ApiManagement.json | 134 +++++++++++++++++- 9 files changed, 141 insertions(+), 9 deletions(-) diff --git a/schemas/2016-07-07/Microsoft.ApiManagement.json b/schemas/2016-07-07/Microsoft.ApiManagement.json index 98c7b51e7b..e0e3d22cac 100644 --- a/schemas/2016-07-07/Microsoft.ApiManagement.json +++ b/schemas/2016-07-07/Microsoft.ApiManagement.json @@ -2843,4 +2843,4 @@ "description": "Configuration of a virtual network to which API Management service is deployed." } } -} \ No newline at end of file +} diff --git a/schemas/2016-10-10/Microsoft.ApiManagement.json b/schemas/2016-10-10/Microsoft.ApiManagement.json index 2c89ee0b06..a4d4f823cc 100644 --- a/schemas/2016-10-10/Microsoft.ApiManagement.json +++ b/schemas/2016-10-10/Microsoft.ApiManagement.json @@ -3427,4 +3427,4 @@ "description": "Configuration of a virtual network to which API Management service is deployed." } } -} \ No newline at end of file +} diff --git a/schemas/2017-03-01/Microsoft.ApiManagement.json b/schemas/2017-03-01/Microsoft.ApiManagement.json index 5587656321..08b7fa9659 100644 --- a/schemas/2017-03-01/Microsoft.ApiManagement.json +++ b/schemas/2017-03-01/Microsoft.ApiManagement.json @@ -6460,4 +6460,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2018-01-01/Microsoft.ApiManagement.json b/schemas/2018-01-01/Microsoft.ApiManagement.json index 8a82e7697e..d50963e7ec 100644 --- a/schemas/2018-01-01/Microsoft.ApiManagement.json +++ b/schemas/2018-01-01/Microsoft.ApiManagement.json @@ -6513,4 +6513,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2018-06-01-preview/Microsoft.ApiManagement.json b/schemas/2018-06-01-preview/Microsoft.ApiManagement.json index 817fbe2094..a862c961b7 100644 --- a/schemas/2018-06-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2018-06-01-preview/Microsoft.ApiManagement.json @@ -6668,4 +6668,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2019-01-01/Microsoft.ApiManagement.json b/schemas/2019-01-01/Microsoft.ApiManagement.json index 1723530313..8cb757a6ea 100644 --- a/schemas/2019-01-01/Microsoft.ApiManagement.json +++ b/schemas/2019-01-01/Microsoft.ApiManagement.json @@ -6580,4 +6580,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2019-12-01-preview/Microsoft.ApiManagement.json b/schemas/2019-12-01-preview/Microsoft.ApiManagement.json index ef8e13ec6d..1adcfe33e0 100644 --- a/schemas/2019-12-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2019-12-01-preview/Microsoft.ApiManagement.json @@ -7019,4 +7019,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2019-12-01/Microsoft.ApiManagement.json b/schemas/2019-12-01/Microsoft.ApiManagement.json index 2ed1259f48..22cc5e971f 100644 --- a/schemas/2019-12-01/Microsoft.ApiManagement.json +++ b/schemas/2019-12-01/Microsoft.ApiManagement.json @@ -7149,4 +7149,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +} diff --git a/schemas/2020-06-01-preview/Microsoft.ApiManagement.json b/schemas/2020-06-01-preview/Microsoft.ApiManagement.json index 3e87d5dbde..1650712fe0 100644 --- a/schemas/2020-06-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2020-06-01-preview/Microsoft.ApiManagement.json @@ -120,6 +120,9 @@ { "$ref": "#/definitions/service_subscriptions_childResource" }, + { + "$ref": "#/definitions/service_tenant_childResource" + }, { "$ref": "#/definitions/service_users_childResource" } @@ -2241,6 +2244,56 @@ ], "description": "Microsoft.ApiManagement/service/templates" }, + "service_tenant": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "enum": [ + "access", + "getAccess" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identifier of the Access configuration." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AccessInformationCreateParameterProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tenant access information update parameters of the API Management service" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.ApiManagement/service/tenant" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/tenant" + }, "service_users": { "type": "object", "properties": { @@ -2284,6 +2337,35 @@ } }, "definitions": { + "AccessInformationCreateParameterProperties": { + "type": "object", + "properties": { + "enabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Determines whether direct access is enabled." + }, + "primaryKey": { + "type": "string", + "description": "Primary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value." + }, + "principalId": { + "type": "string", + "description": "Principal (User) Identifier." + }, + "secondaryKey": { + "type": "string", + "description": "Secondary access key. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value." + } + }, + "description": "Tenant access information update parameters of the API Management service" + }, "AdditionalLocation": { "type": "object", "properties": { @@ -6965,6 +7047,56 @@ ], "description": "Microsoft.ApiManagement/service/templates" }, + "service_tenant_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "enum": [ + "access", + "getAccess" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identifier of the Access configuration." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AccessInformationCreateParameterProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Tenant access information update parameters of the API Management service" + }, + "type": { + "type": "string", + "enum": [ + "tenant" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/tenant" + }, "service_users_childResource": { "type": "object", "properties": { @@ -7345,4 +7477,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +}