Shared Multi Step Form for Object Storage Connectors

runtime/drivers/azure/azure.go

@@ -39,12 +39,14 @@ var spec = drivers.Spec{
 			Secret: true,
 		},
 		{
-			Key:    "azure_storage_connection_string",
-			Type:   drivers.StringPropertyType,
-			Secret: true,
+			Key:         "azure_storage_connection_string",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Azure Connection String",
+			Description: "Azure connection string for storage account",
+			Placeholder: "Paste your Azure connection string here",
+			Secret:      true,
 		},
 	},
-	// Important: Any edits to the below properties must be accompanied by changes to the client-side form validation schemas.
 	SourceProperties: []*drivers.PropertySpec{
 		{
 			Key:         "path",

runtime/drivers/duckdb/duckdb.go

@@ -76,6 +76,14 @@ var spec = drivers.Spec{
 			Description: "Query to run on DuckDB.",
 			Placeholder: "select * from table;",
 		},
+		{
+			Key:         "create_secrets_from_connectors",
+			Type:        drivers.StringPropertyType,
+			Required:    false,
+			DisplayName: "Create secrets from connectors",
+			Description: "Comma-separated connector names to create temporary secrets before executing the SQL.",
+			NoPrompt:    true,
+		},
 	},
 	ImplementsOLAP: true,
 }
@@ -130,6 +138,14 @@ var motherduckSpec = drivers.Spec{
 			Description: "Query to extract data from MotherDuck.",
 			Placeholder: "select * from table;",
 		},
+		{
+			Key:         "create_secrets_from_connectors",
+			Type:        drivers.StringPropertyType,
+			Required:    false,
+			DisplayName: "Create secrets from connectors",
+			Description: "Comma-separated connector names to create temporary secrets before executing the SQL.",
+			NoPrompt:    true,
+		},
 	},
 	ImplementsOLAP: true,
 }

runtime/drivers/s3/s3.go

@@ -26,14 +26,22 @@ var spec = drivers.Spec{
 	DocsURL:     "https://docs.rilldata.com/build/connectors/data-source/s3",
 	ConfigProperties: []*drivers.PropertySpec{
 		{
-			Key:    "aws_access_key_id",
-			Type:   drivers.StringPropertyType,
-			Secret: true,
+			Key:         "aws_access_key_id",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "AWS access key ID",
+			Description: "AWS access key ID for explicit credentials",
+			Placeholder: "Enter your AWS access key ID",
+			Secret:      true,
+			Required:    true,
 		},
 		{
-			Key:    "aws_secret_access_key",
-			Type:   drivers.StringPropertyType,
-			Secret: true,
+			Key:         "aws_secret_access_key",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "AWS secret access key",
+			Description: "AWS secret access key for explicit credentials",
+			Placeholder: "Enter your AWS secret access key",
+			Secret:      true,
+			Required:    true,
 		},
 		{
 			Key:         "region",

web-common/package.json

@@ -34,6 +34,7 @@
     "@connectrpc/connect": "^1.4.0",
     "@connectrpc/connect-web": "^1.4.0",
     "@dagrejs/dagre": "^1.1.3",
+    "@exodus/schemasafe": "^1.3.0",
     "@floating-ui/dom": "^1.7.4",
     "@replit/codemirror-indentation-markers": "^6.5.3",
     "@storybook/addon-actions": "^7.6.17",

web-common/src/features/entity-management/name-utils.ts

@@ -21,8 +21,22 @@ export function getName(name: string, others: string[]): string {
   const set = new Set(others.map((other) => other.toLowerCase()));
 
   let result = name;
+  const incrementableSuffix = /(.+)_([0-9]+)$/;
 
   while (set.has(result.toLowerCase())) {
+    // Special-case for "s3": don't roll over to "s4", append suffix instead.
+    if (name.toLowerCase() === "s3") {
+      const match = incrementableSuffix.exec(result);
+      if (match) {
+        const base = match[1];
+        const number = Number.parseInt(match[2], 10) + 1;
+        result = `${base}_${number}`;
+        continue;
+      }
+      result = `${name}_1`;
+      continue;
+    }
+
     result = INCREMENT.exec(result)?.[1]
       ? result.replace(INCREMENT, (m) => (+m + 1).toString())
       : `${result}_1`;

web-common/src/features/sources/modal/AddClickHouseForm.svelte

@@ -20,7 +20,8 @@
   import type { ConnectorType } from "./types";
   import { dsnSchema, getYupSchema } from "./yupSchemas";
   import Checkbox from "@rilldata/web-common/components/forms/Checkbox.svelte";
-  import { isEmpty, normalizeErrors } from "./utils";
+  import { normalizeErrors } from "../../templates/error-utils";
+  import { isEmpty } from "./utils";
   import {
     CONNECTOR_TYPE_OPTIONS,
     CONNECTION_TAB_OPTIONS,