@@ -7,11 +7,13 @@ import (
7
7
"net/http"
8
8
)
9
9
10
+ // List of management information
10
11
const (
11
12
ManagementResourceEndpoint string = "https://management.core.windows.net/"
12
13
ADBResourceID string = "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d"
13
14
)
14
15
16
+ // AzureAuth is a struct that contains information about the azure sp authentication
15
17
type AzureAuth struct {
16
18
TokenPayload * TokenPayload
17
19
ManagementToken string
@@ -20,21 +22,24 @@ type AzureAuth struct {
20
22
AdbPlatformToken string
21
23
}
22
24
25
+ // TokenPayload contains all the auth information for azure sp authentication
23
26
type TokenPayload struct {
24
27
ManagedResourceGroup string
25
28
AzureRegion string
26
29
WorkspaceName string
27
30
ResourceGroup string
28
- SubscriptionId string
31
+ SubscriptionID string
29
32
ClientSecret string
30
33
ClientID string
31
34
TenantID string
32
35
}
33
36
37
+ // WsProps contains information about the workspace properties
34
38
type WsProps struct {
35
39
ManagedResourceGroupID string `json:"managedResourceGroupId"`
36
40
}
37
41
42
+ // WorkspaceRequest contains the request information for getting workspace information
38
43
type WorkspaceRequest struct {
39
44
Properties * WsProps `json:"properties"`
40
45
Name string `json:"name"`
@@ -63,13 +68,13 @@ func (a *AzureAuth) getManagementToken(config *service.DBApiClientConfig) error
63
68
return nil
64
69
}
65
70
66
- func (a * AzureAuth ) getWorkspaceId (config * service.DBApiClientConfig ) error {
71
+ func (a * AzureAuth ) getWorkspaceID (config * service.DBApiClientConfig ) error {
67
72
log .Println ("[DEBUG] Getting Workspace ID via management token." )
68
- url := "https://management.azure.com/subscriptions/" + a .TokenPayload .SubscriptionId + "/resourceGroups/" + a .TokenPayload .ResourceGroup + "/providers/Microsoft.Databricks/workspaces/" + a .TokenPayload .WorkspaceName + "" +
73
+ url := "https://management.azure.com/subscriptions/" + a .TokenPayload .SubscriptionID + "/resourceGroups/" + a .TokenPayload .ResourceGroup + "/providers/Microsoft.Databricks/workspaces/" + a .TokenPayload .WorkspaceName + "" +
69
74
"?api-version=2018-04-01"
70
75
71
76
payload := & WorkspaceRequest {
72
- Properties : & WsProps {ManagedResourceGroupID : "/subscriptions/" + a .TokenPayload .SubscriptionId + "/resourceGroups/" + a .TokenPayload .ManagedResourceGroup },
77
+ Properties : & WsProps {ManagedResourceGroupID : "/subscriptions/" + a .TokenPayload .SubscriptionID + "/resourceGroups/" + a .TokenPayload .ManagedResourceGroup },
73
78
Name : a .TokenPayload .WorkspaceName ,
74
79
Location : a .TokenPayload .AzureRegion ,
75
80
}
@@ -157,7 +162,7 @@ func (a *AzureAuth) initWorkspaceAndGetClient(config *service.DBApiClientConfig)
157
162
return dbClient , err
158
163
}
159
164
160
- err = a .getWorkspaceId (config )
165
+ err = a .getWorkspaceID (config )
161
166
if err != nil {
162
167
return dbClient , err
163
168
}
0 commit comments