Skip to content

Commit 9185b25

Browse files
gavinfishgavinfish
authored
Merge pull request #1 from gavinfish/jieshe/discri-tls
Add tls to backend service feature change
2 parents 2a7a26a + 26ef48f commit 9185b25

File tree

7 files changed

+129
-18
lines changed

7 files changed

+129
-18
lines changed

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/appplatform.json‎

Lines changed: 88 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@
17851785
],
17861786
"responses": {
17871787
"200": {
1788-
"description": "Success. The response describe the custom domain resource list of one application.",
1788+
"description": "Success. The response describe the list of certificates in the Service.",
17891789
"schema": {
17901790
"$ref": "#/definitions/CertificateResourceCollection"
17911791
}
@@ -3674,6 +3674,14 @@
36743674
"description": "Indicate if end to end TLS is enabled.",
36753675
"type": "boolean",
36763676
"default": false
3677+
},
3678+
"loadedCertificates": {
3679+
"description": "Collection of loaded certificates",
3680+
"uniqueItems": false,
3681+
"type": "array",
3682+
"items": {
3683+
"$ref": "#/definitions/LoadedCertificate"
3684+
}
36773685
}
36783686
}
36793687
},
@@ -3720,6 +3728,21 @@
37203728
}
37213729
}
37223730
},
3731+
"LoadedCertificate": {
3732+
"description": "Loaded certificate payload",
3733+
"type": "object",
3734+
"properties": {
3735+
"resourceId": {
3736+
"description": "Resource Id of loaded certificate",
3737+
"type": "string"
3738+
},
3739+
"loadTrustStore": {
3740+
"description": "Indicate whether the certificate will be loaded into default trust store, only work for Java runtime.",
3741+
"type": "boolean",
3742+
"default": false
3743+
}
3744+
}
3745+
},
37233746
"AppResourceCollection": {
37243747
"description": "Object that includes an array of App resources and a possible link for next set",
37253748
"type": "object",
@@ -3850,29 +3873,21 @@
38503873
},
38513874
"CertificateProperties": {
38523875
"description": "Certificate resource payload.",
3853-
"required": [
3854-
"vaultUri",
3855-
"keyVaultCertName"
3856-
],
38573876
"type": "object",
38583877
"properties": {
3878+
"type": {
3879+
"description": "The type of the certificate source.",
3880+
"type": "string",
3881+
"x-ms-mutability": [
3882+
"create",
3883+
"read"
3884+
]
3885+
},
38593886
"thumbprint": {
38603887
"description": "The thumbprint of certificate.",
38613888
"type": "string",
38623889
"readOnly": true
38633890
},
3864-
"vaultUri": {
3865-
"description": "The vault uri of user key vault.",
3866-
"type": "string"
3867-
},
3868-
"keyVaultCertName": {
3869-
"description": "The certificate name of key vault.",
3870-
"type": "string"
3871-
},
3872-
"certVersion": {
3873-
"description": "The certificate version of key vault.",
3874-
"type": "string"
3875-
},
38763891
"issuer": {
38773892
"description": "The issuer of certificate.",
38783893
"type": "string",
@@ -3907,7 +3922,62 @@
39073922
},
39083923
"readOnly": true
39093924
}
3910-
}
3925+
},
3926+
"discriminator": "type"
3927+
},
3928+
"KeyVaultCertificateProperties": {
3929+
"description": "Properties of certficate imported from key vault.",
3930+
"required": [
3931+
"type",
3932+
"vaultUri",
3933+
"keyVaultCertName"
3934+
],
3935+
"type": "object",
3936+
"allOf": [
3937+
{
3938+
"$ref": "#/definitions/CertificateProperties"
3939+
}
3940+
],
3941+
"properties": {
3942+
"vaultUri": {
3943+
"description": "The vault uri of user key vault.",
3944+
"type": "string"
3945+
},
3946+
"keyVaultCertName": {
3947+
"description": "The certificate name of key vault.",
3948+
"type": "string"
3949+
},
3950+
"certVersion": {
3951+
"description": "The certificate version of key vault.",
3952+
"type": "string"
3953+
},
3954+
"excludePrivateKey":{
3955+
"description": "Optional. If set to true, it will not import private key from key vault.",
3956+
"type": "boolean",
3957+
"default": false
3958+
}
3959+
},
3960+
"x-ms-discriminator-value": "KeyVaultCertificate"
3961+
},
3962+
"ContentCertificateProperties": {
3963+
"description": "Properties of certficate imported from key vault.",
3964+
"required": [
3965+
"type",
3966+
"content"
3967+
],
3968+
"type": "object",
3969+
"allOf": [
3970+
{
3971+
"$ref": "#/definitions/CertificateProperties"
3972+
}
3973+
],
3974+
"properties": {
3975+
"content": {
3976+
"description": "The content of uploaded certificate.",
3977+
"type": "string"
3978+
}
3979+
},
3980+
"x-ms-discriminator-value": "ContentCertificate"
39113981
},
39123982
"CertificateResourceCollection": {
39133983
"description": "Collection compose of certificate resources list and a possible link for next page.",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Apps_CreateOrUpdate.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@
1515
"sizeInGB": 2,
1616
"mountPath": "mypersistentdisk"
1717
},
18+
"LoadedCertificates": [
19+
{
20+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert1",
21+
"loadTrustStore": false
22+
},
23+
{
24+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert2",
25+
"loadTrustStore": true
26+
}
27+
],
1828
"customPersistentDisks": [
1929
{
2030
"properties": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Apps_Get.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@
2626
"usedInGB": 1,
2727
"mountPath": "mypersistentdisk"
2828
},
29+
"LoadedCertificates": [
30+
{
31+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert1",
32+
"loadTrustStore": false
33+
},
34+
{
35+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert2",
36+
"loadTrustStore": true
37+
}
38+
],
2939
"customPersistentDisks": [
3040
{
3141
"properties": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Apps_List.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@
2727
"usedInGB": 1,
2828
"mountPath": "mypersistentdisk"
2929
},
30+
"LoadedCertificates": [
31+
{
32+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert1",
33+
"loadTrustStore": false
34+
},
35+
{
36+
"resourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/certificates/mycert2",
37+
"loadTrustStore": true
38+
}
39+
],
3040
"customPersistentDisks": [
3141
{
3242
"properties": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Certificates_CreateOrUpdate.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"parameters": {
33
"certificateResource": {
44
"properties": {
5+
"type": "KeyVaultCertificate",
56
"vaultUri": "https://myvault.vault.azure.net",
67
"keyVaultCertName": "mycert",
78
"certVersion": "08a219d06d874795a96db47e06fbb01e"
@@ -17,6 +18,8 @@
1718
"200": {
1819
"body": {
1920
"properties": {
21+
"type": "KeyVaultCertificate",
22+
"excludePrivateKey": false,
2023
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
2124
"vaultUri": "https://myvault.vault.azure.net",
2225
"keyVaultCertName": "mycert",
@@ -40,6 +43,8 @@
4043
"201": {
4144
"body": {
4245
"properties": {
46+
"type": "KeyVaultCertificate",
47+
"excludePrivateKey": false,
4348
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
4449
"vaultUri": "https://myvault.vault.azure.net",
4550
"keyVaultCertName": "mycert",
@@ -63,6 +68,8 @@
6368
"202": {
6469
"body": {
6570
"properties": {
71+
"type": "KeyVaultCertificate",
72+
"excludePrivateKey": false,
6673
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
6774
"vaultUri": "https://myvault.vault.azure.net",
6875
"keyVaultCertName": "mycert",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Certificates_Get.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"200": {
1111
"body": {
1212
"properties": {
13+
"type": "KeyVaultCertificate",
14+
"excludePrivateKey": false,
1315
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
1416
"vaultUri": "https://myvault.vault.azure.net",
1517
"keyVaultCertName": "mycert",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2021-09-01-preview/examples/Certificates_List.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"value": [
1212
{
1313
"properties": {
14+
"type": "KeyVaultCertificate",
15+
"excludePrivateKey": false,
1416
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
1517
"vaultUri": "https://myvault.vault.azure.net",
1618
"keyVaultCertName": "mycert",

0 commit comments

Comments
 (0)