Skip to content

Commit 52c1c06

Browse files
azure-powershell-botlijinpei2008
azure-powershell-bot
and
lijinpei2008
authored
Migrate Databricks from generation to main (#21742)
* Move Databricks to main * update changelog * update link docs -> learn --------- Co-authored-by: Jinpei Li <[email protected]>
1 parent 8c97402 commit 52c1c06

File tree

84 files changed

+551
-208
lines changed

Some content is hidden

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

84 files changed

+551
-208
lines changed

‎src/Databricks/Az.Databricks.psd1

Lines changed: 2 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: 3/6/2023
6+
# Generated on: 5/15/2023
77
#
88

99
@{
@@ -114,7 +114,7 @@ PrivateData = @{
114114
# IconUri = ''
115115

116116
# ReleaseNotes of this module
117-
ReleaseNotes = '* Upgraded API version to 2023-02-01'
117+
# ReleaseNotes = ''
118118

119119
# Prerelease string of this module
120120
# Prerelease = ''

‎src/Databricks/Az.Databricks.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434

3535
if(-not $accountsModule) {
36-
Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. For installation instructions, please see: https://docs.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
36+
Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. For installation instructions, please see: https://learn.microsoft.com/powershell/azure/install-az-ps" -ErrorAction Stop
3737
} elseif (($accountsModule.Version -lt [System.Version]'2.7.5') -and (-not $localAccounts)) {
3838
Write-Error "`nThis module requires $accountsName version 2.7.5 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to add the switch '-RegenerateSupportModule' when executing 'test-module.ps1'. 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
3939
}

‎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+
* Fixed an issue that Update-AzDatabricksWorkspace doesn't work as expected while enabling encryption. [#21324]
2122

2223
## Version 1.5.0
2324
* 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", "{AC41AEB0-7EB2-43A0-BD20-2218D9D069BA}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{E1F1CD7E-EA88-4DDA-A934-D8687908FCF5}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{1AAB54D9-A9DB-4229-ACCB-96FD0972A34D}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{3088FBDD-5553-4F34-8340-9F14A8A8F467}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{5308E486-3A61-4CAF-A60A-3E89EBC683F2}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{11C0C0F8-DFCF-4BF9-AF51-BEDDF5098F37}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{C13724A3-A2E9-4EE4-B684-88994509D80B}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{64FF672F-075C-46A4-ADE1-F39A9B4719AB}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{004432B5-9B73-4E55-853A-E4B776DAA2F7}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{952292D1-0D1F-4AFD-9A75-F06C9B529893}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{63406266-1686-4D04-9D47-C452356751D0}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{167E4426-D30C-4A58-A7B1-0FFCDFE111F2}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Databricks", "Az.Databricks.csproj", "{AF127834-FCD6-408F-B3FE-15362C078DA1}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Databricks", "Az.Databricks.csproj", "{E45D9393-9F27-4FE4-899D-128850D8C71F}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{AC41AEB0-7EB2-43A0-BD20-2218D9D069BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{AC41AEB0-7EB2-43A0-BD20-2218D9D069BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{AC41AEB0-7EB2-43A0-BD20-2218D9D069BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{AC41AEB0-7EB2-43A0-BD20-2218D9D069BA}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{1AAB54D9-A9DB-4229-ACCB-96FD0972A34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{1AAB54D9-A9DB-4229-ACCB-96FD0972A34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{1AAB54D9-A9DB-4229-ACCB-96FD0972A34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{1AAB54D9-A9DB-4229-ACCB-96FD0972A34D}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{5308E486-3A61-4CAF-A60A-3E89EBC683F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{5308E486-3A61-4CAF-A60A-3E89EBC683F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{5308E486-3A61-4CAF-A60A-3E89EBC683F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{5308E486-3A61-4CAF-A60A-3E89EBC683F2}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{C13724A3-A2E9-4EE4-B684-88994509D80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{C13724A3-A2E9-4EE4-B684-88994509D80B}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{C13724A3-A2E9-4EE4-B684-88994509D80B}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{C13724A3-A2E9-4EE4-B684-88994509D80B}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{004432B5-9B73-4E55-853A-E4B776DAA2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{004432B5-9B73-4E55-853A-E4B776DAA2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{004432B5-9B73-4E55-853A-E4B776DAA2F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{004432B5-9B73-4E55-853A-E4B776DAA2F7}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{63406266-1686-4D04-9D47-C452356751D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{63406266-1686-4D04-9D47-C452356751D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{63406266-1686-4D04-9D47-C452356751D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{63406266-1686-4D04-9D47-C452356751D0}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{AF127834-FCD6-408F-B3FE-15362C078DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{AF127834-FCD6-408F-B3FE-15362C078DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{AF127834-FCD6-408F-B3FE-15362C078DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{AF127834-FCD6-408F-B3FE-15362C078DA1}.Release|Any CPU.Build.0 = Release|Any CPU
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
5757
EndGlobalSection
5858
EndGlobal

‎src/Databricks/UX/Microsoft.Databricks/accessConnectors.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"resourceType": "accessConnectors",
3+
"apiVersion": "2022-10-01-preview",
4+
"learnMore": {
5+
"url": "https://learn.microsoft.com/powershell/module/az.databricks"
6+
},
7+
"commands": [
8+
{
9+
"name": "Get-AzDatabricksAccessConnector",
10+
"description": "Gets an azure databricks accessConnector.",
11+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/accessConnectors/{connectorName}",
12+
"help": {
13+
"learnMore": {
14+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/get-azdatabricksaccessconnector"
15+
},
16+
"parameterSets": [
17+
{
18+
"parameters": [
19+
"-Name <String>",
20+
"-ResourceGroupName <String>",
21+
"[-SubscriptionId <String[]>]"
22+
]
23+
}
24+
]
25+
},
26+
"examples": [
27+
{
28+
"description": "Gets an azure databricks accessConnector.",
29+
"parameters": [
30+
{
31+
"name": "-Name",
32+
"value": "[Path.connectorName]"
33+
},
34+
{
35+
"name": "-ResourceGroupName",
36+
"value": "[Path.resourceGroupName]"
37+
},
38+
{
39+
"name": "-SubscriptionId",
40+
"value": "[Path.subscriptionId]"
41+
}
42+
]
43+
}
44+
]
45+
},
46+
{
47+
"name": "Remove-AzDatabricksAccessConnector",
48+
"description": "Deletes the azure databricks accessConnector.",
49+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/accessConnectors/{connectorName}",
50+
"help": {
51+
"learnMore": {
52+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/remove-azdatabricksaccessconnector"
53+
},
54+
"parameterSets": [
55+
{
56+
"parameters": [
57+
"-Name <String>",
58+
"-ResourceGroupName <String>",
59+
"[-SubscriptionId <String>]"
60+
]
61+
}
62+
]
63+
},
64+
"examples": [
65+
{
66+
"description": "Deletes the azure databricks accessConnector.",
67+
"parameters": [
68+
{
69+
"name": "-Name",
70+
"value": "[Path.connectorName]"
71+
},
72+
{
73+
"name": "-ResourceGroupName",
74+
"value": "[Path.resourceGroupName]"
75+
},
76+
{
77+
"name": "-SubscriptionId",
78+
"value": "[Path.subscriptionId]"
79+
}
80+
]
81+
}
82+
]
83+
}
84+
]
85+
}

‎src/Databricks/UX/Microsoft.Databricks/workspaces-virtualNetworkPeerings.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"resourceType": "workspaces/virtualNetworkPeerings",
3+
"apiVersion": "2023-02-01",
4+
"learnMore": {
5+
"url": "https://learn.microsoft.com/powershell/module/az.databricks"
6+
},
7+
"commands": [
8+
{
9+
"name": "Get-AzDatabricksVNetPeering",
10+
"description": "Gets the workspace vNet Peering.",
11+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/workspaces/{workspaceName}/virtualNetworkPeerings/{peeringName}",
12+
"help": {
13+
"learnMore": {
14+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/get-azdatabricksvnetpeering"
15+
},
16+
"parameterSets": [
17+
{
18+
"parameters": [
19+
"-Name <String>",
20+
"-ResourceGroupName <String>",
21+
"[-SubscriptionId <String[]>]",
22+
"-WorkspaceName <String>"
23+
]
24+
}
25+
]
26+
},
27+
"examples": [
28+
{
29+
"description": "Gets the workspace vNet Peering.",
30+
"parameters": [
31+
{
32+
"name": "-Name",
33+
"value": "[Path.peeringName]"
34+
},
35+
{
36+
"name": "-ResourceGroupName",
37+
"value": "[Path.resourceGroupName]"
38+
},
39+
{
40+
"name": "-SubscriptionId",
41+
"value": "[Path.subscriptionId]"
42+
},
43+
{
44+
"name": "-WorkspaceName",
45+
"value": "[Path.workspaceName]"
46+
}
47+
]
48+
}
49+
]
50+
},
51+
{
52+
"name": "Remove-AzDatabricksVNetPeering",
53+
"description": "Deletes the workspace vNetPeering.",
54+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/workspaces/{workspaceName}/virtualNetworkPeerings/{peeringName}",
55+
"help": {
56+
"learnMore": {
57+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/remove-azdatabricksvnetpeering"
58+
},
59+
"parameterSets": [
60+
{
61+
"parameters": [
62+
"-Name <String>",
63+
"-ResourceGroupName <String>",
64+
"[-SubscriptionId <String>]",
65+
"-WorkspaceName <String>"
66+
]
67+
}
68+
]
69+
},
70+
"examples": [
71+
{
72+
"description": "Deletes the workspace vNetPeering.",
73+
"parameters": [
74+
{
75+
"name": "-Name",
76+
"value": "[Path.peeringName]"
77+
},
78+
{
79+
"name": "-ResourceGroupName",
80+
"value": "[Path.resourceGroupName]"
81+
},
82+
{
83+
"name": "-SubscriptionId",
84+
"value": "[Path.subscriptionId]"
85+
},
86+
{
87+
"name": "-WorkspaceName",
88+
"value": "[Path.workspaceName]"
89+
}
90+
]
91+
}
92+
]
93+
}
94+
]
95+
}

‎src/Databricks/UX/Microsoft.Databricks/workspaces.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"resourceType": "workspaces",
3+
"apiVersion": "2023-02-01",
4+
"learnMore": {
5+
"url": "https://learn.microsoft.com/powershell/module/az.databricks"
6+
},
7+
"commands": [
8+
{
9+
"name": "Get-AzDatabricksWorkspace",
10+
"description": "Gets the workspace.",
11+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/workspaces/{workspaceName}",
12+
"help": {
13+
"learnMore": {
14+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/get-azdatabricksworkspace"
15+
},
16+
"parameterSets": [
17+
{
18+
"parameters": [
19+
"-Name <String>",
20+
"-ResourceGroupName <String>",
21+
"[-SubscriptionId <String[]>]"
22+
]
23+
}
24+
]
25+
},
26+
"examples": [
27+
{
28+
"description": "Gets the workspace.",
29+
"parameters": [
30+
{
31+
"name": "-Name",
32+
"value": "[Path.workspaceName]"
33+
},
34+
{
35+
"name": "-ResourceGroupName",
36+
"value": "[Path.resourceGroupName]"
37+
},
38+
{
39+
"name": "-SubscriptionId",
40+
"value": "[Path.subscriptionId]"
41+
}
42+
]
43+
}
44+
]
45+
},
46+
{
47+
"name": "Remove-AzDatabricksWorkspace",
48+
"description": "Deletes the workspace.",
49+
"path": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Databricks/workspaces/{workspaceName}",
50+
"help": {
51+
"learnMore": {
52+
"url": "https://learn.microsoft.com/powershell/module/az.databricks/remove-azdatabricksworkspace"
53+
},
54+
"parameterSets": [
55+
{
56+
"parameters": [
57+
"-Name <String>",
58+
"-ResourceGroupName <String>",
59+
"[-SubscriptionId <String>]"
60+
]
61+
}
62+
]
63+
},
64+
"examples": [
65+
{
66+
"description": "Deletes the workspace.",
67+
"parameters": [
68+
{
69+
"name": "-Name",
70+
"value": "[Path.workspaceName]"
71+
},
72+
{
73+
"name": "-ResourceGroupName",
74+
"value": "[Path.resourceGroupName]"
75+
},
76+
{
77+
"name": "-SubscriptionId",
78+
"value": "[Path.subscriptionId]"
79+
}
80+
]
81+
}
82+
]
83+
}
84+
]
85+
}

0 commit comments

Comments
 (0)