@itentialopensource/adapter-kafkav2 0.8.1 → 0.9.0

package/CHANGELOG.md

@@ -1,4 +1,20 @@
 
+## 0.9.0 [07-18-2023]
+
+* Add seperate sasl props for consumer and producer
+
+See merge request itentialopensource/adapters/notification-messaging/adapter-kafkav2!10
+
+---
+
+## 0.8.2 [07-18-2023]
+
+* Update dependencies and add fromBeginnimg config
+
+See merge request itentialopensource/adapters/notification-messaging/adapter-kafkav2!9
+
+---
+
 ## 0.8.1 [07-10-2023]
 
 * Revert "Merge branch 'patch/ADAPT-2647' into 'master'"

package/README.md

@@ -277,6 +277,8 @@ The following properties are used to define the Kafka Client. These properties a
 
 | Property | Description |
 | ------- | ------- |
+| consumersasl | Object, SASL authentication configuration for consumer. This is optional if you provide sasl. ex. {  mechanism: 'plain', username: 'foo', password: 'bar' }|
+| producersasl | Object, SASL authentication configuration for producer. This is optional if you provide sasl. ex. { mechanism: 'plain', username: 'foo', password: 'bar' }|
 | brokers | kafka broker:port list |
 | clientId | Client-id is a logical grouping of clients with a meaningful name chosen by the client application |
 | ssl | Object, options to be passed to the tls broker sockets, ex. { rejectUnauthorized: false }.|

package/adapter.js

@@ -11,6 +11,7 @@
 /* eslint import/no-dynamic-require: warn */
 /* eslint global-require: warn */
 /* eslint no-await-in-loop: warn */
+/* eslint no-promise-executor-return: warn */
 
 /* Required libraries.  */
 const fs = require('fs-extra');
@@ -372,6 +373,8 @@ class Kafkav2 extends AdapterBaseCl {
     }
 
     this.KafkaClient = null;
+    this.KafkaProducerClient = null;
+    this.KafkaConsumerClient = null;
     this.producer = null;
     this.consumer = null;
     this.registryUrl = null;
@@ -446,9 +449,21 @@ class Kafkav2 extends AdapterBaseCl {
 
       this.KafkaClient = new Kafka(combinedProps);
 
-      this.producer = this.KafkaClient.producer(this.props.producer || {});
+      if (this.props.client && this.props.client.producersasl) {
+        combinedProps.sasl = this.props.client.producersasl;
+        this.KafkaProducerClient = new Kafka(combinedProps);
+        this.producer = this.KafkaProducerClient.producer(this.props.producer || {});
+      } else {
+        this.producer = this.KafkaClient.producer(this.props.producer || {});
+      }
 
-      this.consumer = this.KafkaClient.consumer(this.props.consumer || {});
+      if (this.props.client && this.props.client.consumersasl) {
+        combinedProps.sasl = this.props.client.consumersasl;
+        this.KafkaConsumerClient = new Kafka(combinedProps);
+        this.consumer = this.KafkaConsumerClient.consumer(this.props.consumer || {});
+      } else {
+        this.consumer = this.KafkaClient.consumer(this.props.consumer || {});
+      }
 
       const isPassingFiltering = (topic, message, filters) => {
         const topicConfig = this.topicsEvents.find((e) => e.topic === topic);
@@ -480,7 +495,7 @@ class Kafkav2 extends AdapterBaseCl {
           topics.push(this.topicsEvents[t].topic);
         }
         await this.consumer.connect();
-        await this.consumer.subscribe({ topics, fromBeginning: true });
+        await this.consumer.subscribe({ topics, fromBeginning: this.props.fromBeginning || false });
 
         let isAppActive = null;
         const topicPartitions = topics.map((topic) => ({ topic }));

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@itentialopensource/adapter-kafkav2",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "description": "Itential adapter to connect to kafka",
   "main": "adapter.js",
   "wizardVersion": "2.35.0",
   "engineVersion": "1.40.2",
   "scripts": {
     "artifactize": "npm i && node utils/packModificationScript.js",
-    "preinstall": "node utils/setup.js && npm install --package-lock-only --ignore-scripts && npx npm-force-resolutions",
+    "preinstall": "node utils/setup.js && npm install --package-lock-only --ignore-scripts",
     "lint": "eslint . --ext .json --ext .js",
     "lint:errors": "node --max_old_space_size=4096 ./node_modules/eslint/bin/eslint.js . --ext .json --ext .js --quiet",
     "test:baseunit": "mocha test/unit/adapterBaseTestUnit.js --LOG=error",
@@ -16,8 +16,7 @@
     "test:cover": "nyc --reporter html --reporter text mocha --reporter dot test/*",
     "test": "npm run test:unit && npm run test:integration",
     "deploy": "npm publish --registry=https://registry.npmjs.org --access=public",
-    "build": "npm run deploy",
-    "postinstall": "patch-package"
+    "build": "npm run deploy"
   },
   "keywords": [
     "Itential",
@@ -43,31 +42,27 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/notification-messaging/adapter-kafkav2",
   "dependencies": {
-    "ajv": "^6.12.0",
+    "ajv": "^8.12.0",
     "avro-schema-registry": "^2.1.0",
     "avsc": "^5.4.21",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^11.1.1",
     "json-query": "^2.2.2",
     "kafkajs": "2.2.3",
-    "package-json-validator": "^0.6.3",
     "patch-package": "^6.4.7",
     "readline-sync": "^1.4.10",
     "request": "^2.88.2",
     "uuid": "^3.0.1"
   },
   "devDependencies": {
-    "chai": "^4.2.0",
-    "eslint": "^7.2.0",
-    "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-json": "^2.1.1",
+    "chai": "^4.3.7",
+    "eslint": "^8.44.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-json": "^3.1.0",
     "mocha": "^9.0.1",
     "nyc": "^15.1.0",
-    "testdouble": "^3.16.1",
+    "testdouble": "^3.18.0",
     "winston": "^3.3.3"
   },
-  "resolutions": {
-    "minimist": "^1.2.5"
-  },
   "private": false
 }

package/test/unit/adapterTestUnit.js

@@ -16,6 +16,9 @@ const execute = require('child_process').execSync;
 const { expect } = require('chai');
 const { use } = require('chai');
 const td = require('testdouble');
+const Ajv = require('ajv');
+
+const ajv = new Ajv({ allErrors: true, unknownFormats: 'ignore' });
 
 const anything = td.matchers.anything();
 
@@ -188,19 +191,24 @@ describe('[unit] Kafka Adapter Test', () => {
       });
       it('package.json should be validated', (done) => {
         const packageDotJson = require('../../package.json');
-        const { PJV } = require('package-json-validator');
-        const options = {
-          warnings: true, // show warnings
-          recommendations: true // show recommendations
+        // Define the JSON schema for package.json
+        const packageJsonSchema = {
+          type: 'object',
+          properties: {
+            name: { type: 'string' },
+            version: { type: 'string' }
+            // May need to add more properties as needed
+          },
+          required: ['name', 'version']
         };
-        const results = PJV.validate(JSON.stringify(packageDotJson), 'npm', options);
+        const validate = ajv.compile(packageJsonSchema);
+        const isValid = validate(packageDotJson);
 
-        if (results.valid === false) {
-          log.error('The package.json contains the following errors: ');
-          log.error(util.inspect(results));
-          assert.equal(true, results.valid);
+        if (isValid === false) {
+          log.error('The package.json contains errors');
+          assert.equal(true, isValid);
         } else {
-          assert.equal(true, results.valid);
+          assert.equal(true, isValid);
         }
 
         done();