add encryption property

Azure · Nov 8, 2023 · 4bb8132 · 4bb8132
1 parent 7132079
commit 4bb8132
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 13 deletions.
diff --git a/...crosoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Create.json b/...crosoft.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/.../Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Get.json b/.../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/...Microsoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_List.json b/...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/...icrosoft.HealthcareApis/stable/2023-11-01/examples/dicomservices/DicomServices_Patch.json b/...icrosoft.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/...Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Create.json b/...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/...er/Microsoft.HealthcareApis/stable/2023-11-01/examples/fhirservices/FhirServices_Get.json b/...er/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/...careapis/resource-manager/Microsoft.HealthcareApis/stable/2023-11-01/healthcare-apis.json b/...careapis/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": {