Skip to content

Commit 08e3eb7

Browse files
committed
Fixed & refactored linting issues in databricks package
1 parent 67dca86 commit 08e3eb7

26 files changed

+273
-251
lines changed

databricks/azure_ws_init.go

+10-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import (
77
"net/http"
88
)
99

10+
// List of management information
1011
const (
1112
ManagementResourceEndpoint string = "https://management.core.windows.net/"
1213
ADBResourceID string = "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d"
1314
)
1415

16+
// AzureAuth is a struct that contains information about the azure sp authentication
1517
type AzureAuth struct {
1618
TokenPayload *TokenPayload
1719
ManagementToken string
@@ -20,21 +22,24 @@ type AzureAuth struct {
2022
AdbPlatformToken string
2123
}
2224

25+
// TokenPayload contains all the auth information for azure sp authentication
2326
type TokenPayload struct {
2427
ManagedResourceGroup string
2528
AzureRegion string
2629
WorkspaceName string
2730
ResourceGroup string
28-
SubscriptionId string
31+
SubscriptionID string
2932
ClientSecret string
3033
ClientID string
3134
TenantID string
3235
}
3336

37+
// WsProps contains information about the workspace properties
3438
type WsProps struct {
3539
ManagedResourceGroupID string `json:"managedResourceGroupId"`
3640
}
3741

42+
// WorkspaceRequest contains the request information for getting workspace information
3843
type WorkspaceRequest struct {
3944
Properties *WsProps `json:"properties"`
4045
Name string `json:"name"`
@@ -63,13 +68,13 @@ func (a *AzureAuth) getManagementToken(config *service.DBApiClientConfig) error
6368
return nil
6469
}
6570

66-
func (a *AzureAuth) getWorkspaceId(config *service.DBApiClientConfig) error {
71+
func (a *AzureAuth) getWorkspaceID(config *service.DBApiClientConfig) error {
6772
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 + "" +
6974
"?api-version=2018-04-01"
7075

7176
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},
7378
Name: a.TokenPayload.WorkspaceName,
7479
Location: a.TokenPayload.AzureRegion,
7580
}
@@ -157,7 +162,7 @@ func (a *AzureAuth) initWorkspaceAndGetClient(config *service.DBApiClientConfig)
157162
return dbClient, err
158163
}
159164

160-
err = a.getWorkspaceId(config)
165+
err = a.getWorkspaceID(config)
161166
if err != nil {
162167
return dbClient, err
163168
}

databricks/azure_ws_init_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestAzureAuthCreateApiToken(t *testing.T) {
3333
AdbAccessToken: "",
3434
AdbPlatformToken: "",
3535
}
36-
azureAuth.TokenPayload.SubscriptionId = os.Getenv("ARM_SUBSCRIPTION_ID")
36+
azureAuth.TokenPayload.SubscriptionID = os.Getenv("ARM_SUBSCRIPTION_ID")
3737
azureAuth.TokenPayload.TenantID = os.Getenv("ARM_TENANT_ID")
3838
azureAuth.TokenPayload.ClientID = os.Getenv("ARM_CLIENT_ID")
3939
azureAuth.TokenPayload.ClientSecret = os.Getenv("ARM_CLIENT_SECRET")

0 commit comments

Comments
 (0)