From dbe7dda4b66066af1eaee89c7569ec0f5e26814c Mon Sep 17 00:00:00 2001 From: vfedonkin Date: Tue, 15 Dec 2020 14:47:37 -0800 Subject: [PATCH 1/4] ApiManagement - certificates in backends --- .../preview/2020-06-01-preview/definitions.json | 10 +++++----- .../ApiManagementCreateBackendServiceFabric.json | 6 +++--- .../examples/ApiManagementGetBackend.json | 2 +- .../examples/ApiManagementListBackends.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json index 776c411609f3..8c58f7a75c34 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json @@ -1320,13 +1320,13 @@ }, "BackendCredentialsContract": { "properties": { - "certificate": { + "certificateIds": { "type": "array", "items": { "type": "string" }, "maxItems": 32, - "description": "List of Client Certificate Thumbprint." + "description": "List of Client Certificate Ids." }, "query": { "type": "object", @@ -1417,8 +1417,8 @@ }, "BackendServiceFabricClusterProperties": { "properties": { - "clientCertificatethumbprint": { - "description": "The client certificate thumbprint for the management endpoint.", + "clientCertificateId": { + "description": "The client certificate id for the management endpoint.", "type": "string" }, "maxPartitionResolutionRetries": { @@ -1450,7 +1450,7 @@ }, "required": [ "managementEndpoints", - "clientCertificatethumbprint" + "clientCertificateId" ], "description": "Properties of the Service Fabric Type Backend." }, diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendServiceFabric.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendServiceFabric.json index d15296dc92df..7554eb005b06 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendServiceFabric.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementCreateBackendServiceFabric.json @@ -15,7 +15,7 @@ "managementEndpoints": [ "https://somecluster.com" ], - "clientCertificatethumbprint": "EBA029198AA3E76EF0D70482626E5BCF148594A6", + "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1", "serverX509Names": [ { "name": "ServerCommonName1", @@ -43,7 +43,7 @@ "managementEndpoints": [ "https://somecluster.com" ], - "clientCertificatethumbprint": "EBA029198AA3E76EF0D70482626E5BCF148594A6", + "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1", "serverX509Names": [ { "name": "ServerCommonName1", @@ -70,7 +70,7 @@ "managementEndpoints": [ "https://somecluster.com" ], - "clientCertificatethumbprint": "EBA029198AA3E76EF0D70482626E5BCF148594A6", + "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1", "serverX509Names": [ { "name": "ServerCommonName1", diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetBackend.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetBackend.json index 1c91275b8805..142fd94a588c 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetBackend.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementGetBackend.json @@ -21,7 +21,7 @@ "managementEndpoints": [ "https://somecluster.com" ], - "clientCertificatethumbprint": "EBA029198AA3E76EF0D70482626E5BCF148594A6", + "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1", "serverX509Names": [ { "name": "ServerCommonName1", diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json index fc642e27349f..c83e041cbdf9 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/examples/ApiManagementListBackends.json @@ -60,7 +60,7 @@ "managementEndpoints": [ "https://somecluster.com" ], - "clientCertificatethumbprint": "EBA029198AA3E76EF0D70482626E5BCF148594A6", + "clientCertificateId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/certificates/cert1", "serverX509Names": [ { "name": "ServerCommonName1", From 6b44d6c5cf14b98e1574b35209dbfee34704d2cb Mon Sep 17 00:00:00 2001 From: vfedonkin Date: Mon, 11 Jan 2021 12:37:39 -0800 Subject: [PATCH 2/4] ApiManagement - certificates in backends small fix --- .../preview/2020-06-01-preview/definitions.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json index 8c58f7a75c34..b845e5da6b21 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json @@ -1328,6 +1328,14 @@ "maxItems": 32, "description": "List of Client Certificate Ids." }, + "certificate": { + "type": "array", + "items": { + "type": "string" + }, + "maxItems": 32, + "description": "List of Client Certificate Thumbprints." + }, "query": { "type": "object", "additionalProperties": { @@ -1421,6 +1429,10 @@ "description": "The client certificate id for the management endpoint.", "type": "string" }, + "clientCertificatethumbprint": { + "description": "The client certificate thumbprint for the management endpoint.", + "type": "string" + }, "maxPartitionResolutionRetries": { "description": "Maximum number of retries while attempting resolve the partition.", "format": "int32", From 21bbf2e8c7dbab152b40752b365afbb62b80aef4 Mon Sep 17 00:00:00 2001 From: vfedonkin Date: Tue, 12 Jan 2021 10:05:56 -0800 Subject: [PATCH 3/4] ApiManagement - certificates in backends small fix 2 --- .../preview/2020-06-01-preview/definitions.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json index b845e5da6b21..c44107644fa6 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json @@ -1461,8 +1461,7 @@ } }, "required": [ - "managementEndpoints", - "clientCertificateId" + "managementEndpoints" ], "description": "Properties of the Service Fabric Type Backend." }, From 0a328bb7d70258238b9e58a5c1b3349d3f499c9b Mon Sep 17 00:00:00 2001 From: vfedonkin Date: Tue, 12 Jan 2021 19:03:15 -0800 Subject: [PATCH 4/4] ApiManagement - certificates in backends small fix 3 --- .../preview/2020-06-01-preview/definitions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json index c44107644fa6..04febbe43031 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2020-06-01-preview/definitions.json @@ -1334,7 +1334,7 @@ "type": "string" }, "maxItems": 32, - "description": "List of Client Certificate Thumbprints." + "description": "List of Client Certificate Thumbprints. Will be ignored if certificatesIds are provided." }, "query": { "type": "object", @@ -1430,7 +1430,7 @@ "type": "string" }, "clientCertificatethumbprint": { - "description": "The client certificate thumbprint for the management endpoint.", + "description": "The client certificate thumbprint for the management endpoint. Will be ignored if certificatesIds are provided", "type": "string" }, "maxPartitionResolutionRetries": {