Skip to content

Commit 4bb8132

Browse files
jnlycklamajnlycklama
committed
add encryption property
1 parent 7132079 commit 4bb8132

File tree

7 files changed

+167
-13
lines changed

7 files changed

+167
-13
lines changed

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,18 @@
4545
},
4646
"provisioningState": "Succeeded",
4747
"serviceUrl": null,
48-
"eventState": "Disabled"
48+
"eventState": "Disabled",
49+
"encryption": {
50+
"customerManagedKeyEncryption": {
51+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
52+
}
53+
},
54+
"identity": {
55+
"type": "UserAssigned",
56+
"userAssignedIdentities": {
57+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
58+
}
59+
}
4960
}
5061
}
5162
},
@@ -65,7 +76,18 @@
6576
},
6677
"provisioningState": "Creating",
6778
"serviceUrl": null,
68-
"eventState": "Disabled"
79+
"eventState": "Disabled",
80+
"encryption": {
81+
"customerManagedKeyEncryption": {
82+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
83+
}
84+
}
85+
},
86+
"identity": {
87+
"type": "UserAssigned",
88+
"userAssignedIdentities": {
89+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
90+
}
6991
}
7092
}
7193
},
@@ -85,7 +107,18 @@
85107
},
86108
"provisioningState": "Accepted",
87109
"serviceUrl": null,
88-
"eventState": "Disabled"
110+
"eventState": "Disabled",
111+
"encryption": {
112+
"customerManagedKeyEncryption": {
113+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
114+
}
115+
}
116+
},
117+
"identity": {
118+
"type": "UserAssigned",
119+
"userAssignedIdentities": {
120+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
121+
}
89122
}
90123
}
91124
}

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,17 @@
4040
},
4141
"provisioningState": "Succeeded",
4242
"serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com",
43-
"eventState": "Disabled"
43+
"eventState": "Disabled",
44+
"encryption": {
45+
"customerManagedKeyEncryption": {
46+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
47+
}
48+
}
49+
},
50+
"identity": {
51+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
52+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
53+
"type": "SystemAssigned"
4454
}
4555
}
4656
}

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,17 @@
4242
},
4343
"provisioningState": "Succeeded",
4444
"serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com",
45-
"eventState": "Disabled"
45+
"eventState": "Disabled",
46+
"encryption": {
47+
"customerManagedKeyEncryption": {
48+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
49+
}
50+
}
51+
},
52+
"identity": {
53+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
54+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
55+
"type": "SystemAssigned"
4656
}
4757
},
4858
{
@@ -59,7 +69,17 @@
5969
},
6070
"provisioningState": "Succeeded",
6171
"serviceUrl": "https://workspace1-red.dicom.azurehealthcareapis.com",
62-
"eventState": "Disabled"
72+
"eventState": "Disabled",
73+
"encryption": {
74+
"customerManagedKeyEncryption": {
75+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
76+
}
77+
}
78+
},
79+
"identity": {
80+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
81+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
82+
"type": "SystemAssigned"
6383
}
6484
}
6585
]

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,17 @@
4848
},
4949
"provisioningState": "Succeeded",
5050
"serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com",
51-
"eventState": "Disabled"
51+
"eventState": "Disabled",
52+
"encryption": {
53+
"customerManagedKeyEncryption": {
54+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
55+
}
56+
}
57+
},
58+
"identity": {
59+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
60+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
61+
"type": "SystemAssigned"
5262
}
5363
}
5464
},
@@ -91,7 +101,17 @@
91101
},
92102
"provisioningState": "Succeeded",
93103
"serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com",
94-
"eventState": "Disabled"
104+
"eventState": "Disabled",
105+
"encryption": {
106+
"customerManagedKeyEncryption": {
107+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
108+
}
109+
}
110+
},
111+
"identity": {
112+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
113+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
114+
"type": "SystemAssigned"
95115
}
96116
}
97117
}

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
},
1515
"kind": "fhir-R4",
1616
"identity": {
17-
"type": "SystemAssigned"
17+
"type": "UserAssigned",
18+
"userAssignedIdentities": {
19+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
20+
}
1821
},
1922
"properties": {
2023
"acrConfiguration": {
@@ -55,6 +58,11 @@
5558
},
5659
"implementationGuidesConfiguration": {
5760
"usCoreMissingData": false
61+
},
62+
"encryption": {
63+
"customerManagedKeyEncryption": {
64+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
65+
}
5866
}
5967
}
6068
}
@@ -109,7 +117,18 @@
109117
"usCoreMissingData": false
110118
},
111119
"eventState": "Disabled",
112-
"provisioningState": "Succeeded"
120+
"provisioningState": "Succeeded",
121+
"encryption": {
122+
"customerManagedKeyEncryption": {
123+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
124+
}
125+
}
126+
},
127+
"identity": {
128+
"type": "UserAssigned",
129+
"userAssignedIdentities": {
130+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
131+
}
113132
}
114133
}
115134
},
@@ -162,7 +181,12 @@
162181
"usCoreMissingData": false
163182
},
164183
"eventState": "Disabled",
165-
"provisioningState": "Creating"
184+
"provisioningState": "Creating",
185+
"encryption": {
186+
"customerManagedKeyEncryption": {
187+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
188+
}
189+
}
166190
}
167191
}
168192
},
@@ -215,7 +239,18 @@
215239
"usCoreMissingData": false
216240
},
217241
"eventState": "Disabled",
218-
"provisioningState": "Accepted"
242+
"provisioningState": "Accepted",
243+
"encryption": {
244+
"customerManagedKeyEncryption": {
245+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
246+
}
247+
}
248+
},
249+
"identity": {
250+
"type": "UserAssigned",
251+
"userAssignedIdentities": {
252+
"/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {}
253+
}
219254
}
220255
}
221256
}

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,17 @@
4747
"implementationGuidesConfiguration": {
4848
"usCoreMissingData": false
4949
},
50-
"provisioningState": "Creating"
50+
"provisioningState": "Creating",
51+
"encryption": {
52+
"customerManagedKeyEncryption": {
53+
"keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion"
54+
}
55+
}
56+
},
57+
"identity": {
58+
"principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e",
59+
"tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc",
60+
"type": "SystemAssigned"
5161
}
5262
}
5363
}

