Clickhouse JSON Schema & yupSchema removal

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/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

@@ -19,7 +19,6 @@
   },
   "devDependencies": {
     "@bufbuild/protobuf": "^1.0.0",
-    "@dagrejs/dagre": "^1.1.3",
     "@codemirror/autocomplete": "^6.18.1",
     "@codemirror/commands": "^6.7.0",
     "@codemirror/lang-json": "^6.0.1",
@@ -34,6 +33,8 @@
     "@codemirror/view": "^6.34.1",
     "@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",
@@ -64,6 +65,7 @@
     "@types/dompurify": "^3.0.5",
     "@types/luxon": "^3.4.2",
     "@types/memoizee": "^0.4.11",
+    "@xyflow/svelte": "^0.1.39",
     "autoprefixer": "^10.4.20",
     "bits-ui": "^0.22.0",
     "chroma-js": "^3.1.2",
@@ -114,7 +116,6 @@
     "vega-lite": "^5.23.0",
     "vega-typings": "^1.3.1",
     "vitest": "^3.1.1",
-    "@xyflow/svelte": "^0.1.39",
     "yaml": "^2.4.5",
     "yup": "^1.4.0"
   },

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`;