[ENG-55813]:Update the dependancy for below mentioned collectors (ale…

…rtlogic#378) * Bump the collector version * Updated the dependancy and fix the code as per latest document * fix the testcases * Fix the okta code and testcase
rakhimundhada15 · Aug 30, 2024 · 4f42e22 · 4f42e22
1 parent 83129f0
commit 4f42e22
Show file tree

Hide file tree

Showing 23 changed files with 354 additions and 286 deletions.
diff --git a/collectors/auth0/package.json b/collectors/auth0/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth0-collector",
-  "version": "1.1.56",
+  "version": "1.1.57",
   "description": "Alert Logic AWS based Auth0 Log Collector extension",
   "repository": {},
   "private": true,
@@ -9,27 +9,27 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.632.0",
+    "@aws-sdk/client-cloudwatch": "^3.632.0",
+    "@aws-sdk/client-dynamodb": "^3.632.0",
+    "@aws-sdk/client-kms": "^3.632.0",
+    "@aws-sdk/client-lambda": "^3.634.0",
+    "@aws-sdk/client-s3": "^3.633.0",
+    "@aws-sdk/client-sqs": "^3.632.0",
+    "@aws-sdk/client-ssm": "^3.632.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "^3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
-    "async": "^3.2.5",
-    "auth0": "^3.1.2",
-    "debug": "^4.3.5",
+    "@alertlogic/al-collector-js": "^3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
+    "async": "^3.2.6",
+    "auth0": "^3.7.2",
+    "debug": "^4.3.6",
     "moment": "^2.30.1"
   },
   "author": "Alert Logic Inc."

diff --git a/collectors/carbonblack/package.json b/collectors/carbonblack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carbonblack-collector",
-  "version": "1.0.54",
+  "version": "1.0.55",
   "description": "Alert Logic AWS based Carbonblack Log Collector",
   "repository": {},
   "private": true,
@@ -9,26 +9,26 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.629.0",
+    "@aws-sdk/client-cloudwatch": "^3.629.0",
+    "@aws-sdk/client-dynamodb": "^3.629.0",
+    "@aws-sdk/client-kms": "^3.629.0",
+    "@aws-sdk/client-lambda": "^3.629.0",
+    "@aws-sdk/client-s3": "^3.629.0",
+    "@aws-sdk/client-sqs": "^3.629.0",
+    "@aws-sdk/client-ssm": "^3.629.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
+    "@alertlogic/al-collector-js": "3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "moment": "2.30.1",
     "test": "^3.3.0"
   },

diff --git a/collectors/ciscoamp/package.json b/collectors/ciscoamp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ciscoamp-collector",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "description": "Alert Logic AWS based Ciscoamp Log Collector",
   "repository": {},
   "private": true,
@@ -9,26 +9,26 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.629.0",
+    "@aws-sdk/client-cloudwatch": "^3.629.0",
+    "@aws-sdk/client-dynamodb": "^3.629.0",
+    "@aws-sdk/client-kms": "^3.629.0",
+    "@aws-sdk/client-lambda": "^3.629.0",
+    "@aws-sdk/client-s3": "^3.629.0",
+    "@aws-sdk/client-sqs": "^3.629.0",
+    "@aws-sdk/client-ssm": "^3.629.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
+    "@alertlogic/al-collector-js": "3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "moment": "2.30.1"
   },
   "author": "Alert Logic Inc."

diff --git a/collectors/ciscoduo/package.json b/collectors/ciscoduo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ciscoduo-collector",
-  "version": "1.0.53",
+  "version": "1.0.54",
   "description": "Alert Logic AWS based Ciscoduo Log Collector",
   "repository": {},
   "private": true,
@@ -9,27 +9,27 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.632.0",
+    "@aws-sdk/client-cloudwatch": "^3.632.0",
+    "@aws-sdk/client-dynamodb": "^3.632.0",
+    "@aws-sdk/client-kms": "^3.632.0",
+    "@aws-sdk/client-lambda": "^3.632.0",
+    "@aws-sdk/client-s3": "^3.633.0",
+    "@aws-sdk/client-sqs": "^3.632.0",
+    "@aws-sdk/client-ssm": "^3.632.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "3.0.11",
-    "@alertlogic/paws-collector": "2.2.4",
+    "@alertlogic/al-collector-js": "3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "@duosecurity/duo_api": "^1.4.0",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "moment": "2.30.1"
   },
   "author": "Alert Logic Inc."

diff --git a/collectors/ciscomeraki/package.json b/collectors/ciscomeraki/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ciscomeraki-collector",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Alert Logic AWS based Cisco Meraki Log Collector",
   "repository": {},
   "private": true,
@@ -9,26 +9,26 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.632.0",
+    "@aws-sdk/client-cloudwatch": "^3.632.0",
+    "@aws-sdk/client-dynamodb": "^3.632.0",
+    "@aws-sdk/client-kms": "^3.632.0",
+    "@aws-sdk/client-lambda": "^3.632.0",
+    "@aws-sdk/client-s3": "^3.633.0",
+    "@aws-sdk/client-sqs": "^3.632.0",
+    "@aws-sdk/client-ssm": "^3.632.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
+    "@alertlogic/al-collector-js": "3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "moment": "2.30.1"
 
   },

