Skip to content

Commit c623509

Browse files
author
msftbot[bot]
authored
[ReleasePR apimanagement] ApiManagement - certificates in backends (#1313)
Create to sync Azure/azure-rest-api-specs#12131 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/apimanagement?expand=1)
2 parents d54e526 + d524655 commit c623509

File tree

9 files changed

+29
-12
lines changed

9 files changed

+29
-12
lines changed

schemas/2016-07-07/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2843,4 +2843,4 @@
28432843
"description": "Configuration of a virtual network to which API Management service is deployed."
28442844
}
28452845
}
2846-
}
2846+
}

schemas/2016-10-10/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3427,4 +3427,4 @@
34273427
"description": "Configuration of a virtual network to which API Management service is deployed."
34283428
}
34293429
}
3430-
}
3430+
}

schemas/2017-03-01/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6460,4 +6460,4 @@
64606460
"description": "Properties of server X509Names."
64616461
}
64626462
}
6463-
}
6463+
}

schemas/2018-01-01/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6513,4 +6513,4 @@
65136513
"description": "Properties of server X509Names."
65146514
}
65156515
}
6516-
}
6516+
}

schemas/2018-06-01-preview/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6668,4 +6668,4 @@
66686668
"description": "Properties of server X509Names."
66696669
}
66706670
}
6671-
}
6671+
}

schemas/2019-01-01/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6580,4 +6580,4 @@
65806580
"description": "Properties of server X509Names."
65816581
}
65826582
}
6583-
}
6583+
}

schemas/2019-12-01-preview/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7019,4 +7019,4 @@
70197019
"description": "Properties of server X509Names."
70207020
}
70217021
}
7022-
}
7022+
}

schemas/2019-12-01/Microsoft.ApiManagement.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7149,4 +7149,4 @@
71497149
"description": "Properties of server X509Names."
71507150
}
71517151
}
7152-
}
7152+
}

schemas/2020-06-01-preview/Microsoft.ApiManagement.json

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3343,7 +3343,21 @@
33433343
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
33443344
}
33453345
],
3346-
"description": "List of Client Certificate Thumbprint."
3346+
"description": "List of Client Certificate Thumbprints. Will be ignored if certificatesIds are provided."
3347+
},
3348+
"certificateIds": {
3349+
"oneOf": [
3350+
{
3351+
"type": "array",
3352+
"items": {
3353+
"type": "string"
3354+
}
3355+
},
3356+
{
3357+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3358+
}
3359+
],
3360+
"description": "List of Client Certificate Ids."
33473361
},
33483362
"header": {
33493363
"oneOf": [
@@ -3427,9 +3441,13 @@
34273441
"BackendServiceFabricClusterProperties": {
34283442
"type": "object",
34293443
"properties": {
3444+
"clientCertificateId": {
3445+
"type": "string",
3446+
"description": "The client certificate id for the management endpoint."
3447+
},
34303448
"clientCertificatethumbprint": {
34313449
"type": "string",
3432-
"description": "The client certificate thumbprint for the management endpoint."
3450+
"description": "The client certificate thumbprint for the management endpoint. Will be ignored if certificatesIds are provided"
34333451
},
34343452
"managementEndpoints": {
34353453
"oneOf": [
@@ -3486,7 +3504,6 @@
34863504
}
34873505
},
34883506
"required": [
3489-
"clientCertificatethumbprint",
34903507
"managementEndpoints"
34913508
],
34923509
"description": "Properties of the Service Fabric Type Backend."
@@ -7477,4 +7494,4 @@
74777494
"description": "Properties of server X509Names."
74787495
}
74797496
}
7480-
}
7497+
}

0 commit comments

Comments
 (0)