diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json index 6716108c7fd0..4fd36a319fcb 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json @@ -45,7 +45,18 @@ }, "provisioningState": "Succeeded", "serviceUrl": null, - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } + } } } }, @@ -65,7 +76,18 @@ }, "provisioningState": "Creating", "serviceUrl": null, - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } } } }, @@ -85,7 +107,18 @@ }, "provisioningState": "Accepted", "serviceUrl": null, - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json index 3ab0794aacc3..7e1ad37f8752 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json @@ -40,7 +40,17 @@ }, "provisioningState": "Succeeded", "serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com", - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json index 478a414c58ba..e8e970ba7843 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json @@ -42,7 +42,17 @@ }, "provisioningState": "Succeeded", "serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com", - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } }, { @@ -59,7 +69,17 @@ }, "provisioningState": "Succeeded", "serviceUrl": "https://workspace1-red.dicom.azurehealthcareapis.com", - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } } ] diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json index b68760c860bb..c64442a26d09 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json @@ -48,7 +48,17 @@ }, "provisioningState": "Succeeded", "serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com", - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } } }, @@ -91,7 +101,17 @@ }, "provisioningState": "Succeeded", "serviceUrl": "https://workspace1-blue.dicom.azurehealthcareapis.com", - "eventState": "Disabled" + "eventState": "Disabled", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json index aad8ca4014d9..b966f3a03e45 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json @@ -14,7 +14,10 @@ }, "kind": "fhir-R4", "identity": { - "type": "SystemAssigned" + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } }, "properties": { "acrConfiguration": { @@ -55,6 +58,11 @@ }, "implementationGuidesConfiguration": { "usCoreMissingData": false + }, + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } } } } @@ -109,7 +117,18 @@ "usCoreMissingData": false }, "eventState": "Disabled", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } } } }, @@ -162,7 +181,12 @@ "usCoreMissingData": false }, "eventState": "Disabled", - "provisioningState": "Creating" + "provisioningState": "Creating", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } } } }, @@ -215,7 +239,18 @@ "usCoreMissingData": false }, "eventState": "Disabled", - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/subid/resourcegroups/testRG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/test-mi": {} + } } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json index 1b9819346dbc..931172806c73 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json @@ -47,7 +47,17 @@ "implementationGuidesConfiguration": { "usCoreMissingData": false }, - "provisioningState": "Creating" + "provisioningState": "Creating", + "encryption": { + "customerManagedKeyEncryption": { + "keyEncryptionKeyUrl": "https://mykeyvault.vault.azure.net/keys/myEncryptionKey/myKeyVersion" + } + } + }, + "identity": { + "principalId": "2f1f372f-edcf-43f5-aedb-173da3cc5c1e", + "tenantId": "abfde7b2-df0f-47e6-aabf-2462b07508dc", + "type": "SystemAssigned" } } } diff --git a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json index cf516a3d3457..abd7f4220f03 100644 --- a/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json +++ b/specification/healthcareapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json @@ -3435,6 +3435,10 @@ "eventState": { "description": "DICOM Service event support status.", "$ref": "#/definitions/ResourceEventState" + }, + "encryption": { + "description": "The encryption settings of the DICOM service", + "$ref": "#/definitions/Encryption" } } }, @@ -3810,6 +3814,10 @@ "implementationGuidesConfiguration": { "description": "Implementation Guides configuration.", "$ref": "#/definitions/ImplementationGuidesConfiguration" + }, + "encryption": { + "description": "The encryption settings of the FHIR service", + "$ref": "#/definitions/Encryption" } } }, @@ -4070,6 +4078,24 @@ }, "readOnly": true }, + "Encryption": { + "description": "Settings to encrypt a service", + "type": "object", + "properties": { + "customerManagedKeyEncryption": { + "type": "object", + "description": "The encryption settings for the customer-managed key", + "readOnly": false, + "properties": { + "keyEncryptionKeyUrl": { + "type": "string", + "description": "The URL of the key to use for encryption", + "readOnly": false + } + } + } + } + }, "PrivateEndpointConnectionListResult": { "type": "object", "properties": {