Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the AzureTenantId in oauth.go #210

Merged
merged 10 commits into from
Apr 16, 2024
Merged

Fixed the AzureTenantId in oauth.go #210

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
04b9dc6
Fixed OAuth for Azure Databricks
tubiskasaroos Apr 11, 2024
f50a9b0
Fixed OAuth for Azure Databricks
tubiskasaroos Apr 11, 2024
ba2027f
Merge branch 'main' of https://github.com/tubiskasaroos/databricks-sq…
tubiskasaroos Apr 11, 2024
7fc1797
Merge branch 'main' of https://github.com/tubiskasaroos/databricks-sq…
tubiskasaroos Apr 11, 2024
f2d07e9
Merge branch 'main' of https://github.com/tubiskasaroos/databricks-sq…
tubiskasaroos Apr 11, 2024
51d1b50
Removed the AzureTenant struct
tubiskasaroos Apr 11, 2024
9af4f65
Fixed OAuth for Azure Databricks
tubiskasaroos Apr 11, 2024
1319cfb
Removed the AzureTenant struct
tubiskasaroos Apr 11, 2024
f9144b2
Merge branch 'patch-1' of https://github.com/tubiskasaroos/databricks…
tubiskasaroos Apr 12, 2024
c5065b7
Merge branch 'databricks:main' into patch-1
tubiskasaroos Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions auth/oauth/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,13 @@ import (
"golang.org/x/oauth2"
)

const (
azureTenantId = "4a67d088-db5c-48f1-9ff2-0aace800ae68"
)
var azureTenants = map[string]string{
".dev.azuredatabricks.net": "62a912ac-b58e-4c1d-89ea-b2dbfc7358fc",
".staging.azuredatabricks.net": "4a67d088-db5c-48f1-9ff2-0aace800ae68",
".azuredatabricks.net": "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d",
".databricks.azure.us": "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d",
".databricks.azure.cn": "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d",
}

func GetEndpoint(ctx context.Context, hostName string) (oauth2.Endpoint, error) {
if ctx == nil {
Expand Down Expand Up @@ -52,7 +56,7 @@ func GetScopes(hostName string, scopes []string) []string {

cloudType := InferCloudFromHost(hostName)
if cloudType == Azure {
userImpersonationScope := fmt.Sprintf("%s/user_impersonation", azureTenantId)
userImpersonationScope := fmt.Sprintf("%s/user_impersonation", azureTenants[GetAzureDnsZone(hostName)])
if !HasScope(scopes, userImpersonationScope) {
scopes = append(scopes, userImpersonationScope)
}
Expand Down Expand Up @@ -133,3 +137,12 @@ func InferCloudFromHost(hostname string) CloudType {
}
return Unknown
}

func GetAzureDnsZone(hostname string) string {
for _, d := range databricksAzureDomains {
if strings.Contains(hostname, d) {
return d
}
}
return ""
}
Loading