Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

[GDGT-2145] map more dedicated fields and leave them out of additional opts (#78412)

YB3bef91fb42d9
diff --git a/e2e/test/scenarios/admin/database-connection-strings.cy.spec.ts b/e2e/test/scenarios/admin/database-connection-strings.cy.spec.ts
index ddca0407faa..58077bf2db1 100644
--- a/e2e/test/scenarios/admin/database-connection-strings.cy.spec.ts
+++ b/e2e/test/scenarios/admin/database-connection-strings.cy.spec.ts
@@ -125,7 +125,7 @@ const databaseTestCases = [
{
engine: "Redshift",
connectionString:
- "jdbc:redshift://examplecluster.abc123xyz789.us-west-2.redshift.amazonaws.com:5439/dev",
+ "jdbc:redshift://examplecluster.abc123xyz789.us-west-2.redshift.amazonaws.com:5439/dev;UID=testuser;PWD=testpass;SocketTimeout=0",
expectedFields: [
{
label: "Host",
@@ -134,6 +134,12 @@ const databaseTestCases = [
{ label: "Port", value: "5439" },
{ label: "Database name", value: "dev" },
{ label: "Display name", value: "dev" },
+ { label: "Username", value: "testuser" },
+ { label: "Password", value: "testpass" },
+ {
+ label: "Additional JDBC connection string options",
+ value: "SocketTimeout=0",
+ },
],
},
{
diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.ts b/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.ts
index ec80de4f201..0ddec0df1e5 100644
--- a/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.ts
+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.ts
@@ -25,7 +25,10 @@ function mapRedshiftValues(parsedValues: RegexFields) {
["details.port", port],
["details.user", UID],
["details.password", PWD],
- ["details.additional-options", objectToString(parsedValues.params)],
+ [
+ "details.additional-options",
+ objectToString(parsedValues.params, ["UID", "PWD"]),
+ ],
]);
if (fieldsMap.get("details.additional-options")) {
diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.unit.spec.ts b/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.unit.spec.ts
new file mode 100644
index 00000000000..9737523223f
--- /dev/null
+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/database-field-mapper.unit.spec.ts
@@ -0,0 +1,40 @@
+import { checkNotNull } from "metabase/utils/types";
+
+import { mapDatabaseValues } from "./database-field-mapper";
+import { parseConnectionUriRegex } from "./parse-connection-regex";
+
+function mapConnectionString(connectionString: string, engineKey: "redshift") {
+ const parsedValues = checkNotNull(
+ parseConnectionUriRegex(connectionString, engineKey),
+ );
+ return mapDatabaseValues(parsedValues, engineKey);
+}
+
+describe("mapDatabaseValues - redshift", () => {
+ it("should map UID and PWD to dedicated fields and keep unmapped params in additional options", () => {
+ const fieldsMap = mapConnectionString(
+ "jdbc:redshift://a.b.us-west-2.redshift.amazonaws.com:5439/dbname;UID=amazon;PWD=password%3Apassword;ssl=true",
+ "redshift",
+ );
+
+ expect(fieldsMap.get("details.host")).toBe(
+ "a.b.us-west-2.redshift.amazonaws.com",
+ );
+ expect(fieldsMap.get("details.port")).toBe("5439");
+ expect(fieldsMap.get("details.db")).toBe("dbname");
+ expect(fieldsMap.get("details.user")).toBe("amazon");
+ expect(fieldsMap.get("details.password")).toBe("password:password");
+ expect(fieldsMap.get("details.additional-options")).toBe("ssl=true");
+ expect(fieldsMap.get("details.advanced-options")).toBe(true);
+ });
+
+ it("should leave additional options empty when all params map to dedicated fields", () => {
+ const fieldsMap = mapConnectionString(
+ "jdbc:redshift://a.b.us-west-2.redshift.amazonaws.com:5439/dbname;UID=amazon;PWD=secret",
+ "redshift",
+ );
+
+ expect(fieldsMap.get("details.additional-options")).toBe("");
+ expect(fieldsMap.get("details.advanced-options")).toBeUndefined();
+ });
+});