Skip to content

Commit 05fe5a1

Browse files
committed
Resolve comments
1 parent 55b9839 commit 05fe5a1

File tree

7 files changed

+53
-9
lines changed

7 files changed

+53
-9
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3666,7 +3666,10 @@
36663666
"type": {
36673667
"description": "The type of the certificate source.",
36683668
"type": "string",
3669-
"readOnly": true
3669+
"x-ms-mutability": [
3670+
"create",
3671+
"read"
3672+
]
36703673
},
36713674
"thumbprint": {
36723675
"description": "The thumbprint of certificate.",
@@ -3736,13 +3739,13 @@
37363739
"description": "The certificate version of key vault.",
37373740
"type": "string"
37383741
},
3739-
"importPrivateKey":{
3740-
"description": "Indicates whether will import private key from key vault.",
3742+
"onlyImportCertificate":{
3743+
"description": "Optional. If set to true, it will not import private key from key vault.",
37413744
"type": "boolean",
3742-
"default": true
3745+
"default": false
37433746
}
37443747
},
3745-
"x-ms-discriminator-value": "KeyVaultCertificateProperties"
3748+
"x-ms-discriminator-value": "KeyVaultCertificate"
37463749
},
37473750
"ContentCertificateProperties": {
37483751
"description": "Properties of certficate imported from key vault.",
@@ -3762,7 +3765,7 @@
37623765
"type": "string"
37633766
}
37643767
},
3765-
"x-ms-discriminator-value": "ContentCertificateProperties"
3768+
"x-ms-discriminator-value": "ContentCertificate"
37663769
},
37673770
"CertificateResourceCollection": {
37683771
"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: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414
"persistentDisk": {
1515
"sizeInGB": 2,
1616
"mountPath": "mypersistentdisk"
17-
}
17+
},
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
},
1929
"identity": null,
2030
"location": "eastus"

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,17 @@
2525
"sizeInGB": 2,
2626
"usedInGB": 1,
2727
"mountPath": "mypersistentdisk"
28-
}
28+
},
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
},
3040
"type": "Microsoft.AppPlatform/Spring/apps",
3141
"identity": {

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,17 @@
2626
"sizeInGB": 2,
2727
"usedInGB": 1,
2828
"mountPath": "mypersistentdisk"
29-
}
29+
},
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
},
3141
"type": "Microsoft.AppPlatform/Spring/apps",
3242
"identity": {

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+
"onlyImportCertificate": 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+
"onlyImportCertificate": 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+
"onlyImportCertificate": 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+
"onlyImportCertificate": 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+
"onlyImportCertificate": false,
1416
"thumbprint": "934367bf1c97033f877db0f15cb1b586957d3133",
1517
"vaultUri": "https://myvault.vault.azure.net",
1618
"keyVaultCertName": "mycert",

0 commit comments

Comments
 (0)