Skip to content

Commit b2f15e8

Browse files
azure-powershell-botlijinpei2008
azure-powershell-bot
and
lijinpei2008
authored
Migrate Databricks from generation to main (#21875)
* Move Databricks to main * update changelog * update changelog * ExampleIssues.csv --------- Co-authored-by: Jinpei Li <[email protected]>
1 parent 0c30ee2 commit b2f15e8

File tree

107 files changed

+5212
-9534
lines changed

Some content is hidden

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

107 files changed

+5212
-9534
lines changed

‎src/Databricks/Az.Databricks.psd1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/15/2023
6+
# Generated on: 5/19/2023
77
#
88

99
@{
@@ -73,7 +73,9 @@ FunctionsToExport = 'Get-AzDatabricksAccessConnector',
7373
'Get-AzDatabricksOutboundNetworkDependenciesEndpoint',
7474
'Get-AzDatabricksVNetPeering', 'Get-AzDatabricksWorkspace',
7575
'New-AzDatabricksAccessConnector', 'New-AzDatabricksVNetPeering',
76-
'New-AzDatabricksWorkspace', 'Remove-AzDatabricksAccessConnector',
76+
'New-AzDatabricksWorkspace',
77+
'New-AzDatabricksWorkspaceProviderAuthorizationObject',
78+
'Remove-AzDatabricksAccessConnector',
7779
'Remove-AzDatabricksVNetPeering', 'Remove-AzDatabricksWorkspace',
7880
'Update-AzDatabricksAccessConnector',
7981
'Update-AzDatabricksVNetPeering', 'Update-AzDatabricksWorkspace'

‎src/Databricks/ChangeLog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@
1919
-->
2020
## Upcoming Release
2121
* Fixed an issue that Update-AzDatabricksWorkspace doesn't work as expected while enabling encryption. [#21324]
22+
* Added some parameters in the `New-AzDatabricksWorkspace` and `Update-AzDatabricksWorkspace`.
23+
- `ManagedDiskKeyVaultPropertiesKeyName`
24+
- `ManagedDiskKeyVaultPropertiesKeyVaultUri`
25+
- `ManagedDiskKeyVaultPropertiesKeyVersion`
26+
- `ManagedDiskRotationToLatestKeyVersionEnabled`
27+
- `ManagedServicesKeyVaultPropertiesKeyName`
28+
- `ManagedServicesKeyVaultPropertiesKeyVaultUri`
29+
- `ManagedServicesKeyVaultPropertiesKeyVersion`
30+
- `Authorization`
31+
- `UiDefinitionUri`
32+
* Added some parameters in the `Update-AzDatabricksVNetPeering`.
33+
- `DatabricksAddressSpacePrefix`
34+
- `DatabricksVirtualNetworkId`
35+
- `RemoteAddressSpacePrefix`
36+
- `RemoteVirtualNetworkId`
2237

2338
## Version 1.5.0
2439
* Upgraded API version to 2023-02-01

‎src/Databricks/Databricks.sln

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{EB2003F7-0093-4B9F-849C-36462ADF72ED}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{3088FBDD-5553-4F34-8340-9F14A8A8F467}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{A418608A-196C-4B7D-9E7B-01302B7D0341}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{C93E7640-5A23-4346-A808-D848EC81A7DC}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{64FF672F-075C-46A4-ADE1-F39A9B4719AB}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{2C142789-8FC7-42C9-941A-100C2838275F}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{952292D1-0D1F-4AFD-9A75-F06C9B529893}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{079A9516-F2DF-4647-940E-B18AEF94882E}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{92103365-92D4-411A-B586-32AB1D09A834}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Databricks", "Az.Databricks.csproj", "{E45D9393-9F27-4FE4-899D-128850D8C71F}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Databricks", "Az.Databricks.csproj", "{CE21274B-BF9B-4ACC-9EB9-42150ED712D0}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{3088FBDD-5553-4F34-8340-9F14A8A8F467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{3088FBDD-5553-4F34-8340-9F14A8A8F467}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{3088FBDD-5553-4F34-8340-9F14A8A8F467}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{3088FBDD-5553-4F34-8340-9F14A8A8F467}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{64FF672F-075C-46A4-ADE1-F39A9B4719AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{64FF672F-075C-46A4-ADE1-F39A9B4719AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{64FF672F-075C-46A4-ADE1-F39A9B4719AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{64FF672F-075C-46A4-ADE1-F39A9B4719AB}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{952292D1-0D1F-4AFD-9A75-F06C9B529893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{952292D1-0D1F-4AFD-9A75-F06C9B529893}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{952292D1-0D1F-4AFD-9A75-F06C9B529893}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{952292D1-0D1F-4AFD-9A75-F06C9B529893}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{E45D9393-9F27-4FE4-899D-128850D8C71F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{E45D9393-9F27-4FE4-899D-128850D8C71F}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{E45D9393-9F27-4FE4-899D-128850D8C71F}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{E45D9393-9F27-4FE4-899D-128850D8C71F}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{EB2003F7-0093-4B9F-849C-36462ADF72ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{EB2003F7-0093-4B9F-849C-36462ADF72ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{EB2003F7-0093-4B9F-849C-36462ADF72ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{EB2003F7-0093-4B9F-849C-36462ADF72ED}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{A418608A-196C-4B7D-9E7B-01302B7D0341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{A418608A-196C-4B7D-9E7B-01302B7D0341}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{A418608A-196C-4B7D-9E7B-01302B7D0341}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{A418608A-196C-4B7D-9E7B-01302B7D0341}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{C93E7640-5A23-4346-A808-D848EC81A7DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{C93E7640-5A23-4346-A808-D848EC81A7DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{C93E7640-5A23-4346-A808-D848EC81A7DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{C93E7640-5A23-4346-A808-D848EC81A7DC}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{2C142789-8FC7-42C9-941A-100C2838275F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{2C142789-8FC7-42C9-941A-100C2838275F}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{2C142789-8FC7-42C9-941A-100C2838275F}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{2C142789-8FC7-42C9-941A-100C2838275F}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{079A9516-F2DF-4647-940E-B18AEF94882E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{079A9516-F2DF-4647-940E-B18AEF94882E}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{079A9516-F2DF-4647-940E-B18AEF94882E}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{079A9516-F2DF-4647-940E-B18AEF94882E}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{92103365-92D4-411A-B586-32AB1D09A834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{92103365-92D4-411A-B586-32AB1D09A834}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{92103365-92D4-411A-B586-32AB1D09A834}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{92103365-92D4-411A-B586-32AB1D09A834}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{CE21274B-BF9B-4ACC-9EB9-42150ED712D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{CE21274B-BF9B-4ACC-9EB9-42150ED712D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{CE21274B-BF9B-4ACC-9EB9-42150ED712D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{CE21274B-BF9B-4ACC-9EB9-42150ED712D0}.Release|Any CPU.Build.0 = Release|Any CPU
5757
EndGlobalSection
5858
EndGlobal

‎src/Databricks/README.md

Lines changed: 56 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,6 @@ AutoRest does not generate authentication code for the module. Authentication is
2626
For information on how to develop for `Az.Databricks`, see [how-to.md](how-to.md).
2727
<!-- endregion -->
2828

29-
---
30-
## Generation Requirements
31-
Use of the beta version of `autorest.powershell` generator requires the following:
32-
- [NodeJS LTS](https://nodejs.org) (10.15.x LTS preferred)
33-
- **Note**: It *will not work* with Node < 10.x. Using 11.x builds may cause issues as they may introduce instability or breaking changes.
34-
> If you want an easy way to install and update Node, [NVS - Node Version Switcher](../nodejs/installing-via-nvs.md) or [NVM - Node Version Manager](../nodejs/installing-via-nvm.md) is recommended.
35-
- [AutoRest](https://aka.ms/autorest) v3 beta <br>`npm install -g autorest@autorest`<br>&nbsp;
36-
- PowerShell 6.0 or greater
37-
- If you don't have it installed, you can use the cross-platform npm package <br>`npm install -g pwsh`<br>&nbsp;
38-
- .NET Core SDK 2.0 or greater
39-
- If you don't have it installed, you can use the cross-platform npm package <br>`npm install -g dotnet-sdk-2.2`<br>&nbsp;
40-
41-
## Run Generation
42-
In this directory, run AutoRest:
43-
> `autorest-beta`
44-
4529
---
4630
### AutoRest Configuration
4731
> see https://aka.ms/autorest
@@ -54,12 +38,14 @@ require:
5438
try-require:
5539
- $(repo)/specification/databricks/resource-manager/readme.powershell.md
5640

57-
module-version: 1.1.0
41+
module-version: 1.2.0
5842
title: Databricks
5943
subject-prefix: $(service-name)
6044

6145
inlining-threshold: 100
46+
6247
resourcegroup-append: true
48+
identity-correction-for-post: true
6349
nested-object-to-string: true
6450

6551
directive:
@@ -75,6 +61,7 @@ directive:
7561
- where:
7662
variant: ^CreateViaIdentity$
7763
hide: true
64+
7865
# Rename the parameter name to follow Azure PowerShell best practice
7966
- where:
8067
parameter-name: SkuName
@@ -176,30 +163,69 @@ directive:
176163
set:
177164
parameter-name: VnetAddressPrefix
178165

179-
# Rename parameters of Set VNetPeering cmdlet
166+
# Update property names related to CMK
167+
- where:
168+
model-name: Workspace
169+
property-name: ValueKeyName
170+
set:
171+
property-name: EncryptionKeyName
172+
- where:
173+
model-name: Workspace
174+
property-name: ValueKeySource
175+
set:
176+
property-name: EncryptionKeySource
177+
- where:
178+
model-name: Workspace
179+
property-name: ValueKeyVaultUri
180+
set:
181+
property-name: EncryptionKeyVaultUri
182+
- where:
183+
model-name: Workspace
184+
property-name: ValueKeyVersion
185+
set:
186+
property-name: EncryptionKeyVersion
187+
- where:
188+
model-name: Workspace
189+
property-name: PrepareEncryptionValue
190+
set:
191+
property-name: PrepareEncryption
192+
- where:
193+
model-name: Workspace
194+
property-name: RequireInfrastructureEncryptionValue
195+
set:
196+
property-name: RequireInfrastructureEncryption
197+
- where:
198+
model-name: Workspace
199+
property-name: EnableNoPublicIPValue
200+
set:
201+
property-name: EnableNoPublicIP
202+
203+
# Rename parameters of VNetPeering cmdlet
180204
- where:
181-
verb: New
182-
subject: VNetPeering
183205
parameter-name: DatabrickAddressSpaceAddressPrefix
184206
set:
185207
parameter-name: DatabricksAddressSpacePrefix
186208
- where:
187-
verb: New
188-
subject: VNetPeering
189209
parameter-name: RemoteAddressSpaceAddressPrefix
190210
set:
191211
parameter-name: RemoteAddressSpacePrefix
192212
- where:
193-
verb: New
194-
subject: VNetPeering
195-
parameter-name: DatabrickVirtualNetworkId
213+
parameter-name: DatabrickVirtualNetworkId
196214
set:
197215
parameter-name: DatabricksVirtualNetworkId
216+
217+
- where:
218+
subject: AccessConnector
219+
parameter-name: ConnectorName
220+
set:
221+
parameter-name: Name
198222
- where:
223+
verb: New
199224
subject: AccessConnector
200-
parameter-name: ConnectorName
225+
parameter-name: IdentityUserAssignedIdentity
201226
set:
202-
parameter-name: Name
227+
parameter-name: UserAssignedIdentity
228+
203229
# Remove the set Workspace cmdlet
204230
- where:
205231
verb: Set
@@ -212,21 +238,17 @@ directive:
212238
subject: AccessConnector
213239
remove: true
214240

215-
# Hide the New Workspace cmdlet for customization
241+
# Hide the New/Update Workspace cmdlet for customization
216242
- where:
217-
verb: New
218-
subject: Workspace
219-
hide: true
220-
# Hide the Update Workspace cmdlet for customization
221-
- where:
222-
verb: Update
243+
verb: New|Update
223244
subject: Workspace
224245
hide: true
225246
# Hide the Set VNetPeering cmdlet for customization
226247
- where:
227248
verb: Set
228249
subject: VNetPeering
229250
hide: true
251+
230252
- where:
231253
model-name: Workspace
232254
set:
@@ -238,47 +260,4 @@ directive:
238260
- ManagedResourceGroupId
239261
labels:
240262
ManagedResourceGroupId: Managed Resource Group ID
241-
- where:
242-
verb: New
243-
subject: AccessConnector
244-
parameter-name: IdentityUserAssignedIdentity
245-
set:
246-
parameter-name: UserAssignedIdentity
247-
248-
# Update property names related to CMK
249-
- where:
250-
model-name: Workspace
251-
property-name: ValueKeyName
252-
set:
253-
property-name: EncryptionKeyName
254-
- where:
255-
model-name: Workspace
256-
property-name: ValueKeySource
257-
set:
258-
property-name: EncryptionKeySource
259-
- where:
260-
model-name: Workspace
261-
property-name: ValueKeyVaultUri
262-
set:
263-
property-name: EncryptionKeyVaultUri
264-
- where:
265-
model-name: Workspace
266-
property-name: ValueKeyVersion
267-
set:
268-
property-name: EncryptionKeyVersion
269-
- where:
270-
model-name: Workspace
271-
property-name: PrepareEncryptionValue
272-
set:
273-
property-name: PrepareEncryption
274-
- where:
275-
model-name: Workspace
276-
property-name: RequireInfrastructureEncryptionValue
277-
set:
278-
property-name: RequireInfrastructureEncryption
279-
- where:
280-
model-name: Workspace
281-
property-name: EnableNoPublicIPValue
282-
set:
283-
property-name: EnableNoPublicIP
284263
```

0 commit comments

Comments
 (0)