From c1b79a37392463e7a65cb85d64c29f59aae11ab8 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 8 Feb 2021 19:30:38 +0000 Subject: [PATCH] CodeGen from PR 12891 in Azure/azure-rest-api-specs Merge 84cdb945f696615617af98b7a39f5fcac65ceacd into 3227f9795b09642afb975f40d45ed481192b43a2 --- .../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 | 6 +- .../2019-01-01/Microsoft.ApiManagement.json | 2 +- .../Microsoft.ApiManagement.json | 6 +- .../2019-12-01/Microsoft.ApiManagement.json | 2 +- .../Microsoft.ApiManagement.json | 230 +++++++++++++++++- 9 files changed, 238 insertions(+), 16 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..f98e682260 100644 --- a/schemas/2018-06-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2018-06-01-preview/Microsoft.ApiManagement.json @@ -2589,7 +2589,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -2631,7 +2631,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -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..73a93d0578 100644 --- a/schemas/2019-12-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2019-12-01-preview/Microsoft.ApiManagement.json @@ -2743,7 +2743,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -2785,7 +2785,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -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 98ccc4d7d9..fa4f2e0871 100644 --- a/schemas/2020-06-01-preview/Microsoft.ApiManagement.json +++ b/schemas/2020-06-01-preview/Microsoft.ApiManagement.json @@ -111,6 +111,9 @@ { "$ref": "#/definitions/service_policies_childResource" }, + { + "$ref": "#/definitions/service_portalRevisions_childResource" + }, { "$ref": "#/definitions/service_portalsettings_childResource" }, @@ -1225,6 +1228,9 @@ }, { "$ref": "#/definitions/service_gateways_apis_childResource" + }, + { + "$ref": "#/definitions/service_gateways_certificateAuthorities_childResource" } ] } @@ -1285,6 +1291,55 @@ ], "description": "Microsoft.ApiManagement/service/gateways/apis" }, + "service_gateways_certificateAuthorities": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[^*#&+:<>?]+$", + "minLength": 1, + "maxLength": 80 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identifier of the certificate entity. Must be unique in the current API Management service instance." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/GatewayCertificateAuthorityContractProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Gateway certificate authority details." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.ApiManagement/service/gateways/certificateAuthorities" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/gateways/certificateAuthorities" + }, "service_gateways_hostnameConfigurations": { "type": "object", "properties": { @@ -1763,6 +1818,46 @@ ], "description": "Microsoft.ApiManagement/service/policies" }, + "service_portalRevisions": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "type": "string", + "minLength": 1, + "maxLength": 256, + "description": "Portal revision identifier. Must be unique in the current API Management service instance." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PortalRevisionContractProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.ApiManagement/service/portalRevisions" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/portalRevisions" + }, "service_portalsettings": { "type": "object", "oneOf": [ @@ -2937,7 +3032,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -2979,7 +3074,7 @@ "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" } ], - "description": "An value that determines where the API Version identifer will be located in a HTTP request." + "description": "An value that determines where the API Version identifier will be located in a HTTP request." }, "versionQueryName": { "type": "string", @@ -3932,6 +4027,23 @@ }, "description": "Email Template Update Contract properties." }, + "GatewayCertificateAuthorityContractProperties": { + "type": "object", + "properties": { + "isTrusted": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Determines whether certificate authority is trusted." + } + }, + "description": "Gateway certificate authority details." + }, "GatewayContractProperties": { "type": "object", "properties": { @@ -4784,6 +4896,27 @@ }, "description": "Delegation settings contract properties." }, + "PortalRevisionContractProperties": { + "type": "object", + "properties": { + "description": { + "type": "string", + "maxLength": 2000, + "description": "Portal revision description." + }, + "isCurrent": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates if the Portal Revision is public." + } + } + }, "PortalSigninSettingProperties": { "type": "object", "properties": { @@ -4845,7 +4978,7 @@ }, "description": { "type": "string", - "minLength": 1, + "minLength": 0, "maxLength": 1000, "description": "Product description. May include HTML formatting tags." }, @@ -6131,6 +6264,55 @@ ], "description": "Microsoft.ApiManagement/service/gateways/apis" }, + "service_gateways_certificateAuthorities_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^[^*#&+:<>?]+$", + "minLength": 1, + "maxLength": 80 + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Identifier of the certificate entity. Must be unique in the current API Management service instance." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/GatewayCertificateAuthorityContractProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Gateway certificate authority details." + }, + "type": { + "type": "string", + "enum": [ + "certificateAuthorities" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/gateways/certificateAuthorities" + }, "service_gateways_childResource": { "type": "object", "properties": { @@ -6622,6 +6804,46 @@ ], "description": "Microsoft.ApiManagement/service/policies" }, + "service_portalRevisions_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-06-01-preview" + ] + }, + "name": { + "type": "string", + "minLength": 1, + "maxLength": 256, + "description": "Portal revision identifier. Must be unique in the current API Management service instance." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/PortalRevisionContractProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, + "type": { + "type": "string", + "enum": [ + "portalRevisions" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.ApiManagement/service/portalRevisions" + }, "service_portalsettings_childResource": { "type": "object", "oneOf": [ @@ -7494,4 +7716,4 @@ "description": "Properties of server X509Names." } } -} \ No newline at end of file +}