‎specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3435,6 +3435,10 @@
34353435
"eventState": {
34363436
"description": "DICOM Service event support status.",
34373437
"$ref": "#/definitions/ResourceEventState"
3438+
},
3439+
"encryption": {
3440+
"description": "The encryption settings of the DICOM service",
3441+
"$ref": "#/definitions/Encryption"
34383442
}
34393443
}
34403444
},
@@ -3810,6 +3814,10 @@
38103814
"implementationGuidesConfiguration": {
38113815
"description": "Implementation Guides configuration.",
38123816
"$ref": "#/definitions/ImplementationGuidesConfiguration"
3817+
},
3818+
"encryption": {
3819+
"description": "The encryption settings of the FHIR service",
3820+
"$ref": "#/definitions/Encryption"
38133821
}
38143822
}
38153823
},
@@ -4070,6 +4078,24 @@
40704078
},
40714079
"readOnly": true
40724080
},
4081+
"Encryption": {
4082+
"description": "Settings to encrypt a service",
4083+
"type": "object",
4084+
"properties": {
4085+
"customerManagedKeyEncryption": {
4086+
"type": "object",
4087+
"description": "The encryption settings for the customer-managed key",
4088+
"readOnly": false,
4089+
"properties": {
4090+
"keyEncryptionKeyUrl": {
4091+
"type": "string",
4092+
"description": "The URL of the key to use for encryption",
4093+
"readOnly": false
4094+
}
4095+
}
4096+
}
4097+
}
4098+
},
40734099
"PrivateEndpointConnectionListResult": {
40744100
"type": "object",
40754101
"properties": {

0 commit comments

Comments
 (0)