Azure Databricks - Managed Disk Encryption - Critical API Version Cha…

specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/databricks.json

@@ -47,6 +47,9 @@
           },
           "Get a workspace with custom parameters": {
             "$ref": "./examples/WorkspaceGetParameters.json"
+          },
+          "Get a workspace with Customer-Managed Key (CMK) encryption for Managed Disks": {
+            "$ref": "./examples/WorkspaceManagedDiskEncryptionGet.json"
           }
         },
         "parameters": [
@@ -143,6 +146,12 @@
           },
           "Revert Customer-Managed Key (CMK) encryption to Microsoft Managed Keys encryption on a workspace": {
             "$ref": "./examples/DisableEncryption.json"
+          },
+          "Create a workspace with Customer-Managed Key (CMK) encryption for Managed Disks": {
+            "$ref": "./examples/WorkspaceManagedDiskEncryptionCreate.json"
+          },
+          "Update a workspace with Customer-Managed Key (CMK) encryption for Managed Disks": {
+            "$ref": "./examples/WorkspaceManagedDiskEncryptionUpdate.json"
           }
         },
         "parameters": [
@@ -546,7 +555,8 @@
       },
       "put": {
         "tags": [
-          "PUT"
+          "PUT",
+          "PrivateEndpointConnections"
         ],
         "summary": "Update private endpoint connection status",
         "description": "Update the status of a private endpoint connection with the specified name",
@@ -606,7 +616,8 @@
       },
       "delete": {
         "tags": [
-          "DELETE"
+          "DELETE",
+          "PrivateEndpointConnections"
         ],
         "summary": "Remove private endpoint connection",
         "description": "Remove private endpoint connection with the specified name",
@@ -748,6 +759,7 @@
         "authorizations": {
           "description": "The workspace provider authorizations.",
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/WorkspaceProviderAuthorization"
           }
@@ -778,6 +790,14 @@
           "description": "The details of Managed Identity of Storage Account",
           "$ref": "#/definitions/ManagedIdentityConfiguration"
         },
+        "managedDiskIdentity": {
+          "description": "The details of Managed Identity of Disk Encryption Set used for Managed Disk Encryption",
+          "$ref": "#/definitions/ManagedIdentityConfiguration"
+        },
+        "diskEncryptionSetId": {
+          "type": "string",
+          "description": "The resource Id of the managed disk encryption set."
+        },
         "encryption": {
           "type": "object",
           "description": "Encryption properties for databricks workspace",
@@ -1170,6 +1190,11 @@
           "type": "object",
           "description": "Encryption properties for the databricks managed services.",
           "$ref": "#/definitions/EncryptionV2"
+        },
+        "managedDisk": {
+          "type": "object",
+          "description": "Encryption properties for the databricks managed disks.",
+          "$ref": "#/definitions/ManagedDiskEncryption"
         }
       },
       "description": "Encryption entities for databricks workspace resource."
@@ -1215,6 +1240,54 @@
       ],
       "description": "The object that contains details of encryption used on the workspace."
     },
+    "ManagedDiskEncryption": {
+      "type": "object",
+      "properties": {
+        "keySource": {
+          "type": "string",
+          "description": "The encryption keySource (provider). Possible values (case-insensitive):  Microsoft.Keyvault",
+          "enum": [
+            "Microsoft.Keyvault"
+          ],
+          "x-ms-enum": {
+            "name": "EncryptionKeySource",
+            "modelAsString": true
+          }
+        },
+        "keyVaultProperties": {
+          "type": "object",
+          "properties": {
+            "keyVaultUri": {
+              "type": "string",
+              "description": "The URI of KeyVault."
+            },
+            "keyName": {
+              "type": "string",
+              "description": "The name of KeyVault key."
+            },
+            "keyVersion": {
+              "type": "string",
+              "description": "The version of KeyVault key."
+            }
+          },
+          "required": [
+            "keyVaultUri",
+            "keyName",
+            "keyVersion"
+          ],
+          "description": "Key Vault input properties for encryption."
+        },
+        "rotationToLatestKeyVersionEnabled": {
+          "type": "boolean",
+          "description": "Indicate whether the latest key version should be automatically used for Managed Disk Encryption."
+        }
+      },
+      "required": [
+        "keySource",
+        "keyVaultProperties"
+      ],
+      "description": "The object that contains details of encryption used on the workspace."
+    },
     "WorkspaceProviderAuthorization": {
       "properties": {
         "principalId": {
@@ -1284,6 +1357,7 @@
         "details": {
           "description": "error details.",
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/ErrorDetail"
           }
@@ -1360,6 +1434,7 @@
       "properties": {
         "value": {
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/Operation"
           },
@@ -1587,6 +1662,7 @@
         "endpointDetails": {
           "description": "The Ports used when connecting to domainName.",
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/EndpointDetail"
           }
@@ -1628,6 +1704,7 @@
         "endpoints": {
           "description": "The endpoints that Workspace connect to",
           "type": "array",
+          "x-ms-identifiers": [],
           "items": {
             "$ref": "#/definitions/EndpointDependency"
           }
@@ -1637,6 +1714,7 @@
     "OutboundEnvironmentEndpointCollection": {
       "description": "Collection of outbound network dependency endpoints",
       "type": "array",
+      "x-ms-identifiers": [],
       "items": {
         "$ref": "#/definitions/OutboundEnvironmentEndpoint"
       }

specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/PrivateEndpointConnectionsDelete.json

@@ -8,7 +8,13 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Retry-After": "10",
+        "Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/locations/exampleLocation/operationStatuses/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-04-01-preview",
+        "Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/locations/exampleLocation/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-04-01-preview"
+      }
+    },
     "204": {}
   }
 }

specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceDelete.json

@@ -7,7 +7,13 @@
   },
   "responses": {
     "200": {},
-    "202": {},
+    "202": {
+      "headers": {
+        "Retry-After": "10",
+        "Azure-AsyncOperation": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/workspaces/swaggerExample/operationStatus/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-04-01-preview",
+        "Location": "/subscriptions/77777777-b0c6-47a2-b37c-d8e65a629c18/resourceGroups/HelloWorld/providers/Microsoft.Databricks/workspaces/swaggerExample/operationResults/YWUzNDFkMzQtZmM5OS00MmUyLWEzNDMtZGJkMDIxZjlmZjgzOzdmYzBiMzhmLTc2NmItNDM5NS05OWQ1LTVmOGEzNzg4MWQzNA==?api-version=2022-04-01-preview"
+      }
+    },
     "204": {}
   }
 }