diff --git a/collectors/crowdstrike/package.json b/collectors/crowdstrike/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crowdstrike-collector",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Alert Logic AWS based Crowdstrike Log Collector",
   "repository": {},
   "private": true,
@@ -9,26 +9,26 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.632.0",
+    "@aws-sdk/client-cloudwatch": "^3.632.0",
+    "@aws-sdk/client-dynamodb": "^3.632.0",
+    "@aws-sdk/client-kms": "^3.632.0",
+    "@aws-sdk/client-lambda": "^3.632.0",
+    "@aws-sdk/client-s3": "^3.633.0",
+    "@aws-sdk/client-sqs": "^3.632.0",
+    "@aws-sdk/client-ssm": "^3.632.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "^3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
+    "@alertlogic/al-collector-js": "^3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "moment": "2.30.1"
   },
   "author": "Alert Logic Inc."

diff --git a/collectors/googlestackdriver/collector.js b/collectors/googlestackdriver/collector.js
@@ -142,7 +142,7 @@ timestamp < "${state.until}"`;
                 return callback(null, logs, newState, newState.poll_interval_sec);
             })
             .catch(err => {
-                    AlLogger.error(`GSTA000003 err in collection ${JSON.stringify(err)}`);
+                AlLogger.debug(`GSTA000003 err in collection ${JSON.stringify(err)}`);
                 // Stackdriver Logging api has some rate limits that we might run into.
                 // If we run inot a rate limit error, instead of returning the error,
                 // we return the state back to the queue with an additional second added, up to 15 min
@@ -172,11 +172,12 @@ timestamp < "${state.until}"`;
                         return callback(null, [], backOffState, nextPollInterval);
                     });
                 } else {
+                    let error = err.response && err.response.data ? err.response.data : err;
                     // set errorCode if not available in error object to showcase client error on DDMetrics
-                    if (err.code) {
-                        err.errorCode = err.code;
+                    if (err.errors && err.errors.length > 0 && err.errors[0].reason) {
+                        error.errorCode = err.errors[0].reason;
                     }
-                    return callback(err);
+                    return callback(error);
                 }
             });
     }

diff --git a/collectors/googlestackdriver/package.json b/collectors/googlestackdriver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "googlestackdriver-collector",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "Alert Logic AWS based Googlestackdriver Log Collector",
   "repository": {},
   "private": true,
@@ -9,28 +9,28 @@
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=text mocha --colors"
   },
   "devDependencies": {
-    "@aws-sdk/client-cloudformation": "^3.600.0",
-    "@aws-sdk/client-cloudwatch": "^3.600.0",
-    "@aws-sdk/client-dynamodb": "^3.602.0",
-    "@aws-sdk/client-kms": "^3.600.0",
-    "@aws-sdk/client-lambda": "^3.600.0",
-    "@aws-sdk/client-s3": "^3.600.0",
-    "@aws-sdk/client-sqs": "^3.600.0",
-    "@aws-sdk/client-ssm": "^3.600.0",
+    "@aws-sdk/client-cloudformation": "^3.632.0",
+    "@aws-sdk/client-cloudwatch": "^3.632.0",
+    "@aws-sdk/client-dynamodb": "^3.632.0",
+    "@aws-sdk/client-kms": "^3.632.0",
+    "@aws-sdk/client-lambda": "^3.632.0",
+    "@aws-sdk/client-s3": "^3.633.0",
+    "@aws-sdk/client-sqs": "^3.632.0",
+    "@aws-sdk/client-ssm": "^3.632.0",
     "jshint": "^2.13.6",
-    "mocha": "^10.4.0",
+    "mocha": "^10.7.3",
     "mocha-jenkins-reporter": "^0.4.8",
     "nyc": "^17.0.0",
     "rewire": "^7.0.0",
     "sinon": "^18.0.0"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "3.0.11",
-    "@alertlogic/paws-collector": "2.2.3",
+    "@alertlogic/al-collector-js": "3.0.12",
+    "@alertlogic/paws-collector": "2.2.5",
     "async": "^3.2.5",
-    "debug": "^4.3.5",
-    "google-auth-library": "^9.11.0",
-    "googleapis": "^126.0.0",
+    "debug": "^4.3.6",
+    "google-auth-library": "^9.13.0",
+    "googleapis": "^140.0.1",
     "moment": "2.30.1"
   },
   "author": "Alert Logic Inc."

diff --git a/collectors/googlestackdriver/test/test.js b/collectors/googlestackdriver/test/test.js
@@ -331,7 +331,15 @@ timestamp < "${until}"`;
 
             logginClientStub.onCall(0).callsFake(() => {
                 return new Promise((res, rej) => {
-                    rej({code:401});
+                    rej({
+                        code: 401,
+                        errors:
+                            [{
+                                message: 'unauthorized_client',
+                                domain: 'global',
+                                reason: 'Unauthorized'
+                            }]
+                    });
                 });
             });
 
@@ -345,7 +353,7 @@ timestamp < "${until}"`;
                 };
 
                 collector.pawsGetLogs(curState, (err, logs, newState, newPollInterval) =>{
-                    assert.equal(err.errorCode, 401);
+                    assert.equal(err.errorCode, 'Unauthorized');
                     restoreLoggingClientStub();
                     done();
                 });