Refactor configuration

Author: FeliLucero1

conf.gen.go

@@ -8,44 +8,58 @@ import (
 )
 
 var (
+	AccountHostnameField = field.StringField(
+		"account-hostname",
+		field.WithDescription("The hostname used to connect to the Databricks account API. If not set, it will be calculated from the hostname field."),
+		field.WithDisplayName("Account Hostname"),
+	)
 	AccountIdField = field.StringField(
 		"account-id",
 		field.WithDescription("The Databricks account ID used to connect to the Databricks Account and Workspace API"),
 		field.WithRequired(true),
+		field.WithDisplayName("Account ID"),
 	)
 	HostnameField = field.StringField(
 		"hostname",
 		field.WithDescription("The Databricks hostname used to connect to the Databricks API"),
 		field.WithDefaultValue("cloud.databricks.com"),
+		field.WithDisplayName("Hostname"),
 	)
 	DatabricksClientIdField = field.StringField(
 		"databricks-client-id",
 		field.WithDescription("The Databricks service principal's client ID used to connect to the Databricks Account and Workspace API"),
+		field.WithDisplayName("Databricks Client ID"),
 	)
 	DatabricksClientSecretField = field.StringField(
 		"databricks-client-secret",
 		field.WithDescription("The Databricks service principal's client secret used to connect to the Databricks Account and Workspace API"),
 		field.WithIsSecret(true),
+		field.WithDisplayName("Databricks Client Secret"),
 	)
 	UsernameField = field.StringField(
 		"username",
 		field.WithDescription("The Databricks username used to connect to the Databricks API"),
+		field.WithDisplayName("Username"),
 	)
 	PasswordField = field.StringField(
 		"password",
 		field.WithDescription("The Databricks password used to connect to the Databricks API"),
 		field.WithIsSecret(true),
+		field.WithDisplayName("Password"),
 	)
 	WorkspacesField = field.StringSliceField(
 		"workspaces",
 		field.WithDescription("Limit syncing to the specified workspaces"),
+		field.WithDisplayName("Workspaces"),
 	)
 	TokensField = field.StringSliceField(
 		"workspace-tokens",
 		field.WithDescription("The Databricks access tokens scoped to specific workspaces used to connect to the Databricks Workspace API"),
 		field.WithIsSecret(true),
+		field.WithDisplayName("Workspace Tokens"),
 	)
 	configFields = []field.SchemaField{
+		AccountHostnameField,
 		AccountIdField,
 		DatabricksClientIdField,
 		DatabricksClientSecretField,
@@ -90,6 +104,7 @@ var (
 				DatabricksClientIdField,
 				DatabricksClientSecretField,
 				HostnameField,
+				AccountHostnameField,
 			},
 			Default: true,
 		},
@@ -102,6 +117,7 @@ var (
 				TokensField,
 				WorkspacesField,
 				HostnameField,
+				AccountHostnameField,
 			},
 			Default: false,
 		},
@@ -114,6 +130,7 @@ var (
 				UsernameField,
 				PasswordField,
 				HostnameField,
+				AccountHostnameField,
 			},
 			Default: false,
 		},
@@ -125,6 +142,9 @@ var Config = field.NewConfiguration(
 	configFields,
 	field.WithConstraints(fieldRelationships...),
 	field.WithFieldGroups(fieldGroups),
+	field.WithConnectorDisplayName("Databricks"),
+	field.WithHelpUrl("/docs/baton/databricks"),
+	field.WithIconUrl("/static/app-icons/databricks.svg"),
 )
 
 // ValidateConfig - additional validations that cannot be encoded in relationships (yet!)

pkg/config/conf.gen.go

@@ -224,7 +224,7 @@ func NewConnector(ctx context.Context, cfg *config.Databricks, opts *cli.Connect
 	}
 
 	hostname := getHostname(cfg)
-	accountHostname := databricks.GetAccountHostname(hostname)
+	accountHostname := getAccountHostname(cfg, hostname)
 	auth := prepareClientAuth(ctx, cfg, l)
 
 	cb, err := New(
@@ -256,7 +256,7 @@ func prepareClientAuth(_ context.Context, cfg *config.Databricks, l *zap.Logger)
 	password := cfg.Password
 	workspaces := cfg.Workspaces
 	tokens := cfg.WorkspaceTokens
-	accountHostname := databricks.GetAccountHostname(getHostname(cfg))
+	accountHostname := getAccountHostname(cfg, getHostname(cfg))
 
 	switch {
 	case username != "" && password != "":
@@ -311,3 +311,11 @@ func getHostname(cfg *config.Databricks) string {
 	}
 	return cfg.Hostname
 }
+
+// getAccountHostname returns the account hostname from config if set, otherwise calculates it from hostname.
+func getAccountHostname(cfg *config.Databricks, hostname string) string {
+	if cfg.AccountHostname != "" {
+		return cfg.AccountHostname
+	}
+	return databricks.GetAccountHostname(hostname)
+}