confluent-schema-registry 3.3.5 → 3.6.2

package/src/utils/avdlToAVSC.spec.ts

@@ -1,7 +1,7 @@
 import path from 'path'
-import fs from 'fs-extra'
-import execa from 'execa'
 import avro from 'avsc'
+import { exec } from 'child_process'
+import fs from 'node:fs'
 
 import SchemaRegistry from '../SchemaRegistry'
 import { avdlToAVSCAsync } from './avdlToAVSC'
@@ -9,13 +9,26 @@ import { avdlToAVSCAsync } from './avdlToAVSC'
 const registry = new SchemaRegistry({ host: 'http://localhost:8982' })
 const absolutePath = (...paths: string[]) => path.join(__dirname, '../..', ...paths)
 
+const promisifiedExec = async (command: string): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    exec(command, (error, stdout) => {
+      if (error) {
+        return reject(error)
+      }
+
+      return resolve(stdout)
+    })
+  })
+}
+
 const compareWithJavaImplementation = (avdlPath: string, name: string) => async () => {
   const absolutePathToAvdlToAVSC = absolutePath('./bin/avdlToAVSC.sh')
-  const execaArgs = [`./fixtures/avdl/${avdlPath}`, name]
 
   let expectedAVSC
   try {
-    const { stdout: result } = await execa(absolutePathToAvdlToAVSC, execaArgs)
+    const result = await promisifiedExec(
+      `${absolutePathToAvdlToAVSC} ./fixtures/avdl/${avdlPath} ${name}`,
+    )
     expectedAVSC = JSON.parse(result)
   } catch (error) {
     console.error(`Error when running ${absolutePathToAvdlToAVSC}`, error) // eslint-disable-line no-console
@@ -31,7 +44,17 @@ const compareWithJavaImplementation = (avdlPath: string, name: string) => async
 
 beforeAll(async () => {
   jest.setTimeout(10000)
-  await fs.emptyDir(absolutePath('./tmp'))
+
+  // deletes all the files from tmp dir
+  const tmpDirectory = absolutePath('./tmp')
+  try {
+    fs.statSync(tmpDirectory)
+  } catch (e) {
+    fs.mkdirSync(tmpDirectory)
+  }
+  for (const file of fs.readdirSync(tmpDirectory)) {
+    fs.unlinkSync(path.join(tmpDirectory, file))
+  }
 })
 
 test('simple protocol', compareWithJavaImplementation('simple.avdl', 'Simple'))

package/src/utils/avdlToAVSC.ts

@@ -21,7 +21,7 @@ interface Field {
 
 let cache: any
 const merge = Object.assign
-const isObject = (obj: unknown): obj is Obj => obj && typeof obj === 'object'
+const isObject = (obj: unknown): obj is Obj => !!obj && typeof obj === 'object'
 const isIterable = (obj: unknown): obj is Iterable =>
   isObject(obj) && typeof obj.map !== 'undefined'
 const isFieldArray = (field: unknown): field is Field =>
@@ -92,12 +92,12 @@ export function avdlToAVSC(path: any) {
 export async function avdlToAVSCAsync(path: string) {
   cache = {}
 
-  const protocol: { [key: string]: any } = await new Promise((resolve, reject) => {
+  const protocol: Record<string, any> = await new Promise((resolve, reject) => {
     assembleProtocol(path, (err: AssembleProtocolError, schema) => {
       if (err) {
         reject(new ConfluentSchemaRegistryError(`${err.message}. Caused by: ${err.path}`))
       } else {
-        resolve(schema)
+        resolve(schema as Record<string, any>)
       }
     })
   })

package/tmp/Array.avsc

@@ -0,0 +1,22 @@
+{
+  "type" : "record",
+  "name" : "Array",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "properties",
+    "type" : {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "KeyValue",
+        "fields" : [ {
+          "name" : "key",
+          "type" : "string"
+        }, {
+          "name" : "value",
+          "type" : "string"
+        } ]
+      }
+    }
+  } ]
+}

package/tmp/Array1.avsc

@@ -0,0 +1,28 @@
+{
+  "type" : "record",
+  "name" : "Array1",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "array2",
+    "type" : [ "null", {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "Array2",
+        "fields" : [ {
+          "name" : "array2_name",
+          "type" : "string"
+        }, {
+          "name" : "foos",
+          "type" : [ "null", {
+            "type" : "enum",
+            "name" : "Foos",
+            "symbols" : [ "foo", "bar", "baz" ]
+          } ],
+          "default" : null
+        } ]
+      }
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Array2.avsc

@@ -0,0 +1,17 @@
+{
+  "type" : "record",
+  "name" : "Array2",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "array2_name",
+    "type" : "string"
+  }, {
+    "name" : "foos",
+    "type" : [ "null", {
+      "type" : "enum",
+      "name" : "Foos",
+      "symbols" : [ "foo", "bar", "baz" ]
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Array3.avsc

@@ -0,0 +1,17 @@
+{
+  "type" : "record",
+  "name" : "Array3",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "bam",
+    "type" : [ "null", {
+      "type" : "record",
+      "name" : "Bam",
+      "fields" : [ {
+        "name" : "bam",
+        "type" : "string"
+      } ]
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/ArrayUnion.avsc

@@ -0,0 +1,23 @@
+{
+  "type" : "record",
+  "name" : "ArrayUnion",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "properties",
+    "type" : [ "null", {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "KeyValue",
+        "fields" : [ {
+          "name" : "key",
+          "type" : "string"
+        }, {
+          "name" : "value",
+          "type" : "string"
+        } ]
+      }
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Bam.avsc

@@ -0,0 +1,9 @@
+{
+  "type" : "record",
+  "name" : "Bam",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "bam",
+    "type" : "string"
+  } ]
+}

package/tmp/Bar.avsc

@@ -0,0 +1,46 @@
+{
+  "type" : "record",
+  "name" : "Bar",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "baz",
+    "type" : {
+      "type" : "record",
+      "name" : "Baz",
+      "fields" : [ {
+        "name" : "array1",
+        "type" : [ "null", {
+          "type" : "array",
+          "items" : {
+            "type" : "record",
+            "name" : "Array1",
+            "fields" : [ {
+              "name" : "array2",
+              "type" : [ "null", {
+                "type" : "array",
+                "items" : {
+                  "type" : "record",
+                  "name" : "Array2",
+                  "fields" : [ {
+                    "name" : "array2_name",
+                    "type" : "string"
+                  }, {
+                    "name" : "foos",
+                    "type" : [ "null", {
+                      "type" : "enum",
+                      "name" : "Foos",
+                      "symbols" : [ "foo", "bar", "baz" ]
+                    } ],
+                    "default" : null
+                  } ]
+                }
+              } ],
+              "default" : null
+            } ]
+          }
+        } ],
+        "default" : null
+      } ]
+    }
+  } ]
+}

package/tmp/Baz.avsc

@@ -0,0 +1,39 @@
+{
+  "type" : "record",
+  "name" : "Baz",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "array1",
+    "type" : [ "null", {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "Array1",
+        "fields" : [ {
+          "name" : "array2",
+          "type" : [ "null", {
+            "type" : "array",
+            "items" : {
+              "type" : "record",
+              "name" : "Array2",
+              "fields" : [ {
+                "name" : "array2_name",
+                "type" : "string"
+              }, {
+                "name" : "foos",
+                "type" : [ "null", {
+                  "type" : "enum",
+                  "name" : "Foos",
+                  "symbols" : [ "foo", "bar", "baz" ]
+                } ],
+                "default" : null
+              } ]
+            }
+          } ],
+          "default" : null
+        } ]
+      }
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Complex.avsc

@@ -0,0 +1,81 @@
+{
+  "type" : "record",
+  "name" : "Complex",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "array1",
+    "type" : [ "null", {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "Array1",
+        "fields" : [ {
+          "name" : "array2",
+          "type" : [ "null", {
+            "type" : "array",
+            "items" : {
+              "type" : "record",
+              "name" : "Array2",
+              "fields" : [ {
+                "name" : "array2_name",
+                "type" : "string"
+              }, {
+                "name" : "foos",
+                "type" : [ "null", {
+                  "type" : "enum",
+                  "name" : "Foos",
+                  "symbols" : [ "foo", "bar", "baz" ]
+                } ],
+                "default" : null
+              } ]
+            }
+          } ],
+          "default" : null
+        } ]
+      }
+    } ],
+    "default" : null
+  }, {
+    "name" : "array3",
+    "type" : {
+      "type" : "array",
+      "items" : {
+        "type" : "record",
+        "name" : "Array3",
+        "fields" : [ {
+          "name" : "bam",
+          "type" : [ "null", {
+            "type" : "record",
+            "name" : "Bam",
+            "fields" : [ {
+              "name" : "bam",
+              "type" : "string"
+            } ]
+          } ],
+          "default" : null
+        } ]
+      }
+    }
+  }, {
+    "name" : "bar",
+    "type" : {
+      "type" : "record",
+      "name" : "Bar",
+      "fields" : [ {
+        "name" : "baz",
+        "type" : {
+          "type" : "record",
+          "name" : "Baz",
+          "fields" : [ {
+            "name" : "array1",
+            "type" : [ "null", {
+              "type" : "array",
+              "items" : "Array1"
+            } ],
+            "default" : null
+          } ]
+        }
+      } ]
+    }
+  } ]
+}

package/tmp/Enum.avsc

@@ -0,0 +1,13 @@
+{
+  "type" : "record",
+  "name" : "Enum",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "foos",
+    "type" : {
+      "type" : "enum",
+      "name" : "Foos",
+      "symbols" : [ "foo", "bar", "baz" ]
+    }
+  } ]
+}

package/tmp/EnumUnion.avsc

@@ -0,0 +1,14 @@
+{
+  "type" : "record",
+  "name" : "EnumUnion",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "foos",
+    "type" : [ "null", {
+      "type" : "enum",
+      "name" : "Foos",
+      "symbols" : [ "foo", "bar", "baz" ]
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Foos.avsc

@@ -0,0 +1,6 @@
+{
+  "type" : "enum",
+  "name" : "Foos",
+  "namespace" : "com.org.app.track",
+  "symbols" : [ "foo", "bar", "baz" ]
+}

package/tmp/ImportMultipleNamespaces.avsc

@@ -0,0 +1,35 @@
+{
+  "type" : "record",
+  "name" : "ImportMultipleNamespaces",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "metadata",
+    "type" : {
+      "type" : "record",
+      "name" : "Metadata",
+      "namespace" : "com.org.messaging",
+      "fields" : [ {
+        "name" : "event_id",
+        "type" : "string"
+      }, {
+        "name" : "publisher_system_id",
+        "type" : "string"
+      }, {
+        "name" : "occurred_at",
+        "type" : {
+          "type" : "long",
+          "logicalType" : "timestamp-millis"
+        }
+      }, {
+        "name" : "published_at",
+        "type" : {
+          "type" : "long",
+          "logicalType" : "timestamp-millis"
+        }
+      }, {
+        "name" : "correlation_id",
+        "type" : "string"
+      } ]
+    }
+  } ]
+}

package/tmp/KeyValue.avsc

@@ -0,0 +1,12 @@
+{
+  "type" : "record",
+  "name" : "KeyValue",
+  "namespace" : "com.org.app.track",
+  "fields" : [ {
+    "name" : "key",
+    "type" : "string"
+  }, {
+    "name" : "value",
+    "type" : "string"
+  } ]
+}

package/tmp/Metadata.avsc

@@ -0,0 +1,27 @@
+{
+  "type" : "record",
+  "name" : "Metadata",
+  "namespace" : "com.org.messaging",
+  "fields" : [ {
+    "name" : "event_id",
+    "type" : "string"
+  }, {
+    "name" : "publisher_system_id",
+    "type" : "string"
+  }, {
+    "name" : "occurred_at",
+    "type" : {
+      "type" : "long",
+      "logicalType" : "timestamp-millis"
+    }
+  }, {
+    "name" : "published_at",
+    "type" : {
+      "type" : "long",
+      "logicalType" : "timestamp-millis"
+    }
+  }, {
+    "name" : "correlation_id",
+    "type" : "string"
+  } ]
+}

package/tmp/Multiple.avsc

@@ -0,0 +1,26 @@
+{
+  "type" : "record",
+  "name" : "Multiple",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "foo",
+    "type" : "string"
+  }, {
+    "name" : "bar",
+    "type" : {
+      "type" : "record",
+      "name" : "Bar",
+      "fields" : [ {
+        "name" : "baz",
+        "type" : {
+          "type" : "record",
+          "name" : "Baz",
+          "fields" : [ {
+            "name" : "bam",
+            "type" : "string"
+          } ]
+        }
+      } ]
+    }
+  } ]
+}

package/tmp/MultipleNamespaces.avsc

@@ -0,0 +1,44 @@
+{
+  "type" : "record",
+  "name" : "MultipleNamespaces",
+  "namespace" : "com.org.confluentschemaregistry",
+  "fields" : [ {
+    "name" : "metadata",
+    "type" : {
+      "type" : "record",
+      "name" : "Metadata",
+      "namespace" : "com.org.messaging",
+      "fields" : [ {
+        "name" : "event_id",
+        "type" : "string"
+      }, {
+        "name" : "publisher_system_id",
+        "type" : "string"
+      }, {
+        "name" : "occurred_at",
+        "type" : {
+          "type" : "long",
+          "logicalType" : "timestamp-millis"
+        }
+      }, {
+        "name" : "published_at",
+        "type" : {
+          "type" : "long",
+          "logicalType" : "timestamp-millis"
+        }
+      }, {
+        "name" : "correlation_id",
+        "type" : "string"
+      } ]
+    }
+  }, {
+    "name" : "id",
+    "type" : "string"
+  }, {
+    "name" : "amount",
+    "type" : "int"
+  }, {
+    "name" : "description",
+    "type" : "string"
+  } ]
+}

package/tmp/MultipleUnion.avsc

@@ -0,0 +1,28 @@
+{
+  "type" : "record",
+  "name" : "MultipleUnion",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "foo",
+    "type" : "string"
+  }, {
+    "name" : "bar",
+    "type" : [ "null", {
+      "type" : "record",
+      "name" : "Bar",
+      "fields" : [ {
+        "name" : "baz",
+        "type" : [ "null", {
+          "type" : "record",
+          "name" : "Baz",
+          "fields" : [ {
+            "name" : "bam",
+            "type" : "string"
+          } ]
+        } ],
+        "default" : null
+      } ]
+    } ],
+    "default" : null
+  } ]
+}

package/tmp/Simple.avsc

@@ -0,0 +1,9 @@
+{
+  "type" : "record",
+  "name" : "Simple",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "foo",
+    "type" : "string"
+  } ]
+}

package/tmp/Two.avsc

@@ -0,0 +1,19 @@
+{
+  "type" : "record",
+  "name" : "Two",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "foo",
+    "type" : "string"
+  }, {
+    "name" : "bar",
+    "type" : {
+      "type" : "record",
+      "name" : "Bar",
+      "fields" : [ {
+        "name" : "baz",
+        "type" : "string"
+      } ]
+    }
+  } ]
+}

