Kafka: username optional, if not supplied no auth used

PeerDB-io · Mar 18, 2024 · b2bb58a · b2bb58a
1 parent 7cd117a
commit b2bb58a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/ui/app/peers/create/[peerType]/helpers/ch.ts b/ui/app/peers/create/[peerType]/helpers/ch.ts
@@ -45,6 +45,7 @@ export const clickhouseSetting: PeerSetting[] = [
       setter((curr) => ({ ...curr, disableTls: value as boolean })),
     type: 'switch',
     tips: 'If you are using a non-TLS connection for Clickhouse server, check this box.',
+    optional: true,
   },
   {
     label: 'S3 Path',

diff --git a/ui/app/peers/create/[peerType]/helpers/ka.ts b/ui/app/peers/create/[peerType]/helpers/ka.ts
@@ -14,12 +14,14 @@ export const kaSetting: PeerSetting[] = [
     label: 'Username',
     stateHandler: (value, setter) =>
       setter((curr) => ({ ...curr, username: value as string })),
+    optional: true,
   },
   {
     label: 'Password',
     type: 'password',
     stateHandler: (value, setter) =>
       setter((curr) => ({ ...curr, password: value as string })),
+    optional: true,
   },
   {
     label: 'SASL Mechanism',
@@ -35,6 +37,7 @@ export const kaSetting: PeerSetting[] = [
       setter((curr) => ({ ...curr, disableTls: value as boolean })),
     type: 'switch',
     tips: 'If you are using a non-TLS connection for Kafka server, check this box.',
+    optional: true,
   },
 ];
 

diff --git a/ui/app/peers/create/[peerType]/schema.ts b/ui/app/peers/create/[peerType]/schema.ts
@@ -282,13 +282,11 @@ export const chSchema = z.object({
 });
 
 export const kaSchema = z.object({
-  servers: z.array(z.string()).min(1, { message: 'Atleast 1 server required' }),
-  username: z
-    .string({ required_error: 'Username is required' })
-    .min(1, { message: 'Username cannot be empty' }),
-  password: z
-    .string({ required_error: 'Password is required' })
-    .min(1, { message: 'Password cannot be empty' }),
+  servers: z
+    .array(z.string({ required_error: 'Server address must not be empty' }))
+    .min(1, { message: 'At least 1 server required' }),
+  username: z.string().optional(),
+  password: z.string().optional(),
   sasl: z
     .union(
       [

diff --git a/ui/components/PeerForms/KafkaConfig.tsx b/ui/components/PeerForms/KafkaConfig.tsx
@@ -22,7 +22,6 @@ const saslOptions = [
 const KafkaForm = ({ setter }: KafkaProps) => {
   return (
     <div>
-      <Label>TODO TEXT</Label>
       {kaSetting.map((setting, index) => {
         return setting.type === 'switch' ? (
           <RowWithSwitch