specification/databricks/resource-manager/Microsoft.Databricks/preview/2022-04-01-preview/examples/WorkspaceManagedDiskEncryptionCreate.json

@@ -0,0 +1,140 @@
+{
+  "parameters": {
+    "subscriptionId": "subid",
+    "resourceGroupName": "rg",
+    "workspaceName": "myWorkspace",
+    "api-version": "2022-04-01-preview",
+    "parameters": {
+      "properties": {
+        "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
+        "encryption": {
+          "entities": {
+            "managedDisk": {
+              "keySource": "Microsoft.Keyvault",
+              "keyVaultProperties": {
+                "keyVaultUri": "https://test-vault-name.vault.azure.net/",
+                "keyName": "test-cmk-key",
+                "keyVersion": "00000000000000000000000000000000"
+              },
+              "rotationToLatestKeyVersionEnabled": true
+            }
+          }
+        }
+      },
+      "location": "westus"
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
+        "type": "Microsoft.Databricks/workspaces",
+        "location": "East US 2",
+        "tags": null,
+        "sku": {
+          "name": "premium"
+        },
+        "properties": {
+          "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
+          "diskEncryptionSetId": "/subscriptions/subid/resourceGroups/myManagedRG/providers/Microsoft.Compute/diskEncryptionSets/myDiskEncryptionSet",
+          "encryption": {
+            "entities": {
+              "managedDisk": {
+                "keySource": "Microsoft.Keyvault",
+                "keyVaultProperties": {
+                  "keyVaultUri": "https://test-vault-name.vault.azure.net/",
+                  "keyName": "test-cmk-key",
+                  "keyVersion": "00000000000000000000000000000000"
+                },
+                "rotationToLatestKeyVersionEnabled": true
+              }
+            }
+          },
+          "parameters": null,
+          "provisioningState": "Accepted",
+          "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
+          "authorizations": [
+            {
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "roleDefinitionId": "11111111-1111-1111-1111-111111111111"
+            }
+          ],
+          "createdBy": {
+            "oid": "22222222-2222-2222-2222-222222222222",
+            "puid": "33333333",
+            "applicationId": "44444444-4444-4444-4444-444444444444"
+          },
+          "updatedBy": {
+            "oid": "22222222-2222-2222-2222-222222222222",
+            "puid": "33333333",
+            "applicationId": "44444444-4444-4444-4444-444444444444"
+          },
+          "managedDiskIdentity": {
+            "principalId": "22222222-2222-2222-2222-222222222222",
+            "tenantId": "44444444-4444-4444-4444-444444444444",
+            "type": "SystemAssigned"
+          },
+          "createdDateTime": "2020-02-20T00:10:29.2858439Z",
+          "workspaceId": "5555555555555555",
+          "workspaceUrl": "adb-5555555555555555.19.azuredatabricks.net"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "name": "myWorkspace",
+        "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Databricks/workspaces/myWorkspace",
+        "type": "Microsoft.Databricks/workspaces",
+        "location": "East US 2",
+        "tags": {
+          "environment": "dev"
+        },
+        "sku": {
+          "name": "premium"
+        },
+        "properties": {
+          "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG",
+          "diskEncryptionSetId": "/subscriptions/subid/resourceGroups/myManagedRG/providers/Microsoft.Compute/diskEncryptionSets/myDiskEncryptionSet",
+          "encryption": {
+            "entities": {
+              "managedDisk": {
+                "keySource": "Microsoft.Keyvault",
+                "keyVaultProperties": {
+                  "keyVaultUri": "https://test-vault-name.vault.azure.net/",
+                  "keyName": "test-cmk-key",
+                  "keyVersion": "00000000000000000000000000000000"
+                },
+                "rotationToLatestKeyVersionEnabled": true
+              }
+            }
+          },
+          "parameters": null,
+          "provisioningState": "Accepted",
+          "uiDefinitionUri": "https://path/to/workspaceCreateUiDefinition.json",
+          "authorizations": [
+            {
+              "principalId": "00000000-0000-0000-0000-000000000000",
+              "roleDefinitionId": "11111111-1111-1111-1111-111111111111"
+            }
+          ],
+          "createdBy": {
+            "oid": "22222222-2222-2222-2222-222222222222",
+            "puid": "33333333",
+            "applicationId": "44444444-4444-4444-4444-444444444444"
+          },
+          "updatedBy": {
+            "oid": "22222222-2222-2222-2222-222222222222",
+            "puid": "33333333",
+            "applicationId": "44444444-4444-4444-4444-444444444444"
+          },
+          "managedDiskIdentity": {
+            "principalId": "22222222-2222-2222-2222-222222222222",
+            "tenantId": "44444444-4444-4444-4444-444444444444",
+            "type": "SystemAssigned"
+          },
+          "createdDateTime": "2020-02-20T00:10:29.2858439Z"
+        }
+      }
+    }
+  }
+}