Databricks: double encryption

src/Databricks/Az.Databricks.psd1

@@ -1,7 +1,7 @@
 @{
   GUID = 'b453c0c1-7867-4fa1-9fd0-0cf8f6c6959c'
   RootModule = './Az.Databricks.psm1'
-  ModuleVersion = '0.1.0'
+  ModuleVersion = '0.2.0'
   CompatiblePSEditions = 'Core', 'Desktop'
   Author = 'Microsoft Corporation'
   CompanyName = 'Microsoft Corporation'

src/Databricks/custom/New-AzDatabricksWorkspace.ps1

@@ -71,13 +71,13 @@ function New-AzDatabricksWorkspace {
         [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
         [System.String]
-        # The value which should be used for this field.
+        # The name of the Private Subnet within the Virtual Network.
         ${PrivateSubnetName},
 
         [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
         [System.String]
-        # The value which should be used for this field.
+        # The name of a Public Subnet within the Virtual Network.
         ${PublicSubnetName},
 
         [Parameter()]
@@ -96,15 +96,21 @@ function New-AzDatabricksWorkspace {
         [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
         [System.String]
-        # The value which should be used for this field.
+        # The ID of a Virtual Network where this Databricks Cluster should be created.
         ${VirtualNetworkId},
 
         [Parameter(HelpMessage = "Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.")]
         [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
         [System.Management.Automation.SwitchParameter]
-        # The value which should be used for this field.
+        # Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.
         ${PrepareEncryption},
 
+        [Parameter(ParameterSetName = 'CreateExpanded')]
+        [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
+        [System.Management.Automation.SwitchParameter]
+        # A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest.
+        ${RequireInfrastructureEncryption},
+
         [Parameter()]
         [Alias('AzureRMContext', 'AzureCredential')]
         [ValidateNotNull()]

src/Databricks/custom/Update-AzDatabricksWorkspace.ps1

@@ -54,7 +54,7 @@ function Update-AzDatabricksWorkspace {
         [Parameter(HelpMessage = "Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.")]
         [Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
         [System.Management.Automation.SwitchParameter]
-        # The value which should be used for this field.
+        # Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.
         ${PrepareEncryption},
 
         [Parameter(HelpMessage = "The encryption keySource (provider). Possible values (case-insensitive): Default, Microsoft.Keyvault")]

src/Databricks/docs/New-AzDatabricksWorkspace.md

@@ -15,9 +15,9 @@ Creates a new workspace.
 ```
 New-AzDatabricksWorkspace -Name <String> -ResourceGroupName <String> -Location <String>
  [-SubscriptionId <String>] [-ManagedResourceGroupName <String>] [-PrepareEncryption]
- [-PrivateSubnetName <String>] [-PublicSubnetName <String>] [-Sku <String>] [-Tag <Hashtable>]
- [-VirtualNetworkId <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm] [-WhatIf]
- [<CommonParameters>]
+ [-PrivateSubnetName <String>] [-PublicSubnetName <String>] [-RequireInfrastructureEncryption] [-Sku <String>]
+ [-Tag <Hashtable>] [-VirtualNetworkId <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-Confirm]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -174,7 +174,7 @@ Accept wildcard characters: False
 ```
 
 ### -PrivateSubnetName
-The value which should be used for this field.
+The name of the Private Subnet within the Virtual Network.
 
 ```yaml
 Type: System.String
@@ -189,7 +189,7 @@ Accept wildcard characters: False
 ```
 
 ### -PublicSubnetName
-The value which should be used for this field.
+The name of a Public Subnet within the Virtual Network.
 
 ```yaml
 Type: System.String
@@ -203,6 +203,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -RequireInfrastructureEncryption
+A boolean indicating whether or not the DBFS root file system will be enabled with secondary layer of encryption with platform managed keys for data at rest.
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -ResourceGroupName
 The name of the resource group.
 The name is case insensitive.
@@ -265,7 +280,7 @@ Accept wildcard characters: False
 ```
 
 ### -VirtualNetworkId
-The value which should be used for this field.
+The ID of a Virtual Network where this Databricks Cluster should be created.
 
 ```yaml
 Type: System.String

src/Databricks/readme.md

@@ -51,9 +51,9 @@ require:
   - $(this-folder)/../readme.azure.noprofile.md
 # lock the commit
 input-file:
-  - https://github.com/Azure/azure-rest-api-specs/blob/37a9ad811219323006f37f4a3649e81188f2f1cc/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json
+  - https://github.com/Azure/azure-rest-api-specs/blob/9120c925c8de6840da38365bb8807be2e0e617c0/specification/databricks/resource-manager/Microsoft.Databricks/stable/2018-04-01/databricks.json
 
-module-version: 0.1.0
+module-version: 0.2.0
 title: Databricks
 subject-prefix: $(service-name)
 
@@ -105,6 +105,10 @@ directive:
       parameter-name: ValueKeyVaultUri
     set:
       parameter-name: EncryptionKeyVaultUri
+  - where:
+      parameter-name: RequireInfrastructureEncryptionValue
+    set:
+      parameter-name: RequireInfrastructureEncryption
   # Remove the set-* cmdlet
   - where:
       verb: Set
@@ -153,6 +157,11 @@ directive:
       property-name: PrepareEncryptionValue
     set:
       property-name: PrepareEncryption
+  - where:
+      model-name: Workspace
+      property-name: RequireInfrastructureEncryptionValue
+    set:
+      property-name: RequireInfrastructureEncryption
   # Remove vnet peering cmdlets (not in scope)
   - where:
       subject: VNetPeering

src/Databricks/test/Get-AzDatabricksWorkspace.Tests.ps1

@@ -12,9 +12,7 @@ while(-not $mockingPath) {
 . ($mockingPath | Select-Object -First 1).FullName
 
 Describe 'Get-AzDatabricksWorkspace' {
-    # service team had a bug when listing a lot of workspace items. Skip the case for now
-    # TODO: enable it when the bug is fixed
-    It 'List1' -skip {
+    It 'List1' {
         $workspaces = Get-AzDatabricksWorkspace
         $workspaces.Count | Should -BeGreaterOrEqual 3
     }