Skip to content

Commit 9a99d02

Browse files
authored
[Databricks]Fix bug #13173 (#13214)
1 parent 7c0b52a commit 9a99d02

18 files changed

+1319
-1173
lines changed

src/Databricks/Az.Databricks.psd1

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

99
@{
@@ -12,7 +12,7 @@
1212
RootModule = './Az.Databricks.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '1.0.0'
15+
ModuleVersion = '0.2.0'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -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 = ''
@@ -110,8 +110,7 @@ PrivateData = @{
110110
# IconUri = ''
111111

112112
# ReleaseNotes of this module
113-
ReleaseNotes = '* General availability of ''Az.Databricks'' module
114-
* Added support for virtual network peering'
113+
# ReleaseNotes = ''
115114

116115
# Prerelease string of this module
117116
# Prerelease = ''

src/Databricks/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Update databricks workspace withouth -EncryptionKeyVersion that the key version will be empty.
2122

2223
## Version 1.0.0
2324
* General availability of 'Az.Databricks' module

src/Databricks/custom/Update-AzDatabricksWorkspace.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,11 @@ function Update-AzDatabricksWorkspace {
184184
}
185185
if ($hasEncryptionKeyVersion) {
186186
$workspace.EncryptionKeyVersion = $EncryptionKeyVersion
187+
} else {
188+
if ($workspace.PrepareEncryption)
189+
{
190+
$workspace.EncryptionKeyVersion = ""
191+
}
187192
}
188193
if ($hasTag) {
189194
$workspace.Tag = $Tag

src/Databricks/test/Az.Databricks-TestResults.xml

Lines changed: 0 additions & 92 deletions
This file was deleted.

0 commit comments

Comments
 (0)