✨ feat: make server port configurable

mullerpeter · Sep 3, 2023 · 302faac · 302faac
1 parent e25303a
commit 302faac
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/pkg/plugin/plugin.go b/pkg/plugin/plugin.go
@@ -38,6 +38,7 @@ var (
 type DatasourceSettings struct {
 	Path     string `json:"path"`
 	Hostname string `json:"hostname"`
+	Port     string `json:"port"`
 }
 
 // NewSampleDatasource creates a new datasource instance.
@@ -47,7 +48,11 @@ func NewSampleDatasource(settings backend.DataSourceInstanceSettings) (instancem
 	if err != nil {
 		log.DefaultLogger.Info("Setting Parse Error", "err", err)
 	}
-	databricksConnectionsString = fmt.Sprintf("token:%s@%s:443/%s", settings.DecryptedSecureJSONData["token"], datasourceSettings.Hostname, datasourceSettings.Path)
+	port := "443"
+	if datasourceSettings.Port != "" {
+		port = datasourceSettings.Port
+	}
+	databricksConnectionsString = fmt.Sprintf("token:%s@%s:%s/%s", settings.DecryptedSecureJSONData["token"], datasourceSettings.Hostname, port, datasourceSettings.Path)
 	if databricksConnectionsString != "" {
 		log.DefaultLogger.Info("Init Databricks SQL DB")
 		db, err := sql.Open("databricks", databricksConnectionsString)

diff --git a/src/ConfigEditor.tsx b/src/ConfigEditor.tsx
@@ -34,6 +34,17 @@ export class ConfigEditor extends PureComponent<Props, State> {
     });
   };
 
+  onPortChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const { onOptionsChange, options } = this.props;
+    onOptionsChange({
+      ...options,
+      jsonData: {
+        ...options.jsonData,
+        port: event.target.value,
+      },
+    });
+  };
+
   onPathChange = (event: ChangeEvent<HTMLInputElement>) => {
     const { onOptionsChange, options } = this.props;
     onOptionsChange({
@@ -80,6 +91,17 @@ export class ConfigEditor extends PureComponent<Props, State> {
                 onChange={this.onHostnameChange}
             />
           </div>
+          <div className="gf-form">
+            <FormField
+                value={jsonData.port || ''}
+                label="Server Port"
+                placeholder="443"
+                tooltip="Databricks Server Port"
+                labelWidth={10}
+                inputWidth={500}
+                onChange={this.onPortChange}
+            />
+          </div>
           <div className="gf-form">
             <FormField
               value={jsonData.path || ''}

diff --git a/src/types.ts b/src/types.ts
@@ -23,6 +23,7 @@ export const defaultQuery: Partial<MyQuery> = {
  */
 export interface MyDataSourceOptions extends DataSourceJsonData {
   hostname?: string;
+  port?: string;
   path?: string;
 }