Skip to content

Commit 7bb52e1

Browse files
isra-feldingmeng-xue
isra-fel
and
dingmeng-xue
authored
[Databricks] DBFS Double Encryption Support (#12522)
* generate databricks * format doc * changelog * Roll back version update * Delete Az.Databricks-TestResults.xml Co-authored-by: Dingmeng Xue <[email protected]>
1 parent 2a1e7d7 commit 7bb52e1

File tree

75 files changed

+6392
-1899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+6392
-1899
lines changed

‎src/Databricks/Az.Databricks.format.ps1xml‎

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
</ViewSelectedBy>
99
<TableControl>
1010
<TableHeaders>
11+
<TableColumnHeader>
12+
<Label>PeeringName</Label>
13+
</TableColumnHeader>
1114
<TableColumnHeader>
1215
<Label>ResourceGroupName</Label>
1316
</TableColumnHeader>
@@ -21,6 +24,9 @@
2124
<TableRowEntries>
2225
<TableRowEntry>
2326
<TableColumnItems>
27+
<TableColumnItem>
28+
<PropertyName>PeeringName</PropertyName>
29+
</TableColumnItem>
2430
<TableColumnItem>
2531
<PropertyName>ResourceGroupName</PropertyName>
2632
</TableColumnItem>
@@ -35,6 +41,28 @@
3541
</TableRowEntries>
3642
</TableControl>
3743
</View>
44+
<View>
45+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.AddressSpace</Name>
46+
<ViewSelectedBy>
47+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.AddressSpace</TypeName>
48+
</ViewSelectedBy>
49+
<TableControl>
50+
<TableHeaders>
51+
<TableColumnHeader>
52+
<Label>AddressPrefix</Label>
53+
</TableColumnHeader>
54+
</TableHeaders>
55+
<TableRowEntries>
56+
<TableRowEntry>
57+
<TableColumnItems>
58+
<TableColumnItem>
59+
<PropertyName>AddressPrefix</PropertyName>
60+
</TableColumnItem>
61+
</TableColumnItems>
62+
</TableRowEntry>
63+
</TableRowEntries>
64+
</TableControl>
65+
</View>
3866
<View>
3967
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.CreatedBy</Name>
4068
<ViewSelectedBy>
@@ -401,6 +429,108 @@
401429
</TableRowEntries>
402430
</TableControl>
403431
</View>
432+
<View>
433+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeering</Name>
434+
<ViewSelectedBy>
435+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeering</TypeName>
436+
</ViewSelectedBy>
437+
<TableControl>
438+
<TableHeaders>
439+
<TableColumnHeader>
440+
<Label>Name</Label>
441+
</TableColumnHeader>
442+
<TableColumnHeader>
443+
<Label>Type</Label>
444+
</TableColumnHeader>
445+
</TableHeaders>
446+
<TableRowEntries>
447+
<TableRowEntry>
448+
<TableColumnItems>
449+
<TableColumnItem>
450+
<PropertyName>Name</PropertyName>
451+
</TableColumnItem>
452+
<TableColumnItem>
453+
<PropertyName>Type</PropertyName>
454+
</TableColumnItem>
455+
</TableColumnItems>
456+
</TableRowEntry>
457+
</TableRowEntries>
458+
</TableControl>
459+
</View>
460+
<View>
461+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeeringList</Name>
462+
<ViewSelectedBy>
463+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeeringList</TypeName>
464+
</ViewSelectedBy>
465+
<TableControl>
466+
<TableHeaders>
467+
<TableColumnHeader>
468+
<Label>NextLink</Label>
469+
</TableColumnHeader>
470+
</TableHeaders>
471+
<TableRowEntries>
472+
<TableRowEntry>
473+
<TableColumnItems>
474+
<TableColumnItem>
475+
<PropertyName>NextLink</PropertyName>
476+
</TableColumnItem>
477+
</TableColumnItems>
478+
</TableRowEntry>
479+
</TableRowEntries>
480+
</TableControl>
481+
</View>
482+
<View>
483+
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeeringPropertiesFormat</Name>
484+
<ViewSelectedBy>
485+
<TypeName>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.VirtualNetworkPeeringPropertiesFormat</TypeName>
486+
</ViewSelectedBy>
487+
<TableControl>
488+
<TableHeaders>
489+
<TableColumnHeader>
490+
<Label>AllowForwardedTraffic</Label>
491+
</TableColumnHeader>
492+
<TableColumnHeader>
493+
<Label>AllowGatewayTransit</Label>
494+
</TableColumnHeader>
495+
<TableColumnHeader>
496+
<Label>AllowVirtualNetworkAccess</Label>
497+
</TableColumnHeader>
498+
<TableColumnHeader>
499+
<Label>PeeringState</Label>
500+
</TableColumnHeader>
501+
<TableColumnHeader>
502+
<Label>ProvisioningState</Label>
503+
</TableColumnHeader>
504+
<TableColumnHeader>
505+
<Label>UseRemoteGateway</Label>
506+
</TableColumnHeader>
507+
</TableHeaders>
508+
<TableRowEntries>
509+
<TableRowEntry>
510+
<TableColumnItems>
511+
<TableColumnItem>
512+
<PropertyName>AllowForwardedTraffic</PropertyName>
513+
</TableColumnItem>
514+
<TableColumnItem>
515+
<PropertyName>AllowGatewayTransit</PropertyName>
516+
</TableColumnItem>
517+
<TableColumnItem>
518+
<PropertyName>AllowVirtualNetworkAccess</PropertyName>
519+
</TableColumnItem>
520+
<TableColumnItem>
521+
<PropertyName>PeeringState</PropertyName>
522+
</TableColumnItem>
523+
<TableColumnItem>
524+
<PropertyName>ProvisioningState</PropertyName>
525+
</TableColumnItem>
526+
<TableColumnItem>
527+
<PropertyName>UseRemoteGateway</PropertyName>
528+
</TableColumnItem>
529+
</TableColumnItems>
530+
</TableRowEntry>
531+
</TableRowEntries>
532+
</TableControl>
533+
</View>
404534
<View>
405535
<Name>Microsoft.Azure.PowerShell.Cmdlets.Databricks.Models.Api20180401.Workspace</Name>
406536
<ViewSelectedBy>

‎src/Databricks/Az.Databricks.psd1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 6/17/2020
6+
# Generated on: 2020/7/29
77
#
88

99
@{
@@ -45,7 +45,7 @@ PowerShellVersion = '5.1'
4545
DotNetFrameworkVersion = '4.7.2'
4646

4747
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48-
# CLRVersion = ''
48+
# ClrVersion = ''
4949

5050
# Processor architecture (None, X86, Amd64) required by this module
5151
# ProcessorArchitecture = ''
@@ -108,7 +108,7 @@ PrivateData = @{
108108
# IconUri = ''
109109

110110
# ReleaseNotes of this module
111-
ReleaseNotes = '* Added support for customer-managed keys.'
111+
# ReleaseNotes = ''
112112

113113
# Prerelease string of this module
114114
# Prerelease = ''

‎src/Databricks/Az.Databricks.psm1‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
}
2525
}
2626
if(-not $accountsModule) {
27-
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
27+
$hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
2828
if($hasAdequateVersion) {
29-
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
29+
$accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
3030
}
3131
}
3232
}
3333

