Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENG-55813]:Update the dependancy for below mentioned collectors #378

Merged
merged 5 commits into from
Aug 30, 2024
Merged

[ENG-55813]:Update the dependancy for below mentioned collectors #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0b67931
Bump the collector version
Aug 20, 2024
e3d03af
Updated the dependancy and fix the code as per latest document
Aug 22, 2024
6fb98a4
fix the testcases
Aug 23, 2024
b29e35b
Fix the okta code and testcase
Aug 29, 2024
8a5cb42
update the yamp to create build
Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions collectors/auth0/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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."
Expand Down
26 changes: 13 additions & 13 deletions collectors/carbonblack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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"
},
Expand Down
26 changes: 13 additions & 13 deletions collectors/ciscoamp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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."
Expand Down
26 changes: 13 additions & 13 deletions collectors/ciscoduo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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."
Expand Down
26 changes: 13 additions & 13 deletions collectors/ciscomeraki/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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"

},
Expand Down
26 changes: 13 additions & 13 deletions collectors/crowdstrike/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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."
Expand Down
9 changes: 5 additions & 4 deletions collectors/googlestackdriver/collector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
});
}
Expand Down
30 changes: 15 additions & 15 deletions collectors/googlestackdriver/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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."
Expand Down
12 changes: 10 additions & 2 deletions collectors/googlestackdriver/test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}]
});
});
});

Expand All @@ -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();
});
Expand Down
Loading
Loading