package/tmp/Union.avsc

@@ -0,0 +1,20 @@
+{
+  "type" : "record",
+  "name" : "Union",
+  "namespace" : "com.org.domain.fixtures",
+  "fields" : [ {
+    "name" : "foo",
+    "type" : "string"
+  }, {
+    "name" : "bar",
+    "type" : [ "null", {
+      "type" : "record",
+      "name" : "Bar",
+      "fields" : [ {
+        "name" : "baz",
+        "type" : "string"
+      } ]
+    } ],
+    "default" : null
+  } ]
+}

package/dockest.ts

@@ -1,30 +0,0 @@
-import { Dockest, sleepWithLog, logLevel } from 'dockest'
-import { DockestService } from 'dockest/dist/@types'
-
-const dockest = new Dockest({
-  composeFile: 'docker-compose.yml',
-  dumpErrors: true,
-  jestLib: require('jest'),
-  jestOpts: {
-    updateSnapshot: true,
-  },
-  logLevel: logLevel.DEBUG,
-})
-
-const dockestServices: DockestService[] = [
-  {
-    serviceName: 'zooKeeper',
-    dependents: [
-      {
-        serviceName: 'kafka',
-        readinessCheck: () => sleepWithLog(10, `Sleeping for Kafka`),
-      },
-    ],
-  },
-  {
-    serviceName: 'schemaRegistry',
-    readinessCheck: () => sleepWithLog(35, `Sleeping for Schema Registry`),
-  },
-]
-
-dockest.run(dockestServices)