3434
if(-not $accountsModule) {
35-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36-
} elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
37-
Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
35+
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
36+
} elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
37+
Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
3838
}
3939
Write-Information "Loaded Module '$($accountsModule.Name)'"
4040

‎src/Databricks/ChangeLog.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Added support for DBFS Double Encryption Support
2122

2223
## Version 0.1.1
23-
* Added support for customer-managed keys.
24+
* Added support for customer-managed keys
2425

2526
## Version 0.1.0
2627
* the first preview release

‎src/Databricks/check-dependencies.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if(Test-Path -Path $localModulesPath) {
4646
$env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
4747
}
4848

49-
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.7.4'
49+
DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
5050
DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
5151

5252
$tools = Join-Path $PSScriptRoot 'tools'

‎src/Databricks/custom/New-AzDatabricksWorkspace.ps1‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ function New-AzDatabricksWorkspace {
7171
[Parameter()]
7272
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
7373
[System.String]
74-
# The value which should be used for this field.
74+
# The name of the Private Subnet within the Virtual Network.
7575
${PrivateSubnetName},
7676

7777
[Parameter()]
7878
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
7979
[System.String]
80-
# The value which should be used for this field.
80+
# The name of a Public Subnet within the Virtual Network.
8181
${PublicSubnetName},
8282

8383
[Parameter()]
@@ -96,15 +96,21 @@ function New-AzDatabricksWorkspace {
9696
[Parameter()]
9797
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
9898
[System.String]
99-
# The value which should be used for this field.
99+
# The ID of a Virtual Network where this Databricks Cluster should be created.
100100
${VirtualNetworkId},
101101

102102
[Parameter(HelpMessage = "Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.")]
103103
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
104104
[System.Management.Automation.SwitchParameter]
105-
# The value which should be used for this field.
105+
# Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.
106106
${PrepareEncryption},
107107

108+
[Parameter(ParameterSetName = 'CreateExpanded')]
109+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
110+
[System.Management.Automation.SwitchParameter]
111+
# 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.
112+
${RequireInfrastructureEncryption},
113+
108114
[Parameter()]
109115
[Alias('AzureRMContext', 'AzureCredential')]
110116
[ValidateNotNull()]

‎src/Databricks/custom/Update-AzDatabricksWorkspace.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function Update-AzDatabricksWorkspace {
5454
[Parameter(HelpMessage = "Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.")]
5555
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
5656
[System.Management.Automation.SwitchParameter]
57-
# The value which should be used for this field.
57+
# Prepare the workspace for encryption. Enables the Managed Identity for managed storage account.
5858
${PrepareEncryption},
5959

6060
[Parameter(HelpMessage = "The encryption keySource (provider). Possible values (case-insensitive): Default, Microsoft.Keyvault")]

‎src/Databricks/exports/Get-AzDatabricksWorkspace.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ To create the parameters described below, construct a hash table containing the
5050
5151
INPUTOBJECT <IDatabricksIdentity>: Identity Parameter
5252
[Id <String>]: Resource identity path
53+
[PeeringName <String>]: The name of the workspace vNet peering.
5354
[ResourceGroupName <String>]: The name of the resource group. The name is case insensitive.
5455
[SubscriptionId <String>]: The ID of the target subscription.
5556
[WorkspaceName <String>]: The name of the workspace.

‎src/Databricks/exports/New-AzDatabricksWorkspace.ps1‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ param(
8888
[Parameter()]
8989
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
9090
[System.String]
91-
# The value which should be used for this field.
91+
# The name of the Private Subnet within the Virtual Network.
9292
${PrivateSubnetName},
9393

9494
[Parameter()]
9595
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
9696
[System.String]
97-
# The value which should be used for this field.
97+
# The name of a Public Subnet within the Virtual Network.
9898
${PublicSubnetName},
9999

100100
[Parameter()]
@@ -113,7 +113,7 @@ param(
113113
[Parameter()]
114114
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
115115
[System.String]
116-
# The value which should be used for this field.
116+
# The ID of a Virtual Network where this Databricks Cluster should be created.
117117
${VirtualNetworkId},
118118

119119
[Parameter()]
@@ -123,6 +123,12 @@ param(
123123
# Enables the Managed Identity for managed storage account.
124124
${PrepareEncryption},
125125

126+
[Parameter()]
127+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
128+
[System.Management.Automation.SwitchParameter]
129+
# 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.
130+
${RequireInfrastructureEncryption},
131+
126132
[Parameter()]
127133
[Alias('AzureRMContext', 'AzureCredential')]
128134
[ValidateNotNull()]

‎src/Databricks/exports/ProxyCmdletDefinitions.ps1‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ To create the parameters described below, construct a hash table containing the
5050
5151
INPUTOBJECT <IDatabricksIdentity>: Identity Parameter
5252
[Id <String>]: Resource identity path
53+
[PeeringName <String>]: The name of the workspace vNet peering.
5354
[ResourceGroupName <String>]: The name of the resource group. The name is case insensitive.
5455
[SubscriptionId <String>]: The ID of the target subscription.
5556
[WorkspaceName <String>]: The name of the workspace.
@@ -217,6 +218,7 @@ To create the parameters described below, construct a hash table containing the
217218
218219
INPUTOBJECT <IDatabricksIdentity>: Identity Parameter
219220
[Id <String>]: Resource identity path
221+
[PeeringName <String>]: The name of the workspace vNet peering.
220222
[ResourceGroupName <String>]: The name of the resource group. The name is case insensitive.
221223
[SubscriptionId <String>]: The ID of the target subscription.
222224
[WorkspaceName <String>]: The name of the workspace.
@@ -450,13 +452,13 @@ param(
450452
[Parameter()]
451453
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
452454
[System.String]
453-
# The value which should be used for this field.
455+
# The name of the Private Subnet within the Virtual Network.
454456
${PrivateSubnetName},
455457

456458
[Parameter()]
457459
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
458460
[System.String]
459-
# The value which should be used for this field.
461+
# The name of a Public Subnet within the Virtual Network.
460462
${PublicSubnetName},
461463

462464
[Parameter()]
@@ -475,7 +477,7 @@ param(
475477
[Parameter()]
476478
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
477479
[System.String]
478-
# The value which should be used for this field.
480+
# The ID of a Virtual Network where this Databricks Cluster should be created.
479481
${VirtualNetworkId},
480482

481483
[Parameter()]
@@ -485,6 +487,12 @@ param(
485487
# Enables the Managed Identity for managed storage account.
486488
${PrepareEncryption},
487489

490+
[Parameter()]
491+
[Microsoft.Azure.PowerShell.Cmdlets.Databricks.Category('Body')]
492+
[System.Management.Automation.SwitchParameter]
493+
# 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.
494+
${RequireInfrastructureEncryption},
495+
488496
[Parameter()]
489497
[Alias('AzureRMContext', 'AzureCredential')]
490498
[ValidateNotNull()]
@@ -631,6 +639,7 @@ To create the parameters described below, construct a hash table containing the
631639
632640
INPUTOBJECT <IDatabricksIdentity>: Identity parameter.
633641
[Id <String>]: Resource identity path
642+
[PeeringName <String>]: The name of the workspace vNet peering.
634643
[ResourceGroupName <String>]: The name of the resource group. The name is case insensitive.
635644
[SubscriptionId <String>]: The ID of the target subscription.
636645
[WorkspaceName <String>]: The name of the workspace.

0 commit comments

Comments
 (0)