From 2766ac1135ed7e2d16d31e2eddc3999d776375b5 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Fri, 3 Nov 2023 15:14:02 -0300 Subject: [PATCH 01/10] Migrate AWS SDK for JavaScript from v2 to v3 --- collectors/aws/accessanalyzer/listFindings.js | 6 ++++-- collectors/aws/apigateway/getClientCertificate.js | 6 ++++-- collectors/aws/apigateway/getIntegration.js | 6 ++++-- collectors/aws/appmesh/describeVirtualGateway.js | 6 ++++-- .../aws/autoscaling/describeLaunchConfigurations.js | 6 ++++-- .../describeNotificationConfigurations.js | 6 ++++-- collectors/aws/cloudfront/getDistribution.js | 6 ++++-- collectors/aws/cloudtrail/listTags.js | 6 ++++-- collectors/aws/cloudwatch/getEc2MetricStatistics.js | 6 ++++-- collectors/aws/cloudwatch/getEcMetricStatistics.js | 6 ++++-- collectors/aws/cloudwatch/getEsMetricStatistics.js | 6 ++++-- collectors/aws/cloudwatch/getRdsMetricStatistics.js | 6 ++++-- .../cloudwatch/getRdsReadIOPSMetricStatistics.js | 6 ++++-- .../cloudwatch/getRdsWriteIOPSMetricStatistics.js | 6 ++++-- .../aws/cloudwatch/getredshiftMetricStatistics.js | 6 ++++-- collectors/aws/codebuild/batchGetProjects.js | 6 ++++-- collectors/aws/collector.js | 10 +++++++++- collectors/aws/collector_multipart.js | 10 +++++++++- .../aws/connect/instanceAttachmentStorageConfigs.js | 6 ++++-- .../listInstanceCallRecordingStorageConfigs.js | 6 ++++-- .../listInstanceChatTranscriptStorageConfigs.js | 6 ++++-- .../listInstanceExportedReportStorageConfigs.js | 6 ++++-- .../listInstanceMediaStreamStorageConfigs.js | 6 ++++-- .../aws/dynamodb/describeContinuousBackups.js | 6 ++++-- collectors/aws/dynamodb/describeTable.js | 6 ++++-- collectors/aws/dynamodb/listBackups.js | 6 ++++-- collectors/aws/ec2/describeSnapshotAttribute.js | 6 ++++-- collectors/aws/ec2/describeSnapshots.js | 13 ++++++++++--- collectors/aws/ec2/describeSubnets.js | 6 ++++-- collectors/aws/ecs/describeCluster.js | 6 ++++-- collectors/aws/ecs/describeContainerInstances.js | 6 ++++-- collectors/aws/ecs/describeServices.js | 6 ++++-- collectors/aws/ecs/describeTasks.js | 6 ++++-- collectors/aws/ecs/listContainerInstances.js | 6 ++++-- collectors/aws/ecs/listServices.js | 6 ++++-- collectors/aws/ecs/listTasks.js | 6 ++++-- collectors/aws/eks/describeCluster.js | 6 ++++-- collectors/aws/eks/describeNodegroups.js | 6 ++++-- collectors/aws/eks/listNodegroups.js | 6 ++++-- .../aws/elasticache/describeCacheSubnetGroups.js | 6 ++++-- .../describeConfigurationSettings.js | 6 ++++-- collectors/aws/elb/describeInstanceHealth.js | 6 ++++-- .../aws/elb/describeLoadBalancerAttributes.js | 6 ++++-- collectors/aws/elb/describeLoadBalancerPolicies.js | 9 +++++++-- collectors/aws/elb/describeTags.js | 6 ++++-- collectors/aws/elbv2/describeListeners.js | 6 ++++-- .../aws/elbv2/describeLoadBalancerAttributes.js | 6 ++++-- collectors/aws/elbv2/describeTags.js | 6 ++++-- collectors/aws/elbv2/describeTargetGroups.js | 6 ++++-- collectors/aws/emr/describeSecurityConfiguration.js | 6 ++++-- collectors/aws/firehose/describeDeliveryStream.js | 6 ++++-- .../aws/guardduty/describePublishingDestination.js | 6 ++++-- collectors/aws/guardduty/getDetector.js | 6 ++++-- collectors/aws/guardduty/getFindings.js | 6 ++++-- collectors/aws/guardduty/getMasterAccount.js | 6 ++++-- collectors/aws/guardduty/listFindings.js | 6 ++++-- .../aws/guardduty/listPublishingDestinations.js | 6 ++++-- collectors/aws/iam/generateCredentialReport.js | 6 ++++-- collectors/aws/iam/getGroupPolicy.js | 6 ++++-- collectors/aws/iam/getInstanceProfile.js | 6 ++++-- collectors/aws/iam/getPolicyVersion.js | 6 ++++-- collectors/aws/iam/getRolePolicy.js | 6 ++++-- collectors/aws/iam/getUserPolicy.js | 6 ++++-- collectors/aws/iam/listRoles.js | 6 ++++-- collectors/aws/kinesis/describeStream.js | 6 ++++-- collectors/aws/kms/getKeyPolicy.js | 6 ++++-- collectors/aws/kms/listGrants.js | 6 ++++-- collectors/aws/lexmodelsv2/describeBotAlias.js | 6 ++++-- collectors/aws/lookoutvision/describeModel.js | 6 ++++-- collectors/aws/managedblockchain/getMember.js | 6 ++++-- collectors/aws/mwaa/getEnvironment.js | 6 ++++-- .../getEncryptionSecurityPolicy.js | 6 ++++-- .../getNetworkSecurityPolicy.js | 6 ++++-- .../listEncryptionSecurityPolicies.js | 6 ++++-- .../listNetworkSecurityPolicies.js | 6 ++++-- collectors/aws/rds/describeDBParameters.js | 6 ++++-- collectors/aws/s3/index.js | 8 +++++--- collectors/aws/s3control/getPublicAccessBlock.js | 6 ++++-- collectors/aws/ses/getIdentityDkimAttributes.js | 6 ++++-- collectors/aws/sqs/getQueueAttributes.js | 6 ++++-- collectors/aws/ssm/describeParameters.js | 6 ++++-- .../support/describeTrustedAdvisorCheckResult.js | 6 ++++-- .../aws/wafregional/listResourcesForWebACL.js | 6 ++++-- collectors/aws/wafv2/getWebACL.js | 6 ++++-- collectors/aws/wafv2/getWebACLForCognitoUserPool.js | 6 ++++-- collectors/aws/wafv2/listResourcesForWebACL.js | 6 ++++-- 86 files changed, 364 insertions(+), 172 deletions(-) diff --git a/collectors/aws/accessanalyzer/listFindings.js b/collectors/aws/accessanalyzer/listFindings.js index 10c9cb933b..555bb32188 100644 --- a/collectors/aws/accessanalyzer/listFindings.js +++ b/collectors/aws/accessanalyzer/listFindings.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + AccessAnalyzer +} = require("@aws-sdk/client-accessanalyzer"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var accessanalyzer = new AWS.AccessAnalyzer(AWSConfig); + var accessanalyzer = new AccessAnalyzer(AWSConfig); async.eachLimit(collection.accessanalyzer.listAnalyzers[AWSConfig.region].data, 15, function(analyzer, cb) { collection.accessanalyzer.listFindings[AWSConfig.region][analyzer.arn] = {}; var params = { diff --git a/collectors/aws/apigateway/getClientCertificate.js b/collectors/aws/apigateway/getClientCertificate.js index 06f3c0b0d2..a9c2241560 100644 --- a/collectors/aws/apigateway/getClientCertificate.js +++ b/collectors/aws/apigateway/getClientCertificate.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + APIGateway +} = require("@aws-sdk/client-api-gateway"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var apigateway = new AWS.APIGateway(AWSConfig); + var apigateway = new APIGateway(AWSConfig); async.eachLimit(collection.apigateway.getRestApis[AWSConfig.region].data, 5, function(api, cb){ if (!collection.apigateway.getStages || diff --git a/collectors/aws/apigateway/getIntegration.js b/collectors/aws/apigateway/getIntegration.js index dc7a737c45..4019eac811 100644 --- a/collectors/aws/apigateway/getIntegration.js +++ b/collectors/aws/apigateway/getIntegration.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + APIGateway +} = require("@aws-sdk/client-api-gateway"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var apigateway = new AWS.APIGateway(AWSConfig); + var apigateway = new APIGateway(AWSConfig); async.eachLimit(collection.apigateway.getRestApis[AWSConfig.region].data, 5, function(api, cb){ if (!collection.apigateway.getResources || diff --git a/collectors/aws/appmesh/describeVirtualGateway.js b/collectors/aws/appmesh/describeVirtualGateway.js index 2bcb597458..81b5bb46ac 100644 --- a/collectors/aws/appmesh/describeVirtualGateway.js +++ b/collectors/aws/appmesh/describeVirtualGateway.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + AppMesh +} = require("@aws-sdk/client-app-mesh"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var appmesh = new AWS.AppMesh(AWSConfig); + var appmesh = new AppMesh(AWSConfig); if (!collection.appmesh || !collection.appmesh.listMeshes || diff --git a/collectors/aws/autoscaling/describeLaunchConfigurations.js b/collectors/aws/autoscaling/describeLaunchConfigurations.js index 55bb0adf0a..8c2328bcc1 100644 --- a/collectors/aws/autoscaling/describeLaunchConfigurations.js +++ b/collectors/aws/autoscaling/describeLaunchConfigurations.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + AutoScaling +} = require("@aws-sdk/client-auto-scaling"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var autoscaling = new AWS.AutoScaling(AWSConfig); + var autoscaling = new AutoScaling(AWSConfig); async.eachLimit(collection.autoscaling.describeAutoScalingGroups[AWSConfig.region].data, 15, function(asg, cb){ collection.autoscaling.describeLaunchConfigurations[AWSConfig.region][asg.AutoScalingGroupARN] = {}; diff --git a/collectors/aws/autoscaling/describeNotificationConfigurations.js b/collectors/aws/autoscaling/describeNotificationConfigurations.js index 34e4adcb6d..25fed77932 100644 --- a/collectors/aws/autoscaling/describeNotificationConfigurations.js +++ b/collectors/aws/autoscaling/describeNotificationConfigurations.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + AutoScaling +} = require("@aws-sdk/client-auto-scaling"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var autoscaling = new AWS.AutoScaling(AWSConfig); + var autoscaling = new AutoScaling(AWSConfig); async.eachLimit(collection.autoscaling.describeAutoScalingGroups[AWSConfig.region].data, 15, function(asg, cb){ var params = { diff --git a/collectors/aws/cloudfront/getDistribution.js b/collectors/aws/cloudfront/getDistribution.js index 22df249208..de1d31b179 100644 --- a/collectors/aws/cloudfront/getDistribution.js +++ b/collectors/aws/cloudfront/getDistribution.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudFront +} = require("@aws-sdk/client-cloudfront"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudfront = new AWS.CloudFront(AWSConfig); + var cloudfront = new CloudFront(AWSConfig); async.eachLimit(collection.cloudfront.listDistributions[AWSConfig.region].data, 15, function(distribution, cb){ collection.cloudfront.getDistribution[AWSConfig.region][distribution.Id] = {}; diff --git a/collectors/aws/cloudtrail/listTags.js b/collectors/aws/cloudtrail/listTags.js index dc3c2cbc9e..c296ae5ada 100644 --- a/collectors/aws/cloudtrail/listTags.js +++ b/collectors/aws/cloudtrail/listTags.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudTrail +} = require("@aws-sdk/client-cloudtrail"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudtrail = new AWS.CloudTrail(AWSConfig); + var cloudtrail = new CloudTrail(AWSConfig); async.eachLimit(collection.cloudtrail.describeTrails[AWSConfig.region].data, 15, function(trail, cb) { var params = { diff --git a/collectors/aws/cloudwatch/getEc2MetricStatistics.js b/collectors/aws/cloudwatch/getEc2MetricStatistics.js index 3742ea8762..e94ac0a04c 100644 --- a/collectors/aws/cloudwatch/getEc2MetricStatistics.js +++ b/collectors/aws/cloudwatch/getEc2MetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require('../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.ec2.describeInstances[AWSConfig.region].data, 10, function(reservation, cb) { reservation.Instances.forEach(instance => { diff --git a/collectors/aws/cloudwatch/getEcMetricStatistics.js b/collectors/aws/cloudwatch/getEcMetricStatistics.js index 68146f8c9a..d875e7d9c5 100644 --- a/collectors/aws/cloudwatch/getEcMetricStatistics.js +++ b/collectors/aws/cloudwatch/getEcMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.elasticache.describeCacheClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.cloudwatch.getEcMetricStatistics[AWSConfig.region][cluster.CacheClusterId] = {}; diff --git a/collectors/aws/cloudwatch/getEsMetricStatistics.js b/collectors/aws/cloudwatch/getEsMetricStatistics.js index 8bcc532c13..36ee968ebe 100644 --- a/collectors/aws/cloudwatch/getEsMetricStatistics.js +++ b/collectors/aws/cloudwatch/getEsMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.opensearch.listDomainNames[AWSConfig.region].data, 10, function(domain, cb){ collection.cloudwatch.getEsMetricStatistics[AWSConfig.region][domain.DomainName] = {}; diff --git a/collectors/aws/cloudwatch/getRdsMetricStatistics.js b/collectors/aws/cloudwatch/getRdsMetricStatistics.js index 07754f026e..e5c07307f8 100644 --- a/collectors/aws/cloudwatch/getRdsMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){ collection.cloudwatch.getRdsMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier] = {}; diff --git a/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js b/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js index abbdc2ef25..4c098f8074 100644 --- a/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){ collection.cloudwatch.getRdsReadIOPSMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier] = {}; diff --git a/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js b/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js index dc06cb6861..95d047807e 100644 --- a/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){ collection.cloudwatch.getRdsWriteIOPSMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier] = {}; diff --git a/collectors/aws/cloudwatch/getredshiftMetricStatistics.js b/collectors/aws/cloudwatch/getredshiftMetricStatistics.js index 1504781a36..a0e3749424 100644 --- a/collectors/aws/cloudwatch/getredshiftMetricStatistics.js +++ b/collectors/aws/cloudwatch/getredshiftMetricStatistics.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CloudWatch +} = require("@aws-sdk/client-cloudwatch"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var cloudwatch = new AWS.CloudWatch(AWSConfig); + var cloudwatch = new CloudWatch(AWSConfig); async.eachLimit(collection.redshift.describeClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.cloudwatch.getredshiftMetricStatistics[AWSConfig.region][cluster.ClusterIdentifier] = {}; diff --git a/collectors/aws/codebuild/batchGetProjects.js b/collectors/aws/codebuild/batchGetProjects.js index f3b9e0b8d9..a5264b6fd1 100644 --- a/collectors/aws/codebuild/batchGetProjects.js +++ b/collectors/aws/codebuild/batchGetProjects.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + CodeBuild +} = require("@aws-sdk/client-codebuild"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var codebuild = new AWS.CodeBuild(AWSConfig); + var codebuild = new CodeBuild(AWSConfig); async.eachLimit(collection.codebuild.listProjects[AWSConfig.region].data, 15, function(project, cb){ collection.codebuild.batchGetProjects[AWSConfig.region][project] = {}; diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 6f7fa7b99a..0dc7d9e340 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -17,6 +17,11 @@ *********************/ var AWS = require('aws-sdk'); + +const { + EC2 +} = require("@aws-sdk/client-ec2"); + var async = require('async'); var https = require('https'); var helpers = require(__dirname + '/../../helpers/aws'); @@ -24,6 +29,9 @@ var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); // Override max sockets var agent = new https.Agent({maxSockets: 100}); +// JS SDK v3 does not support global configuration. +// Codemod has attempted to pass values to each service client in this file. +// You may need to update clients outside of this file, if they use global config. AWS.config.update({httpOptions: {agent: agent}}); var rateError = {message: 'rate', statusCode: 429}; @@ -63,7 +71,7 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - var AWSEC2 = new AWS.EC2(AWSConfig); + var AWSEC2 = new EC2(AWSConfig); var params = {AllRegions: true}; var excludeRegions = []; diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index e9960d4aee..5c9df3717b 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -17,6 +17,11 @@ *********************/ var AWS = require('aws-sdk'); + +const { + EC2 +} = require("@aws-sdk/client-ec2"); + var async = require('async'); var https = require('https'); var helpers = require(__dirname + '/../../helpers/aws'); @@ -25,6 +30,9 @@ var collectData = require(__dirname + '/../../helpers/shared.js'); // Override max sockets var agent = new https.Agent({maxSockets: 100}); +// JS SDK v3 does not support global configuration. +// Codemod has attempted to pass values to each service client in this file. +// You may need to update clients outside of this file, if they use global config. AWS.config.update({httpOptions: {agent: agent}}); var CALLS_CONFIG = { @@ -80,7 +88,7 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - var AWSEC2 = new AWS.EC2(AWSConfig); + var AWSEC2 = new EC2(AWSConfig); var params = {AllRegions: true}; var excludeRegions = []; var timeoutCheck; diff --git a/collectors/aws/connect/instanceAttachmentStorageConfigs.js b/collectors/aws/connect/instanceAttachmentStorageConfigs.js index ef5b983ba2..f052a90f5e 100644 --- a/collectors/aws/connect/instanceAttachmentStorageConfigs.js +++ b/collectors/aws/connect/instanceAttachmentStorageConfigs.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Connect +} = require("@aws-sdk/client-connect"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var connect = new AWS.Connect(AWSConfig); + var connect = new Connect(AWSConfig); async.eachLimit(collection.connect.listInstances[AWSConfig.region].data, 15, function(instance, cb){ collection.connect.instanceAttachmentStorageConfigs[AWSConfig.region][instance.Id] = {}; diff --git a/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js b/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js index 6d24e6f137..2c49de9e0b 100644 --- a/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js +++ b/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Connect +} = require("@aws-sdk/client-connect"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var connect = new AWS.Connect(AWSConfig); + var connect = new Connect(AWSConfig); async.eachLimit(collection.connect.listInstances[AWSConfig.region].data, 15, function(instance, cb){ collection.connect.listInstanceCallRecordingStorageConfigs[AWSConfig.region][instance.Id] = {}; diff --git a/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js b/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js index 163f67c79c..924f3635ed 100644 --- a/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js +++ b/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Connect +} = require("@aws-sdk/client-connect"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var connect = new AWS.Connect(AWSConfig); + var connect = new Connect(AWSConfig); async.eachLimit(collection.connect.listInstances[AWSConfig.region].data, 15, function(instance, cb){ collection.connect.listInstanceChatTranscriptStorageConfigs[AWSConfig.region][instance.Id] = {}; diff --git a/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js b/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js index 325536b259..6840f7dfe8 100644 --- a/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js +++ b/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Connect +} = require("@aws-sdk/client-connect"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var connect = new AWS.Connect(AWSConfig); + var connect = new Connect(AWSConfig); async.eachLimit(collection.connect.listInstances[AWSConfig.region].data, 15, function(instance, cb){ collection.connect.listInstanceExportedReportStorageConfigs[AWSConfig.region][instance.Id] = {}; diff --git a/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js b/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js index 0dd1323f52..8b5f1d89f0 100644 --- a/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js +++ b/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Connect +} = require("@aws-sdk/client-connect"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var connect = new AWS.Connect(AWSConfig); + var connect = new Connect(AWSConfig); async.eachLimit(collection.connect.listInstances[AWSConfig.region].data, 15, function(instance, cb){ collection.connect.listInstanceMediaStreamStorageConfigs[AWSConfig.region][instance.Id] = {}; diff --git a/collectors/aws/dynamodb/describeContinuousBackups.js b/collectors/aws/dynamodb/describeContinuousBackups.js index eb919126df..d4eb8ccfa6 100644 --- a/collectors/aws/dynamodb/describeContinuousBackups.js +++ b/collectors/aws/dynamodb/describeContinuousBackups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + DynamoDB +} = require("@aws-sdk/client-dynamodb"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var dynamodb = new AWS.DynamoDB(AWSConfig); + var dynamodb = new DynamoDB(AWSConfig); async.eachLimit(collection.dynamodb.listTables[AWSConfig.region].data, 15, function(table, cb){ collection.dynamodb.describeContinuousBackups[AWSConfig.region][table] = {}; diff --git a/collectors/aws/dynamodb/describeTable.js b/collectors/aws/dynamodb/describeTable.js index 1beeb3f4e4..7137957455 100644 --- a/collectors/aws/dynamodb/describeTable.js +++ b/collectors/aws/dynamodb/describeTable.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + DynamoDB +} = require("@aws-sdk/client-dynamodb"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var dynamodb = new AWS.DynamoDB(AWSConfig); + var dynamodb = new DynamoDB(AWSConfig); async.eachLimit(collection.dynamodb.listTables[AWSConfig.region].data, 15, function(table, cb){ collection.dynamodb.describeTable[AWSConfig.region][table] = {}; diff --git a/collectors/aws/dynamodb/listBackups.js b/collectors/aws/dynamodb/listBackups.js index 67bd0c374f..1e036ff525 100644 --- a/collectors/aws/dynamodb/listBackups.js +++ b/collectors/aws/dynamodb/listBackups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + DynamoDB +} = require("@aws-sdk/client-dynamodb"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var dynamodb = new AWS.DynamoDB(AWSConfig); + var dynamodb = new DynamoDB(AWSConfig); async.eachLimit(collection.dynamodb.listTables[AWSConfig.region].data, 15, function(table, cb){ collection.dynamodb.listBackups[AWSConfig.region][table] = {}; diff --git a/collectors/aws/ec2/describeSnapshotAttribute.js b/collectors/aws/ec2/describeSnapshotAttribute.js index a7a3577a78..0734e30f17 100644 --- a/collectors/aws/ec2/describeSnapshotAttribute.js +++ b/collectors/aws/ec2/describeSnapshotAttribute.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EC2 +} = require("@aws-sdk/client-ec2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ec2 = new AWS.EC2(AWSConfig); + var ec2 = new EC2(AWSConfig); async.eachLimit(collection.ec2.describeSnapshots[AWSConfig.region].data, 20, function(snapshot, cb){ collection.ec2.describeSnapshotAttribute[AWSConfig.region][snapshot.SnapshotId] = {}; diff --git a/collectors/aws/ec2/describeSnapshots.js b/collectors/aws/ec2/describeSnapshots.js index 0cdf26ef13..04272a75fd 100644 --- a/collectors/aws/ec2/describeSnapshots.js +++ b/collectors/aws/ec2/describeSnapshots.js @@ -1,4 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EC2 +} = require("@aws-sdk/client-ec2"); + +const { + STS +} = require("@aws-sdk/client-sts"); + var helpers = require(__dirname + '/../../../helpers/aws'); // This call must be overridden because the @@ -6,8 +13,8 @@ var helpers = require(__dirname + '/../../../helpers/aws'); // available, including public ones module.exports = function(AWSConfig, collection, retries, callback) { - var ec2 = new AWS.EC2(AWSConfig); - var sts = new AWS.STS(AWSConfig); + var ec2 = new EC2(AWSConfig); + var sts = new STS(AWSConfig); helpers.makeCustomCollectorCall(sts, 'getCallerIdentity', {}, retries, null, null, null, function(stsErr, stsData) { if (stsErr || !stsData.Account) { diff --git a/collectors/aws/ec2/describeSubnets.js b/collectors/aws/ec2/describeSubnets.js index 766ba6e0a1..6b93bd9a4d 100644 --- a/collectors/aws/ec2/describeSubnets.js +++ b/collectors/aws/ec2/describeSubnets.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EC2 +} = require("@aws-sdk/client-ec2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ec2 = new AWS.EC2(AWSConfig); + var ec2 = new EC2(AWSConfig); async.eachLimit(collection.ec2.describeVpcs[AWSConfig.region].data, 15, function(vpc, cb){ collection.ec2.describeSubnets[AWSConfig.region][vpc.VpcId] = {}; diff --git a/collectors/aws/ecs/describeCluster.js b/collectors/aws/ecs/describeCluster.js index 965206dbe3..8ac7bc7f03 100644 --- a/collectors/aws/ecs/describeCluster.js +++ b/collectors/aws/ecs/describeCluster.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachLimit(collection.ecs.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.ecs.describeCluster[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/ecs/describeContainerInstances.js b/collectors/aws/ecs/describeContainerInstances.js index 8d0bdd4bdf..93bf6a8faa 100644 --- a/collectors/aws/ecs/describeContainerInstances.js +++ b/collectors/aws/ecs/describeContainerInstances.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachOfLimit(collection.ecs.listContainerInstances[AWSConfig.region], 10, function(containerInstanceData,instance, cb){ async.eachLimit(containerInstanceData.data, 5, function(containerInstance, ccb){ diff --git a/collectors/aws/ecs/describeServices.js b/collectors/aws/ecs/describeServices.js index 08773ec42b..b0ffc60171 100644 --- a/collectors/aws/ecs/describeServices.js +++ b/collectors/aws/ecs/describeServices.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachOfLimit(collection.ecs.listServices[AWSConfig.region], 10, function(servicesData,instance, cb){ async.eachLimit(servicesData.data, 5, function(service, ccb){ diff --git a/collectors/aws/ecs/describeTasks.js b/collectors/aws/ecs/describeTasks.js index cbe9e8e3e3..b4e5f5d108 100644 --- a/collectors/aws/ecs/describeTasks.js +++ b/collectors/aws/ecs/describeTasks.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachOfLimit(collection.ecs.listTasks[AWSConfig.region], 10, function(tasksData,instance, cb){ async.eachLimit(tasksData.data, 5, function(task, ccb){ diff --git a/collectors/aws/ecs/listContainerInstances.js b/collectors/aws/ecs/listContainerInstances.js index 987ca65d2b..3cf31e7b9a 100644 --- a/collectors/aws/ecs/listContainerInstances.js +++ b/collectors/aws/ecs/listContainerInstances.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachLimit(collection.ecs.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.ecs.listContainerInstances[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/ecs/listServices.js b/collectors/aws/ecs/listServices.js index 916ab9002d..d0ad99c363 100644 --- a/collectors/aws/ecs/listServices.js +++ b/collectors/aws/ecs/listServices.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachLimit(collection.ecs.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.ecs.listServices[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/ecs/listTasks.js b/collectors/aws/ecs/listTasks.js index aee40fe258..d58fffa4a5 100644 --- a/collectors/aws/ecs/listTasks.js +++ b/collectors/aws/ecs/listTasks.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ECS +} = require("@aws-sdk/client-ecs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.ECS(AWSConfig); + var ecs = new ECS(AWSConfig); async.eachLimit(collection.ecs.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.ecs.listTasks[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/eks/describeCluster.js b/collectors/aws/eks/describeCluster.js index e5e485badc..ff2cf239e2 100644 --- a/collectors/aws/eks/describeCluster.js +++ b/collectors/aws/eks/describeCluster.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EKS +} = require("@aws-sdk/client-eks"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var eks = new AWS.EKS(AWSConfig); + var eks = new EKS(AWSConfig); async.eachLimit(collection.eks.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.eks.describeCluster[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/eks/describeNodegroups.js b/collectors/aws/eks/describeNodegroups.js index bba92226ef..3e69af3bd4 100644 --- a/collectors/aws/eks/describeNodegroups.js +++ b/collectors/aws/eks/describeNodegroups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EKS +} = require("@aws-sdk/client-eks"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var eks = new AWS.EKS(AWSConfig); + var eks = new EKS(AWSConfig); //var autoscaling = new AWS.AutoScaling(AWSConfig); async.eachLimit(collection.eks.listClusters[AWSConfig.region].data, 5, function(cluster, cb){ diff --git a/collectors/aws/eks/listNodegroups.js b/collectors/aws/eks/listNodegroups.js index 3679225bfb..dab466820a 100644 --- a/collectors/aws/eks/listNodegroups.js +++ b/collectors/aws/eks/listNodegroups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EKS +} = require("@aws-sdk/client-eks"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var eks = new AWS.EKS(AWSConfig); + var eks = new EKS(AWSConfig); async.eachLimit(collection.eks.listClusters[AWSConfig.region].data, 10, function(cluster, cb){ collection.eks.listNodegroups[AWSConfig.region][cluster] = {}; diff --git a/collectors/aws/elasticache/describeCacheSubnetGroups.js b/collectors/aws/elasticache/describeCacheSubnetGroups.js index c9439edbac..3327dc9589 100644 --- a/collectors/aws/elasticache/describeCacheSubnetGroups.js +++ b/collectors/aws/elasticache/describeCacheSubnetGroups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElastiCache +} = require("@aws-sdk/client-elasticache"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elasticache = new AWS.ElastiCache(AWSConfig); + var elasticache = new ElastiCache(AWSConfig); async.eachLimit(collection.elasticache.describeCacheClusters[AWSConfig.region].data, 15, function(cluster, cb){ collection.elasticache.describeCacheSubnetGroups[AWSConfig.region][cluster.CacheSubnetGroupName] = {}; diff --git a/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js b/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js index 287476cd50..bd6ec115a3 100644 --- a/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js +++ b/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticBeanstalk +} = require("@aws-sdk/client-elastic-beanstalk"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elasticbeanstalk = new AWS.ElasticBeanstalk(AWSConfig); + var elasticbeanstalk = new ElasticBeanstalk(AWSConfig); async.eachLimit(collection.elasticbeanstalk.describeEnvironments[AWSConfig.region].data, 15, function(environment, cb) { var params = { diff --git a/collectors/aws/elb/describeInstanceHealth.js b/collectors/aws/elb/describeInstanceHealth.js index 862c3a6ed3..21c1081f34 100644 --- a/collectors/aws/elb/describeInstanceHealth.js +++ b/collectors/aws/elb/describeInstanceHealth.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancing +} = require("@aws-sdk/client-elastic-load-balancing"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELB(AWSConfig); + var elb = new ElasticLoadBalancing(AWSConfig); async.eachLimit(collection.elb.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elb.describeInstanceHealth[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/elb/describeLoadBalancerAttributes.js b/collectors/aws/elb/describeLoadBalancerAttributes.js index 480267a287..c4e3b9d421 100644 --- a/collectors/aws/elb/describeLoadBalancerAttributes.js +++ b/collectors/aws/elb/describeLoadBalancerAttributes.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancing +} = require("@aws-sdk/client-elastic-load-balancing"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELB(AWSConfig); + var elb = new ElasticLoadBalancing(AWSConfig); async.eachLimit(collection.elb.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elb.describeLoadBalancerAttributes[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/elb/describeLoadBalancerPolicies.js b/collectors/aws/elb/describeLoadBalancerPolicies.js index 8540fe804e..140d32b2e9 100644 --- a/collectors/aws/elb/describeLoadBalancerPolicies.js +++ b/collectors/aws/elb/describeLoadBalancerPolicies.js @@ -1,11 +1,16 @@ // TODO: re-visit this one -var AWS = require('aws-sdk'); + + +const { + ElasticLoadBalancing +} = require("@aws-sdk/client-elastic-load-balancing"); + var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELB(AWSConfig); + var elb = new ElasticLoadBalancing(AWSConfig); // Gather list of policies from load balancers var policies = []; diff --git a/collectors/aws/elb/describeTags.js b/collectors/aws/elb/describeTags.js index a26db66f81..96eaa89d42 100644 --- a/collectors/aws/elb/describeTags.js +++ b/collectors/aws/elb/describeTags.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancing +} = require("@aws-sdk/client-elastic-load-balancing"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELB(AWSConfig); + var elb = new ElasticLoadBalancing(AWSConfig); async.eachLimit(collection.elb.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elb.describeTags[AWSConfig.region][lb.LoadBalancerName] = {}; diff --git a/collectors/aws/elbv2/describeListeners.js b/collectors/aws/elbv2/describeListeners.js index 7ab5d6f0b9..132f3a939a 100644 --- a/collectors/aws/elbv2/describeListeners.js +++ b/collectors/aws/elbv2/describeListeners.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancingV2 +} = require("@aws-sdk/client-elastic-load-balancing-v2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELBv2(AWSConfig); + var elb = new ElasticLoadBalancingV2(AWSConfig); async.eachLimit(collection.elbv2.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elbv2.describeListeners[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/elbv2/describeLoadBalancerAttributes.js b/collectors/aws/elbv2/describeLoadBalancerAttributes.js index 330020ff88..84d656761b 100644 --- a/collectors/aws/elbv2/describeLoadBalancerAttributes.js +++ b/collectors/aws/elbv2/describeLoadBalancerAttributes.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancingV2 +} = require("@aws-sdk/client-elastic-load-balancing-v2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELBv2(AWSConfig); + var elb = new ElasticLoadBalancingV2(AWSConfig); async.eachLimit(collection.elbv2.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elbv2.describeLoadBalancerAttributes[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/elbv2/describeTags.js b/collectors/aws/elbv2/describeTags.js index b15b568f6a..8e77224035 100644 --- a/collectors/aws/elbv2/describeTags.js +++ b/collectors/aws/elbv2/describeTags.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancingV2 +} = require("@aws-sdk/client-elastic-load-balancing-v2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELBv2(AWSConfig); + var elb = new ElasticLoadBalancingV2(AWSConfig); async.eachLimit(collection.elbv2.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elbv2.describeTags[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/elbv2/describeTargetGroups.js b/collectors/aws/elbv2/describeTargetGroups.js index 2194a937cb..e2b6b8fc32 100644 --- a/collectors/aws/elbv2/describeTargetGroups.js +++ b/collectors/aws/elbv2/describeTargetGroups.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ElasticLoadBalancingV2 +} = require("@aws-sdk/client-elastic-load-balancing-v2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var elb = new AWS.ELBv2(AWSConfig); + var elb = new ElasticLoadBalancingV2(AWSConfig); async.eachLimit(collection.elbv2.describeLoadBalancers[AWSConfig.region].data, 15, function(lb, cb){ collection.elbv2.describeTargetGroups[AWSConfig.region][lb.DNSName] = {}; diff --git a/collectors/aws/emr/describeSecurityConfiguration.js b/collectors/aws/emr/describeSecurityConfiguration.js index c3b8760520..e6110738ca 100644 --- a/collectors/aws/emr/describeSecurityConfiguration.js +++ b/collectors/aws/emr/describeSecurityConfiguration.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + EMR +} = require("@aws-sdk/client-emr"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var emr = new AWS.EMR(AWSConfig); + var emr = new EMR(AWSConfig); async.eachLimit(collection.emr.listClusters[AWSConfig.region].data, 15, function(cluster, cb){ if (!collection.emr.describeCluster || diff --git a/collectors/aws/firehose/describeDeliveryStream.js b/collectors/aws/firehose/describeDeliveryStream.js index 0ad2541dcd..36c3ce3257 100644 --- a/collectors/aws/firehose/describeDeliveryStream.js +++ b/collectors/aws/firehose/describeDeliveryStream.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Firehose +} = require("@aws-sdk/client-firehose"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var firehose = new AWS.Firehose(AWSConfig); + var firehose = new Firehose(AWSConfig); async.eachLimit(collection.firehose.listDeliveryStreams[AWSConfig.region].data, 15, function(deliverystream, cb){ collection.firehose.describeDeliveryStream[AWSConfig.region][deliverystream] = {}; diff --git a/collectors/aws/guardduty/describePublishingDestination.js b/collectors/aws/guardduty/describePublishingDestination.js index 9a4ee1cb55..cbd2ed8ec1 100644 --- a/collectors/aws/guardduty/describePublishingDestination.js +++ b/collectors/aws/guardduty/describePublishingDestination.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); if (!collection.guardduty || !collection.guardduty.listDetectors || diff --git a/collectors/aws/guardduty/getDetector.js b/collectors/aws/guardduty/getDetector.js index e19098d888..a9fb0ef9ee 100644 --- a/collectors/aws/guardduty/getDetector.js +++ b/collectors/aws/guardduty/getDetector.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); async.eachLimit(collection.guardduty.listDetectors[AWSConfig.region].data, 15, function(detectorId, cb) { collection.guardduty.getDetector[AWSConfig.region][detectorId] = {}; var params = { diff --git a/collectors/aws/guardduty/getFindings.js b/collectors/aws/guardduty/getFindings.js index c8b1a2e1f7..85d856a5e6 100644 --- a/collectors/aws/guardduty/getFindings.js +++ b/collectors/aws/guardduty/getFindings.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); async.eachLimit(collection.guardduty.listDetectors[AWSConfig.region].data, 15, function(detectorId, dcb) { if (!collection.guardduty || !collection.guardduty.listFindings || diff --git a/collectors/aws/guardduty/getMasterAccount.js b/collectors/aws/guardduty/getMasterAccount.js index e24b7ad158..3318531022 100644 --- a/collectors/aws/guardduty/getMasterAccount.js +++ b/collectors/aws/guardduty/getMasterAccount.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); async.eachLimit(collection.guardduty.listDetectors[AWSConfig.region].data, 15, function(detectorId, cb) { collection.guardduty.getMasterAccount[AWSConfig.region][detectorId] = {}; var params = { diff --git a/collectors/aws/guardduty/listFindings.js b/collectors/aws/guardduty/listFindings.js index 48dd2183d0..9215d960a8 100644 --- a/collectors/aws/guardduty/listFindings.js +++ b/collectors/aws/guardduty/listFindings.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); async.eachLimit(collection.guardduty.listDetectors[AWSConfig.region].data, 15, function(detectorId, cb) { collection.guardduty.listFindings[AWSConfig.region][detectorId] = {}; var params = { diff --git a/collectors/aws/guardduty/listPublishingDestinations.js b/collectors/aws/guardduty/listPublishingDestinations.js index 0b32d7466c..a78e6632bf 100644 --- a/collectors/aws/guardduty/listPublishingDestinations.js +++ b/collectors/aws/guardduty/listPublishingDestinations.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + GuardDuty +} = require("@aws-sdk/client-guardduty"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var guardduty = new AWS.GuardDuty(AWSConfig); + var guardduty = new GuardDuty(AWSConfig); async.eachLimit(collection.guardduty.listDetectors[AWSConfig.region].data, 15, function(detectorId, cb) { collection.guardduty.listPublishingDestinations[AWSConfig.region][detectorId] = {}; var params = { diff --git a/collectors/aws/iam/generateCredentialReport.js b/collectors/aws/iam/generateCredentialReport.js index 4ee1fdb2f3..9c59225ad3 100644 --- a/collectors/aws/iam/generateCredentialReport.js +++ b/collectors/aws/iam/generateCredentialReport.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); var generateCredentialReport = function(genCb) { iam.generateCredentialReport(function(err, data) { diff --git a/collectors/aws/iam/getGroupPolicy.js b/collectors/aws/iam/getGroupPolicy.js index 95b2512819..268abe03ff 100644 --- a/collectors/aws/iam/getGroupPolicy.js +++ b/collectors/aws/iam/getGroupPolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); if (!collection.iam || !collection.iam.listGroups || diff --git a/collectors/aws/iam/getInstanceProfile.js b/collectors/aws/iam/getInstanceProfile.js index 453e2a78fa..a6a5a32a6c 100644 --- a/collectors/aws/iam/getInstanceProfile.js +++ b/collectors/aws/iam/getInstanceProfile.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); if (!collection.ec2 || !collection.ec2.describeInstances || diff --git a/collectors/aws/iam/getPolicyVersion.js b/collectors/aws/iam/getPolicyVersion.js index 0238ee7b73..74ee893c93 100644 --- a/collectors/aws/iam/getPolicyVersion.js +++ b/collectors/aws/iam/getPolicyVersion.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); if (!collection.iam || !collection.iam.listPolicies || diff --git a/collectors/aws/iam/getRolePolicy.js b/collectors/aws/iam/getRolePolicy.js index 239d1e45a9..994cb7cb31 100644 --- a/collectors/aws/iam/getRolePolicy.js +++ b/collectors/aws/iam/getRolePolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); if (!collection.iam || !collection.iam.listRoles || diff --git a/collectors/aws/iam/getUserPolicy.js b/collectors/aws/iam/getUserPolicy.js index d40a3a20d9..514848dbe0 100644 --- a/collectors/aws/iam/getUserPolicy.js +++ b/collectors/aws/iam/getUserPolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); if (!collection.iam || !collection.iam.listUsers || diff --git a/collectors/aws/iam/listRoles.js b/collectors/aws/iam/listRoles.js index c16f2a5c49..fa510eaf13 100644 --- a/collectors/aws/iam/listRoles.js +++ b/collectors/aws/iam/listRoles.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + IAM +} = require("@aws-sdk/client-iam"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var iam = new AWS.IAM(AWSConfig); + var iam = new IAM(AWSConfig); collection.iam.listRoles[AWSConfig.region] = {}; var params = {}; diff --git a/collectors/aws/kinesis/describeStream.js b/collectors/aws/kinesis/describeStream.js index 81fc8c0e32..652fdd7495 100644 --- a/collectors/aws/kinesis/describeStream.js +++ b/collectors/aws/kinesis/describeStream.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Kinesis +} = require("@aws-sdk/client-kinesis"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var kinesis = new AWS.Kinesis(AWSConfig); + var kinesis = new Kinesis(AWSConfig); async.eachLimit(collection.kinesis.listStreams[AWSConfig.region].data, 15, function(stream, cb){ collection.kinesis.describeStream[AWSConfig.region][stream] = {}; diff --git a/collectors/aws/kms/getKeyPolicy.js b/collectors/aws/kms/getKeyPolicy.js index 4e562042f3..3150be8329 100644 --- a/collectors/aws/kms/getKeyPolicy.js +++ b/collectors/aws/kms/getKeyPolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + KMS +} = require("@aws-sdk/client-kms"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var kms = new AWS.KMS(AWSConfig); + var kms = new KMS(AWSConfig); async.eachLimit(collection.kms.listKeys[AWSConfig.region].data, 15, function(key, cb){ collection.kms.getKeyPolicy[AWSConfig.region][key.KeyId] = {}; diff --git a/collectors/aws/kms/listGrants.js b/collectors/aws/kms/listGrants.js index 4272e478b5..0e441b3848 100644 --- a/collectors/aws/kms/listGrants.js +++ b/collectors/aws/kms/listGrants.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + KMS +} = require("@aws-sdk/client-kms"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var kms = new AWS.KMS(AWSConfig); + var kms = new KMS(AWSConfig); async.eachLimit(collection.kms.listKeys[AWSConfig.region].data, 15, function(key, cb) { collection.kms.listGrants[AWSConfig.region][key.KeyId] = {}; var params = { diff --git a/collectors/aws/lexmodelsv2/describeBotAlias.js b/collectors/aws/lexmodelsv2/describeBotAlias.js index fb6c951af8..dacc0ac98c 100644 --- a/collectors/aws/lexmodelsv2/describeBotAlias.js +++ b/collectors/aws/lexmodelsv2/describeBotAlias.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + LexModelsV2 +} = require("@aws-sdk/client-lex-models-v2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var lexmodelsv2 = new AWS.LexModelsV2(AWSConfig); + var lexmodelsv2 = new LexModelsV2(AWSConfig); if (!collection.lexmodelsv2 || !collection.lexmodelsv2.listBots || diff --git a/collectors/aws/lookoutvision/describeModel.js b/collectors/aws/lookoutvision/describeModel.js index c22ac371f6..de1ac598af 100644 --- a/collectors/aws/lookoutvision/describeModel.js +++ b/collectors/aws/lookoutvision/describeModel.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + LookoutVision +} = require("@aws-sdk/client-lookoutvision"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var lookoutvision = new AWS.LookoutVision(AWSConfig); + var lookoutvision = new LookoutVision(AWSConfig); if (!collection.lookoutvision || !collection.lookoutvision.listProjects || diff --git a/collectors/aws/managedblockchain/getMember.js b/collectors/aws/managedblockchain/getMember.js index 743f1cad22..6801a94ead 100644 --- a/collectors/aws/managedblockchain/getMember.js +++ b/collectors/aws/managedblockchain/getMember.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + ManagedBlockchain +} = require("@aws-sdk/client-managedblockchain"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var managedblockchain = new AWS.ManagedBlockchain(AWSConfig); + var managedblockchain = new ManagedBlockchain(AWSConfig); if (!collection.managedblockchain || !collection.managedblockchain.listNetworks || diff --git a/collectors/aws/mwaa/getEnvironment.js b/collectors/aws/mwaa/getEnvironment.js index 6b9ad3f0eb..bf54ebd933 100644 --- a/collectors/aws/mwaa/getEnvironment.js +++ b/collectors/aws/mwaa/getEnvironment.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + MWAA +} = require("@aws-sdk/client-mwaa"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var mwaa = new AWS.MWAA(AWSConfig); + var mwaa = new MWAA(AWSConfig); async.eachLimit(collection.mwaa.listEnvironments[AWSConfig.region].data, 15, function(env, cb){ collection.mwaa.getEnvironment[AWSConfig.region][env] = {}; diff --git a/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js b/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js index d370a344a0..bcf12b4601 100644 --- a/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js +++ b/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + OpenSearchServerless +} = require("@aws-sdk/client-opensearchserverless"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.OpenSearchServerless(AWSConfig); + var ecs = new OpenSearchServerless(AWSConfig); async.eachLimit(collection.opensearchserverless.listEncryptionSecurityPolicies[AWSConfig.region].data, 10, function(policy, cb){ collection.opensearchserverless.getEncryptionSecurityPolicy[AWSConfig.region][policy.name] = {}; diff --git a/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js b/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js index e7ffd7b538..f0a225be85 100644 --- a/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js +++ b/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + OpenSearchServerless +} = require("@aws-sdk/client-opensearchserverless"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ecs = new AWS.OpenSearchServerless(AWSConfig); + var ecs = new OpenSearchServerless(AWSConfig); async.eachLimit(collection.opensearchserverless.listNetworkSecurityPolicies[AWSConfig.region].data, 10, function(policy, cb){ collection.opensearchserverless.getNetworkSecurityPolicy[AWSConfig.region][policy.name] = {}; var params = { diff --git a/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js b/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js index 164092cc06..7aa351b95f 100644 --- a/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js +++ b/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + OpenSearchServerless +} = require("@aws-sdk/client-opensearchserverless"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var opensearch = new AWS.OpenSearchServerless(AWSConfig); + var opensearch = new OpenSearchServerless(AWSConfig); collection.opensearchserverless.listEncryptionSecurityPolicies[AWSConfig.region] = {}; let params = { type: 'encryption' diff --git a/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js b/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js index 99e06b8b01..46b88c7bd1 100644 --- a/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js +++ b/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + OpenSearchServerless +} = require("@aws-sdk/client-opensearchserverless"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var opensearch = new AWS.OpenSearchServerless(AWSConfig); + var opensearch = new OpenSearchServerless(AWSConfig); collection.opensearchserverless.listNetworkSecurityPolicies[AWSConfig.region] = {}; let params = { type: 'network' diff --git a/collectors/aws/rds/describeDBParameters.js b/collectors/aws/rds/describeDBParameters.js index 5cf608fa16..9da47e164c 100644 --- a/collectors/aws/rds/describeDBParameters.js +++ b/collectors/aws/rds/describeDBParameters.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + RDS +} = require("@aws-sdk/client-rds"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var rds = new AWS.RDS(AWSConfig); + var rds = new RDS(AWSConfig); async.eachLimit(collection.rds.describeDBParameterGroups[AWSConfig.region].data, 15, function(group, cb) { collection.rds.describeDBParameters[AWSConfig.region][group.DBParameterGroupName] = {}; var params = { diff --git a/collectors/aws/s3/index.js b/collectors/aws/s3/index.js index bbcac26df5..dbeffb8eb2 100644 --- a/collectors/aws/s3/index.js +++ b/collectors/aws/s3/index.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + S3 +} = require("@aws-sdk/client-s3"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(callKey, forceCloudTrail, AWSConfig, collection, retries, callback) { - var s3 = new AWS.S3(AWSConfig); + var s3 = new S3(AWSConfig); var knownBuckets = []; @@ -51,7 +53,7 @@ module.exports = function(callKey, forceCloudTrail, AWSConfig, collection, retri var altAWSConfig = JSON.parse(JSON.stringify(AWSConfig)); altAWSConfig.region = locData.LocationConstraint; - var s3Alt = new AWS.S3(altAWSConfig); + var s3Alt = new S3(altAWSConfig); s3Alt[callKey]({Bucket:bucket}, function(altErr, altData){ if (altErr) { diff --git a/collectors/aws/s3control/getPublicAccessBlock.js b/collectors/aws/s3control/getPublicAccessBlock.js index 00d57ea3c9..bfa006f22f 100644 --- a/collectors/aws/s3control/getPublicAccessBlock.js +++ b/collectors/aws/s3control/getPublicAccessBlock.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + S3Control +} = require("@aws-sdk/client-s3-control"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var s3control = new AWS.S3Control(AWSConfig); + var s3control = new S3Control(AWSConfig); var accountId = collection.sts.getCallerIdentity[AWSConfig.region].data; collection.s3control.getPublicAccessBlock[AWSConfig.region][accountId] = {}; diff --git a/collectors/aws/ses/getIdentityDkimAttributes.js b/collectors/aws/ses/getIdentityDkimAttributes.js index e67f02564f..cbacbfd634 100644 --- a/collectors/aws/ses/getIdentityDkimAttributes.js +++ b/collectors/aws/ses/getIdentityDkimAttributes.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + SES +} = require("@aws-sdk/client-ses"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ses = new AWS.SES(AWSConfig); + var ses = new SES(AWSConfig); collection.ses.getIdentityDkimAttributes[AWSConfig.region] = {}; var identities = collection.ses.listIdentities[AWSConfig.region].data; diff --git a/collectors/aws/sqs/getQueueAttributes.js b/collectors/aws/sqs/getQueueAttributes.js index 9da6f17aeb..d0720d9bbd 100644 --- a/collectors/aws/sqs/getQueueAttributes.js +++ b/collectors/aws/sqs/getQueueAttributes.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + SQS +} = require("@aws-sdk/client-sqs"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var sqs = new AWS.SQS(AWSConfig); + var sqs = new SQS(AWSConfig); async.eachLimit(collection.sqs.listQueues[AWSConfig.region].data, 15, function(queue, cb){ collection.sqs.getQueueAttributes[AWSConfig.region][queue] = {}; diff --git a/collectors/aws/ssm/describeParameters.js b/collectors/aws/ssm/describeParameters.js index 4c7eb39321..aa927d0920 100644 --- a/collectors/aws/ssm/describeParameters.js +++ b/collectors/aws/ssm/describeParameters.js @@ -1,8 +1,10 @@ -var AWS = require('aws-sdk'); +const { + SSM +} = require("@aws-sdk/client-ssm"); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var ssm = new AWS.SSM(AWSConfig); + var ssm = new SSM(AWSConfig); collection.ssm.describeParameters[AWSConfig.region] = {}; var params = {}; diff --git a/collectors/aws/support/describeTrustedAdvisorCheckResult.js b/collectors/aws/support/describeTrustedAdvisorCheckResult.js index 4f6cdeda97..fdda8634a5 100644 --- a/collectors/aws/support/describeTrustedAdvisorCheckResult.js +++ b/collectors/aws/support/describeTrustedAdvisorCheckResult.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + Support +} = require("@aws-sdk/client-support"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var support = new AWS.Support(AWSConfig); + var support = new Support(AWSConfig); async.eachLimit(collection.support.describeTrustedAdvisorChecks[AWSConfig.region].data, 15, function(check, cb) { collection.support.describeTrustedAdvisorChecks[AWSConfig.region][check] = {}; diff --git a/collectors/aws/wafregional/listResourcesForWebACL.js b/collectors/aws/wafregional/listResourcesForWebACL.js index c1728c507d..bc5d9ad54d 100644 --- a/collectors/aws/wafregional/listResourcesForWebACL.js +++ b/collectors/aws/wafregional/listResourcesForWebACL.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + WAFRegional +} = require("@aws-sdk/client-waf-regional"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var wafregional = new AWS.WAFRegional(AWSConfig); + var wafregional = new WAFRegional(AWSConfig); async.eachLimit(collection.wafregional.listWebACLs[AWSConfig.region].data, 15, function(dep, depCb){ async.eachLimit(['APPLICATION_LOAD_BALANCER', 'API_GATEWAY'], 1, function(thisCheck, tcCb){ if (!collection['wafregional']['listResourcesForWebACL'][AWSConfig.region][dep['WebACLId']]) collection['wafregional']['listResourcesForWebACL'][AWSConfig.region][dep['WebACLId']] = {}; diff --git a/collectors/aws/wafv2/getWebACL.js b/collectors/aws/wafv2/getWebACL.js index b8f5107b13..bee8db398e 100644 --- a/collectors/aws/wafv2/getWebACL.js +++ b/collectors/aws/wafv2/getWebACL.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + WAFV2 +} = require("@aws-sdk/client-wafv2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var wafv2 = new AWS.WAFV2(AWSConfig); + var wafv2 = new WAFV2(AWSConfig); async.eachLimit(collection.wafv2.listWebACLs[AWSConfig.region].data, 15, function(acl, cb){ var params = { diff --git a/collectors/aws/wafv2/getWebACLForCognitoUserPool.js b/collectors/aws/wafv2/getWebACLForCognitoUserPool.js index 5e0f685551..363be64942 100644 --- a/collectors/aws/wafv2/getWebACLForCognitoUserPool.js +++ b/collectors/aws/wafv2/getWebACLForCognitoUserPool.js @@ -1,10 +1,12 @@ -var AWS = require('aws-sdk'); +const { + WAFV2 +} = require("@aws-sdk/client-wafv2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var wafv2 = new AWS.WAFV2(AWSConfig); + var wafv2 = new WAFV2(AWSConfig); var region = 'us-east-1'; var partition = 'aws'; if (wafv2.endpoint.hostname.includes('gov')){ diff --git a/collectors/aws/wafv2/listResourcesForWebACL.js b/collectors/aws/wafv2/listResourcesForWebACL.js index 711a45dbef..3914c06828 100644 --- a/collectors/aws/wafv2/listResourcesForWebACL.js +++ b/collectors/aws/wafv2/listResourcesForWebACL.js @@ -1,9 +1,11 @@ -var AWS = require('aws-sdk'); +const { + WAFV2 +} = require("@aws-sdk/client-wafv2"); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { - var wafv2 = new AWS.WAFV2(AWSConfig); + var wafv2 = new WAFV2(AWSConfig); async.eachLimit(collection.wafv2.listWebACLs[AWSConfig.region].data, 15, function(dep, depCb){ async.eachLimit(['APPLICATION_LOAD_BALANCER', 'API_GATEWAY'], 1, function(thisCheck, tcCb){ if (!collection['wafv2']['listResourcesForWebACL'][AWSConfig.region][dep['ARN']]) collection['wafv2']['listResourcesForWebACL'][AWSConfig.region][dep['ARN']] = {}; From 3e09c5166207d9e4b3280079747544922528fca9 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Mon, 6 Nov 2023 10:28:14 -0400 Subject: [PATCH 02/10] fix minor typos --- plugins/aws/elasticache/elasticacheInstanceGeneration.js | 2 +- plugins/aws/sns/snsValidSubscribers.js | 2 +- plugins/azure/virtualnetworks/virtualNetworkPeering.js | 2 +- plugins/google/deploymentmanager/deleteExpiredDeployments.js | 2 +- plugins/google/iam/serviceAccountKeyRotation.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/aws/elasticache/elasticacheInstanceGeneration.js b/plugins/aws/elasticache/elasticacheInstanceGeneration.js index d5bb0f2c87..6b89daa485 100644 --- a/plugins/aws/elasticache/elasticacheInstanceGeneration.js +++ b/plugins/aws/elasticache/elasticacheInstanceGeneration.js @@ -9,7 +9,7 @@ module.exports = { more_info: 'Using the latest generation of Amazon ElastiCache instances instances will benefit clusters for higher hardware performance, ' + 'better support for latest Memcached and Redis in-memory engines versions and lower costs.', link: 'https://aws.amazon.com/elasticache/previous-generation/', - recommended_action: 'Upgrade ElastiCache instance generaion to the latest available generation.', + recommended_action: 'Upgrade ElastiCache instance generation to the latest available generation.', apis: ['ElastiCache:describeCacheClusters'], run: function(cache, settings, callback) { diff --git a/plugins/aws/sns/snsValidSubscribers.js b/plugins/aws/sns/snsValidSubscribers.js index 2dab47043c..eaa0539e43 100644 --- a/plugins/aws/sns/snsValidSubscribers.js +++ b/plugins/aws/sns/snsValidSubscribers.js @@ -6,7 +6,7 @@ module.exports = { category: 'SNS', domain: 'Application Integration', description: 'Ensure that Amazon SNS subscriptions are valid and there are no unwanted subscribers.', - more_info: 'Amazon Simple Notification Service (Amazon SNS) is a managed service that provides message delivery from publishers to subscribers. So check for appropriate subsribers in order to improve access security to your SNS topics. ', + more_info: 'Amazon Simple Notification Service (Amazon SNS) is a managed service that provides message delivery from publishers to subscribers. So check for appropriate subscribers in order to improve access security to your SNS topics. ', recommended_action: 'Check for unwanted SNS subscriptions periodically', link: 'https://docs.aws.amazon.com/sns/latest/dg/sns-create-subscribe-endpoint-to-topic.html', apis: ['SNS:listSubscriptions'], diff --git a/plugins/azure/virtualnetworks/virtualNetworkPeering.js b/plugins/azure/virtualnetworks/virtualNetworkPeering.js index 9278d4dcd1..af2e92f993 100644 --- a/plugins/azure/virtualnetworks/virtualNetworkPeering.js +++ b/plugins/azure/virtualnetworks/virtualNetworkPeering.js @@ -81,7 +81,7 @@ module.exports = { }); if (unknownSubscriptions.length) { - helpers.addResult(results, 2, `Vitual network has peering with these unknown subscriptions: ${unknownSubscriptions.join(', ')}`, location, virtualNetwork.id); + helpers.addResult(results, 2, `Virtual network has peering with these unknown subscriptions: ${unknownSubscriptions.join(', ')}`, location, virtualNetwork.id); } else { helpers.addResult(results, 0, 'Virtual network is connected with a virtual network in whitelisted subscription', location, virtualNetwork.id); } diff --git a/plugins/google/deploymentmanager/deleteExpiredDeployments.js b/plugins/google/deploymentmanager/deleteExpiredDeployments.js index 646409d467..7fedf1e0e4 100644 --- a/plugins/google/deploymentmanager/deleteExpiredDeployments.js +++ b/plugins/google/deploymentmanager/deleteExpiredDeployments.js @@ -13,7 +13,7 @@ module.exports = { settings: { deployments_expiration_time: { name: 'Deployments Expiration Time', - description: 'Number of days from creation of depoyment after which it should be considered expired', + description: 'Number of days from creation of deployment after which it should be considered expired', regex: '^.*$', default: false } diff --git a/plugins/google/iam/serviceAccountKeyRotation.js b/plugins/google/iam/serviceAccountKeyRotation.js index d6a952d3d7..eba39da9fa 100644 --- a/plugins/google/iam/serviceAccountKeyRotation.js +++ b/plugins/google/iam/serviceAccountKeyRotation.js @@ -13,7 +13,7 @@ module.exports = { settings: { service_account_keys_rotated_fail: { name: 'Service Account Keys Rotated Fail', - description: 'Return a failing result when service accoun keys exceed this number of days without being rotated', + description: 'Return a failing result when service account keys exceed this number of days without being rotated', regex: '^[1-9]{1}[0-9]{0,3}$', default: '90' } From 0d9f5a93c9fa5390316800956bca3c5f0b59589e Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Mon, 6 Nov 2023 17:44:54 -0400 Subject: [PATCH 03/10] Add required AWS SDK for JavaScript v3 packages --- package.json | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 678a62640c..517b90d6f9 100644 --- a/package.json +++ b/package.json @@ -40,10 +40,48 @@ }, "dependencies": { "@alicloud/pop-core": "^1.7.10", + "@aws-sdk/client-accessanalyzer": "^3.441.0", + "@aws-sdk/client-api-gateway": "^3.441.0", + "@aws-sdk/client-app-mesh": "^3.441.0", + "@aws-sdk/client-auto-scaling": "^3.441.0", + "@aws-sdk/client-cloudfront": "^3.441.0", + "@aws-sdk/client-cloudtrail": "^3.441.0", + "@aws-sdk/client-cloudwatch": "^3.441.0", + "@aws-sdk/client-codebuild": "^3.444.0", + "@aws-sdk/client-connect": "^3.444.0", + "@aws-sdk/client-dynamodb": "^3.441.0", + "@aws-sdk/client-ec2": "^3.441.0", + "@aws-sdk/client-ecs": "^3.441.0", + "@aws-sdk/client-eks": "^3.441.0", + "@aws-sdk/client-elastic-beanstalk": "^3.441.0", + "@aws-sdk/client-elastic-load-balancing": "^3.441.0", + "@aws-sdk/client-elastic-load-balancing-v2": "^3.441.0", + "@aws-sdk/client-elasticache": "^3.441.0", + "@aws-sdk/client-emr": "^3.441.0", + "@aws-sdk/client-firehose": "^3.441.0", + "@aws-sdk/client-guardduty": "^3.441.0", + "@aws-sdk/client-iam": "^3.444.0", + "@aws-sdk/client-kinesis": "^3.441.0", + "@aws-sdk/client-kms": "^3.441.0", + "@aws-sdk/client-lex-models-v2": "^3.441.0", + "@aws-sdk/client-lookoutvision": "^3.441.0", + "@aws-sdk/client-managedblockchain": "^3.441.0", + "@aws-sdk/client-mwaa": "^3.444.0", + "@aws-sdk/client-opensearchserverless": "^3.441.0", + "@aws-sdk/client-rds": "^3.441.0", + "@aws-sdk/client-s3": "^3.441.0", + "@aws-sdk/client-s3-control": "^3.441.0", + "@aws-sdk/client-ses": "^3.441.0", + "@aws-sdk/client-sqs": "^3.441.0", + "@aws-sdk/client-ssm": "^3.441.0", + "@aws-sdk/client-sts": "^3.441.0", + "@aws-sdk/client-support": "^3.441.0", + "@aws-sdk/client-waf-regional": "^3.441.0", + "@aws-sdk/client-wafv2": "^3.441.0", "@azure/data-tables": "^13.2.2", + "@azure/storage-blob": "^12.14.0", "@azure/storage-file-share": "^12.14.0", "@azure/storage-queue": "^12.13.0", - "@azure/storage-blob": "^12.14.0", "@octokit/app": "^3.0.0", "@octokit/request": "^3.0.3", "@octokit/rest": "^16.3.2", From 9c07addf80e12441d5d9a578842e549214ea3379 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Wed, 8 Nov 2023 15:27:45 -0400 Subject: [PATCH 04/10] Remove global configuration as its not supported by JS SDK v3 --- collectors/aws/collector.js | 15 +++++++++++++-- collectors/aws/collector_multipart.js | 14 ++++++++++++-- helpers/aws/functions.js | 7 +++---- package.json | 1 + 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 0dc7d9e340..7887584d87 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -16,11 +16,13 @@ - callback: Function to call when the collection is complete *********************/ -var AWS = require('aws-sdk'); const { EC2 } = require("@aws-sdk/client-ec2"); +const { + DynamoDBClient +} = require("@aws-sdk/client-dynamodb"); var async = require('async'); var https = require('https'); @@ -32,7 +34,16 @@ var agent = new https.Agent({maxSockets: 100}); // JS SDK v3 does not support global configuration. // Codemod has attempted to pass values to each service client in this file. // You may need to update clients outside of this file, if they use global config. -AWS.config.update({httpOptions: {agent: agent}}); + +const { Agent } = require("https"); +const { Agent: HttpAgent } = require("http"); +const { NodeHttpHandler } = require("@aws-sdk/node-http-handler"); +const dynamodbClient = new DynamoDBClient({ + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({ + }), + }), +}); var rateError = {message: 'rate', statusCode: 429}; diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index 5c9df3717b..47b1c87c02 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -16,11 +16,13 @@ - callback: Function to call when the collection is complete *********************/ -var AWS = require('aws-sdk'); const { EC2 } = require("@aws-sdk/client-ec2"); +const { + DynamoDBClient +} = require("@aws-sdk/client-dynamodb"); var async = require('async'); var https = require('https'); @@ -33,7 +35,15 @@ var agent = new https.Agent({maxSockets: 100}); // JS SDK v3 does not support global configuration. // Codemod has attempted to pass values to each service client in this file. // You may need to update clients outside of this file, if they use global config. -AWS.config.update({httpOptions: {agent: agent}}); +const { Agent } = require("https"); +const { Agent: HttpAgent } = require("http"); +const { NodeHttpHandler } = require("@aws-sdk/node-http-handler"); +const dynamodbClient = new DynamoDBClient({ + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({ + }), + }), +}); var CALLS_CONFIG = { TOTAL_PARTS: 14, diff --git a/helpers/aws/functions.js b/helpers/aws/functions.js index f0657c7075..0da844e19f 100644 --- a/helpers/aws/functions.js +++ b/helpers/aws/functions.js @@ -1,6 +1,5 @@ var async = require('async'); var regions = require(__dirname + '/regions'); -var AWS = require('aws-sdk'); var helpers = require('../shared.js'); function waitForCredentialReport(iam, callback, CREDENTIAL_DOWNLOAD_STARTED) { @@ -880,9 +879,9 @@ function getUsedSecurityGroups(cache, results, region) { return result['Error']; } - describeNetworkInterfaces.data.forEach(interface => { - if (interface.Groups) { - interface.Groups.forEach(group => { + describeNetworkInterfaces.data.forEach(networkInterface => { + if (networkInterface.Groups) { + networkInterface.Groups.forEach(group => { if (!result.includes(group.GroupId)) result.push(group.GroupId); }); } diff --git a/package.json b/package.json index 517b90d6f9..cfe7c53d70 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "@aws-sdk/client-support": "^3.441.0", "@aws-sdk/client-waf-regional": "^3.441.0", "@aws-sdk/client-wafv2": "^3.441.0", + "@aws-sdk/node-http-handler": "^3.374.0", "@azure/data-tables": "^13.2.2", "@azure/storage-blob": "^12.14.0", "@azure/storage-file-share": "^12.14.0", From d6b4fba0de8d66500bd195793bdc1d29fb1ac813 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Thu, 14 Dec 2023 17:17:02 -0400 Subject: [PATCH 05/10] Fix issues --- Dockerfile | 2 +- collectors/aws/accessanalyzer/listFindings.js | 2 +- .../aws/apigateway/getClientCertificate.js | 2 +- collectors/aws/apigateway/getIntegration.js | 2 +- .../aws/appmesh/describeVirtualGateway.js | 2 +- .../describeLaunchConfigurations.js | 2 +- .../describeNotificationConfigurations.js | 2 +- collectors/aws/cloudfront/getDistribution.js | 2 +- collectors/aws/cloudtrail/listTags.js | 2 +- .../aws/cloudwatch/getEc2MetricStatistics.js | 2 +- .../aws/cloudwatch/getEcMetricStatistics.js | 2 +- .../aws/cloudwatch/getEsMetricStatistics.js | 2 +- .../aws/cloudwatch/getRdsMetricStatistics.js | 2 +- .../getRdsReadIOPSMetricStatistics.js | 2 +- .../getRdsWriteIOPSMetricStatistics.js | 2 +- .../cloudwatch/getredshiftMetricStatistics.js | 2 +- collectors/aws/codebuild/batchGetProjects.js | 2 +- collectors/aws/collector.js | 45 +++++++++++++------ collectors/aws/collector_multipart.js | 31 +++++++------ .../instanceAttachmentStorageConfigs.js | 2 +- ...listInstanceCallRecordingStorageConfigs.js | 2 +- ...istInstanceChatTranscriptStorageConfigs.js | 2 +- ...istInstanceExportedReportStorageConfigs.js | 2 +- .../listInstanceMediaStreamStorageConfigs.js | 2 +- .../aws/dynamodb/describeContinuousBackups.js | 2 +- collectors/aws/dynamodb/describeTable.js | 2 +- collectors/aws/dynamodb/listBackups.js | 2 +- .../aws/ec2/describeSnapshotAttribute.js | 2 +- collectors/aws/ec2/describeSnapshots.js | 2 +- collectors/aws/ec2/describeSubnets.js | 2 +- collectors/aws/ecs/describeCluster.js | 2 +- .../aws/ecs/describeContainerInstances.js | 2 +- collectors/aws/ecs/describeServices.js | 2 +- collectors/aws/ecs/describeTasks.js | 2 +- collectors/aws/ecs/listContainerInstances.js | 2 +- collectors/aws/ecs/listServices.js | 2 +- collectors/aws/ecs/listTasks.js | 2 +- collectors/aws/eks/describeCluster.js | 2 +- collectors/aws/eks/describeNodegroups.js | 2 +- collectors/aws/eks/listNodegroups.js | 2 +- .../elasticache/describeCacheSubnetGroups.js | 2 +- .../describeConfigurationSettings.js | 2 +- collectors/aws/elb/describeInstanceHealth.js | 2 +- .../aws/elb/describeLoadBalancerAttributes.js | 2 +- .../aws/elb/describeLoadBalancerPolicies.js | 2 +- collectors/aws/elb/describeTags.js | 2 +- collectors/aws/elbv2/describeListeners.js | 2 +- .../elbv2/describeLoadBalancerAttributes.js | 2 +- collectors/aws/elbv2/describeTags.js | 2 +- collectors/aws/elbv2/describeTargetGroups.js | 2 +- .../aws/emr/describeSecurityConfiguration.js | 2 +- .../aws/firehose/describeDeliveryStream.js | 2 +- .../describePublishingDestination.js | 2 +- collectors/aws/guardduty/getDetector.js | 2 +- collectors/aws/guardduty/getFindings.js | 2 +- collectors/aws/guardduty/getMasterAccount.js | 2 +- collectors/aws/guardduty/listFindings.js | 2 +- .../guardduty/listPublishingDestinations.js | 2 +- .../aws/iam/generateCredentialReport.js | 2 +- collectors/aws/iam/getGroupPolicy.js | 2 +- collectors/aws/iam/getInstanceProfile.js | 2 +- collectors/aws/iam/getPolicyVersion.js | 2 +- collectors/aws/iam/getRolePolicy.js | 2 +- collectors/aws/iam/getUserPolicy.js | 2 +- collectors/aws/iam/listRoles.js | 2 +- collectors/aws/kinesis/describeStream.js | 2 +- collectors/aws/kms/getKeyPolicy.js | 2 +- collectors/aws/kms/listGrants.js | 2 +- .../aws/lexmodelsv2/describeBotAlias.js | 2 +- collectors/aws/lookoutvision/describeModel.js | 2 +- collectors/aws/managedblockchain/getMember.js | 2 +- collectors/aws/mwaa/getEnvironment.js | 2 +- .../getEncryptionSecurityPolicy.js | 2 +- .../getNetworkSecurityPolicy.js | 2 +- .../listEncryptionSecurityPolicies.js | 2 +- .../listNetworkSecurityPolicies.js | 2 +- collectors/aws/rds/describeDBParameters.js | 2 +- collectors/aws/s3/index.js | 2 +- .../aws/s3control/getPublicAccessBlock.js | 2 +- .../aws/ses/getIdentityDkimAttributes.js | 2 +- collectors/aws/sqs/getQueueAttributes.js | 2 +- collectors/aws/ssm/describeParameters.js | 2 +- .../describeTrustedAdvisorCheckResult.js | 2 +- .../aws/wafregional/listResourcesForWebACL.js | 2 +- collectors/aws/wafv2/getWebACL.js | 2 +- .../aws/wafv2/getWebACLForCognitoUserPool.js | 2 +- .../aws/wafv2/listResourcesForWebACL.js | 2 +- 87 files changed, 134 insertions(+), 112 deletions(-) diff --git a/Dockerfile b/Dockerfile index 172029195c..5de252ce50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,5 +25,5 @@ ENV PATH "$PATH:/var/scan/node_modules/.bin" # command line arguments to the run command to control how this executes. # Thus, you can use the parameters that you would normally give to index.js # when running in a container. -ENTRYPOINT ["cloudsploitscan"] +ENTRYPOINT ["cloudsploit-scan"] CMD [] diff --git a/collectors/aws/accessanalyzer/listFindings.js b/collectors/aws/accessanalyzer/listFindings.js index 555bb32188..decc88253a 100644 --- a/collectors/aws/accessanalyzer/listFindings.js +++ b/collectors/aws/accessanalyzer/listFindings.js @@ -1,6 +1,6 @@ const { AccessAnalyzer -} = require("@aws-sdk/client-accessanalyzer"); +} = require('@aws-sdk/client-accessanalyzer'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/apigateway/getClientCertificate.js b/collectors/aws/apigateway/getClientCertificate.js index a9c2241560..0c7f5f5e28 100644 --- a/collectors/aws/apigateway/getClientCertificate.js +++ b/collectors/aws/apigateway/getClientCertificate.js @@ -1,6 +1,6 @@ const { APIGateway -} = require("@aws-sdk/client-api-gateway"); +} = require('@aws-sdk/client-api-gateway'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/apigateway/getIntegration.js b/collectors/aws/apigateway/getIntegration.js index 4019eac811..fcdbe2bcbd 100644 --- a/collectors/aws/apigateway/getIntegration.js +++ b/collectors/aws/apigateway/getIntegration.js @@ -1,6 +1,6 @@ const { APIGateway -} = require("@aws-sdk/client-api-gateway"); +} = require('@aws-sdk/client-api-gateway'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/appmesh/describeVirtualGateway.js b/collectors/aws/appmesh/describeVirtualGateway.js index 81b5bb46ac..f9dc10bd68 100644 --- a/collectors/aws/appmesh/describeVirtualGateway.js +++ b/collectors/aws/appmesh/describeVirtualGateway.js @@ -1,6 +1,6 @@ const { AppMesh -} = require("@aws-sdk/client-app-mesh"); +} = require('@aws-sdk/client-app-mesh'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/autoscaling/describeLaunchConfigurations.js b/collectors/aws/autoscaling/describeLaunchConfigurations.js index 8c2328bcc1..0d26617fd1 100644 --- a/collectors/aws/autoscaling/describeLaunchConfigurations.js +++ b/collectors/aws/autoscaling/describeLaunchConfigurations.js @@ -1,6 +1,6 @@ const { AutoScaling -} = require("@aws-sdk/client-auto-scaling"); +} = require('@aws-sdk/client-auto-scaling'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/autoscaling/describeNotificationConfigurations.js b/collectors/aws/autoscaling/describeNotificationConfigurations.js index 25fed77932..94cf8dfd5f 100644 --- a/collectors/aws/autoscaling/describeNotificationConfigurations.js +++ b/collectors/aws/autoscaling/describeNotificationConfigurations.js @@ -1,6 +1,6 @@ const { AutoScaling -} = require("@aws-sdk/client-auto-scaling"); +} = require('@aws-sdk/client-auto-scaling'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudfront/getDistribution.js b/collectors/aws/cloudfront/getDistribution.js index de1d31b179..104f3841e7 100644 --- a/collectors/aws/cloudfront/getDistribution.js +++ b/collectors/aws/cloudfront/getDistribution.js @@ -1,6 +1,6 @@ const { CloudFront -} = require("@aws-sdk/client-cloudfront"); +} = require('@aws-sdk/client-cloudfront'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudtrail/listTags.js b/collectors/aws/cloudtrail/listTags.js index c296ae5ada..f6387f852e 100644 --- a/collectors/aws/cloudtrail/listTags.js +++ b/collectors/aws/cloudtrail/listTags.js @@ -1,6 +1,6 @@ const { CloudTrail -} = require("@aws-sdk/client-cloudtrail"); +} = require('@aws-sdk/client-cloudtrail'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getEc2MetricStatistics.js b/collectors/aws/cloudwatch/getEc2MetricStatistics.js index e94ac0a04c..86672c94c0 100644 --- a/collectors/aws/cloudwatch/getEc2MetricStatistics.js +++ b/collectors/aws/cloudwatch/getEc2MetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require('../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getEcMetricStatistics.js b/collectors/aws/cloudwatch/getEcMetricStatistics.js index d875e7d9c5..a67c4cf332 100644 --- a/collectors/aws/cloudwatch/getEcMetricStatistics.js +++ b/collectors/aws/cloudwatch/getEcMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getEsMetricStatistics.js b/collectors/aws/cloudwatch/getEsMetricStatistics.js index 36ee968ebe..f86f3d1953 100644 --- a/collectors/aws/cloudwatch/getEsMetricStatistics.js +++ b/collectors/aws/cloudwatch/getEsMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getRdsMetricStatistics.js b/collectors/aws/cloudwatch/getRdsMetricStatistics.js index e5c07307f8..c77a42b509 100644 --- a/collectors/aws/cloudwatch/getRdsMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js b/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js index 4c098f8074..bf365e4581 100644 --- a/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js b/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js index 95d047807e..180773f943 100644 --- a/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js +++ b/collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/cloudwatch/getredshiftMetricStatistics.js b/collectors/aws/cloudwatch/getredshiftMetricStatistics.js index a0e3749424..e2d6a28901 100644 --- a/collectors/aws/cloudwatch/getredshiftMetricStatistics.js +++ b/collectors/aws/cloudwatch/getredshiftMetricStatistics.js @@ -1,6 +1,6 @@ const { CloudWatch -} = require("@aws-sdk/client-cloudwatch"); +} = require('@aws-sdk/client-cloudwatch'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/codebuild/batchGetProjects.js b/collectors/aws/codebuild/batchGetProjects.js index a5264b6fd1..76300aebaa 100644 --- a/collectors/aws/codebuild/batchGetProjects.js +++ b/collectors/aws/codebuild/batchGetProjects.js @@ -1,6 +1,6 @@ const { CodeBuild -} = require("@aws-sdk/client-codebuild"); +} = require('@aws-sdk/client-codebuild'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 7887584d87..c0699b68d7 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -19,31 +19,39 @@ const { EC2 -} = require("@aws-sdk/client-ec2"); +} = require('@aws-sdk/client-ec2'); const { DynamoDBClient -} = require("@aws-sdk/client-dynamodb"); +} = require('@aws-sdk/client-dynamodb'); var async = require('async'); -var https = require('https'); +//var https = require('https'); var helpers = require(__dirname + '/../../helpers/aws'); var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); -// Override max sockets -var agent = new https.Agent({maxSockets: 100}); // JS SDK v3 does not support global configuration. // Codemod has attempted to pass values to each service client in this file. // You may need to update clients outside of this file, if they use global config. -const { Agent } = require("https"); +//var agent = new https.Agent({maxSockets: 100}) +const { Agent } = require('https'); const { Agent: HttpAgent } = require("http"); -const { NodeHttpHandler } = require("@aws-sdk/node-http-handler"); +const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); +// Override max sockets +/* AWSConfig.NodeHttpHandler = new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100 + }), + httpAgent: new HttpAgent({maxSockets: 100 + }) +}), const dynamodbClient = new DynamoDBClient({ - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({ + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100 + }), + httpAgent: new HttpAgent({maxSockets: 100 + }) }), - }), -}); +});*/ var rateError = {message: 'rate', statusCode: 429}; @@ -82,7 +90,16 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - var AWSEC2 = new EC2(AWSConfig); + var AWSEC2 = new EC2 ({ + AWSConfig, + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100 + }), + httpAgent: new HttpAgent({maxSockets: 100 + }) + }), + }); + var params = {AllRegions: true}; var excludeRegions = []; @@ -155,7 +172,7 @@ var collect = function(AWSConfig, settings, callback) { } }); } else { - var executor = debugMode ? (AWSXRay.captureAWSClient(new AWS[serviceName](LocalAWSConfig))) : new AWS[serviceName](LocalAWSConfig); + var executor = debugMode ? (AWSXRay.captureAWSClient(new AWSXRay[serviceName](LocalAWSConfig))) : new AWSXRay[serviceName](LocalAWSConfig); var paginating = false; var executorCb = function(err, data) { if (err) { @@ -324,7 +341,7 @@ var collect = function(AWSConfig, settings, callback) { } }); } else { - var executor = debugMode ? (AWSXRay.captureAWSClient(new AWS[serviceName](LocalAWSConfig))) : new AWS[serviceName](LocalAWSConfig); + var executor = debugMode ? (AWSXRay.captureAWSClient(new AWSXRay[serviceName](LocalAWSConfig))) : new AWSXRay[serviceName](LocalAWSConfig); if (!collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region] || !collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region].data) { diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index 47b1c87c02..0ec847d22e 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -19,30 +19,27 @@ const { EC2 -} = require("@aws-sdk/client-ec2"); +} = require('@aws-sdk/client-ec2'); const { DynamoDBClient -} = require("@aws-sdk/client-dynamodb"); +} = require('@aws-sdk/client-dynamodb'); var async = require('async'); -var https = require('https'); var helpers = require(__dirname + '/../../helpers/aws'); var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); // Override max sockets -var agent = new https.Agent({maxSockets: 100}); // JS SDK v3 does not support global configuration. // Codemod has attempted to pass values to each service client in this file. // You may need to update clients outside of this file, if they use global config. -const { Agent } = require("https"); -const { Agent: HttpAgent } = require("http"); -const { NodeHttpHandler } = require("@aws-sdk/node-http-handler"); +const { Agent } = require('https'); +const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); const dynamodbClient = new DynamoDBClient({ - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({ + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100 + }), }), - }), }); var CALLS_CONFIG = { @@ -98,7 +95,15 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - var AWSEC2 = new EC2(AWSConfig); + var AWSEC2 = new EC2 ({ + AWSConfig, + requestHandler: new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100 + }), + httpAgent: new HttpAgent({maxSockets: 100 + }) + }), + }); var params = {AllRegions: true}; var excludeRegions = []; var timeoutCheck; @@ -183,7 +188,7 @@ var collect = function(AWSConfig, settings, callback) { } }); } else { - var executor = debugMode ? (AWSXRay.captureAWSClient(new AWS[serviceName](LocalAWSConfig))) : new AWS[serviceName](LocalAWSConfig); + var executor = debugMode ? (AWSXRay.captureAWSClient(new AWSXRay[serviceName](LocalAWSConfig))) : new AWSXRay[serviceName](LocalAWSConfig); var paginating = false; var executorCb = function(err, data) { if (err) { @@ -363,7 +368,7 @@ var collect = function(AWSConfig, settings, callback) { } }); } else { - var executor = debugMode ? (AWSXRay.captureAWSClient(new AWS[serviceName](LocalAWSConfig))) : new AWS[serviceName](LocalAWSConfig); + var executor = debugMode ? (AWSXRay.captureAWSClient(new AWSXRay[serviceName](LocalAWSConfig))) : new AWSXRay[serviceName](LocalAWSConfig); if (!collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region] || !collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region].data) { diff --git a/collectors/aws/connect/instanceAttachmentStorageConfigs.js b/collectors/aws/connect/instanceAttachmentStorageConfigs.js index f052a90f5e..e1929decca 100644 --- a/collectors/aws/connect/instanceAttachmentStorageConfigs.js +++ b/collectors/aws/connect/instanceAttachmentStorageConfigs.js @@ -1,6 +1,6 @@ const { Connect -} = require("@aws-sdk/client-connect"); +} = require('@aws-sdk/client-connect'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js b/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js index 2c49de9e0b..71a3506045 100644 --- a/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js +++ b/collectors/aws/connect/listInstanceCallRecordingStorageConfigs.js @@ -1,6 +1,6 @@ const { Connect -} = require("@aws-sdk/client-connect"); +} = require('@aws-sdk/client-connect'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js b/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js index 924f3635ed..d6431566ee 100644 --- a/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js +++ b/collectors/aws/connect/listInstanceChatTranscriptStorageConfigs.js @@ -1,6 +1,6 @@ const { Connect -} = require("@aws-sdk/client-connect"); +} = require('@aws-sdk/client-connect'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js b/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js index 6840f7dfe8..95233218d5 100644 --- a/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js +++ b/collectors/aws/connect/listInstanceExportedReportStorageConfigs.js @@ -1,6 +1,6 @@ const { Connect -} = require("@aws-sdk/client-connect"); +} = require('@aws-sdk/client-connect'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js b/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js index 8b5f1d89f0..4d6609415e 100644 --- a/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js +++ b/collectors/aws/connect/listInstanceMediaStreamStorageConfigs.js @@ -1,6 +1,6 @@ const { Connect -} = require("@aws-sdk/client-connect"); +} = require('@aws-sdk/client-connect'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/dynamodb/describeContinuousBackups.js b/collectors/aws/dynamodb/describeContinuousBackups.js index d4eb8ccfa6..9f650ed105 100644 --- a/collectors/aws/dynamodb/describeContinuousBackups.js +++ b/collectors/aws/dynamodb/describeContinuousBackups.js @@ -1,6 +1,6 @@ const { DynamoDB -} = require("@aws-sdk/client-dynamodb"); +} = require('@aws-sdk/client-dynamodb'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/dynamodb/describeTable.js b/collectors/aws/dynamodb/describeTable.js index 7137957455..95165ce3eb 100644 --- a/collectors/aws/dynamodb/describeTable.js +++ b/collectors/aws/dynamodb/describeTable.js @@ -1,6 +1,6 @@ const { DynamoDB -} = require("@aws-sdk/client-dynamodb"); +} = require('@aws-sdk/client-dynamodb'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/dynamodb/listBackups.js b/collectors/aws/dynamodb/listBackups.js index 1e036ff525..6a8d87293b 100644 --- a/collectors/aws/dynamodb/listBackups.js +++ b/collectors/aws/dynamodb/listBackups.js @@ -1,6 +1,6 @@ const { DynamoDB -} = require("@aws-sdk/client-dynamodb"); +} = require('@aws-sdk/client-dynamodb'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ec2/describeSnapshotAttribute.js b/collectors/aws/ec2/describeSnapshotAttribute.js index 0734e30f17..6bb112e690 100644 --- a/collectors/aws/ec2/describeSnapshotAttribute.js +++ b/collectors/aws/ec2/describeSnapshotAttribute.js @@ -1,6 +1,6 @@ const { EC2 -} = require("@aws-sdk/client-ec2"); +} = require('@aws-sdk/client-ec2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ec2/describeSnapshots.js b/collectors/aws/ec2/describeSnapshots.js index 04272a75fd..ffe675df33 100644 --- a/collectors/aws/ec2/describeSnapshots.js +++ b/collectors/aws/ec2/describeSnapshots.js @@ -1,6 +1,6 @@ const { EC2 -} = require("@aws-sdk/client-ec2"); +} = require('@aws-sdk/client-ec2'); const { STS diff --git a/collectors/aws/ec2/describeSubnets.js b/collectors/aws/ec2/describeSubnets.js index 6b93bd9a4d..0604065cba 100644 --- a/collectors/aws/ec2/describeSubnets.js +++ b/collectors/aws/ec2/describeSubnets.js @@ -1,6 +1,6 @@ const { EC2 -} = require("@aws-sdk/client-ec2"); +} = require('@aws-sdk/client-ec2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/describeCluster.js b/collectors/aws/ecs/describeCluster.js index 8ac7bc7f03..7c6cb497ae 100644 --- a/collectors/aws/ecs/describeCluster.js +++ b/collectors/aws/ecs/describeCluster.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/describeContainerInstances.js b/collectors/aws/ecs/describeContainerInstances.js index 93bf6a8faa..6b96cd7099 100644 --- a/collectors/aws/ecs/describeContainerInstances.js +++ b/collectors/aws/ecs/describeContainerInstances.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/describeServices.js b/collectors/aws/ecs/describeServices.js index b0ffc60171..b3d9e8403e 100644 --- a/collectors/aws/ecs/describeServices.js +++ b/collectors/aws/ecs/describeServices.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/describeTasks.js b/collectors/aws/ecs/describeTasks.js index b4e5f5d108..93194fc0fa 100644 --- a/collectors/aws/ecs/describeTasks.js +++ b/collectors/aws/ecs/describeTasks.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/listContainerInstances.js b/collectors/aws/ecs/listContainerInstances.js index 3cf31e7b9a..39bdbacc86 100644 --- a/collectors/aws/ecs/listContainerInstances.js +++ b/collectors/aws/ecs/listContainerInstances.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/listServices.js b/collectors/aws/ecs/listServices.js index d0ad99c363..f5ee6c16c9 100644 --- a/collectors/aws/ecs/listServices.js +++ b/collectors/aws/ecs/listServices.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ecs/listTasks.js b/collectors/aws/ecs/listTasks.js index d58fffa4a5..1cae69b40a 100644 --- a/collectors/aws/ecs/listTasks.js +++ b/collectors/aws/ecs/listTasks.js @@ -1,6 +1,6 @@ const { ECS -} = require("@aws-sdk/client-ecs"); +} = require('@aws-sdk/client-ecs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/eks/describeCluster.js b/collectors/aws/eks/describeCluster.js index ff2cf239e2..c8c4be8e10 100644 --- a/collectors/aws/eks/describeCluster.js +++ b/collectors/aws/eks/describeCluster.js @@ -1,6 +1,6 @@ const { EKS -} = require("@aws-sdk/client-eks"); +} = require('@aws-sdk/client-eks'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/eks/describeNodegroups.js b/collectors/aws/eks/describeNodegroups.js index 3e69af3bd4..c98d2769f1 100644 --- a/collectors/aws/eks/describeNodegroups.js +++ b/collectors/aws/eks/describeNodegroups.js @@ -1,6 +1,6 @@ const { EKS -} = require("@aws-sdk/client-eks"); +} = require('@aws-sdk/client-eks'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/eks/listNodegroups.js b/collectors/aws/eks/listNodegroups.js index dab466820a..e0582e7b5d 100644 --- a/collectors/aws/eks/listNodegroups.js +++ b/collectors/aws/eks/listNodegroups.js @@ -1,6 +1,6 @@ const { EKS -} = require("@aws-sdk/client-eks"); +} = require('@aws-sdk/client-eks'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elasticache/describeCacheSubnetGroups.js b/collectors/aws/elasticache/describeCacheSubnetGroups.js index 3327dc9589..bfc975c66f 100644 --- a/collectors/aws/elasticache/describeCacheSubnetGroups.js +++ b/collectors/aws/elasticache/describeCacheSubnetGroups.js @@ -1,6 +1,6 @@ const { ElastiCache -} = require("@aws-sdk/client-elasticache"); +} = require('@aws-sdk/client-elasticache'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js b/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js index bd6ec115a3..7aa5b76717 100644 --- a/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js +++ b/collectors/aws/elasticbeanstalk/describeConfigurationSettings.js @@ -1,6 +1,6 @@ const { ElasticBeanstalk -} = require("@aws-sdk/client-elastic-beanstalk"); +} = require('@aws-sdk/client-elastic-beanstalk'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elb/describeInstanceHealth.js b/collectors/aws/elb/describeInstanceHealth.js index 21c1081f34..1f57a4064e 100644 --- a/collectors/aws/elb/describeInstanceHealth.js +++ b/collectors/aws/elb/describeInstanceHealth.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancing -} = require("@aws-sdk/client-elastic-load-balancing"); +} = require('@aws-sdk/client-elastic-load-balancing'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elb/describeLoadBalancerAttributes.js b/collectors/aws/elb/describeLoadBalancerAttributes.js index c4e3b9d421..8753127110 100644 --- a/collectors/aws/elb/describeLoadBalancerAttributes.js +++ b/collectors/aws/elb/describeLoadBalancerAttributes.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancing -} = require("@aws-sdk/client-elastic-load-balancing"); +} = require('@aws-sdk/client-elastic-load-balancing'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elb/describeLoadBalancerPolicies.js b/collectors/aws/elb/describeLoadBalancerPolicies.js index 140d32b2e9..70b1ae8dc7 100644 --- a/collectors/aws/elb/describeLoadBalancerPolicies.js +++ b/collectors/aws/elb/describeLoadBalancerPolicies.js @@ -4,7 +4,7 @@ const { ElasticLoadBalancing -} = require("@aws-sdk/client-elastic-load-balancing"); +} = require('@aws-sdk/client-elastic-load-balancing'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elb/describeTags.js b/collectors/aws/elb/describeTags.js index 96eaa89d42..d8a39e202e 100644 --- a/collectors/aws/elb/describeTags.js +++ b/collectors/aws/elb/describeTags.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancing -} = require("@aws-sdk/client-elastic-load-balancing"); +} = require('@aws-sdk/client-elastic-load-balancing'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elbv2/describeListeners.js b/collectors/aws/elbv2/describeListeners.js index 132f3a939a..c61b1fab82 100644 --- a/collectors/aws/elbv2/describeListeners.js +++ b/collectors/aws/elbv2/describeListeners.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancingV2 -} = require("@aws-sdk/client-elastic-load-balancing-v2"); +} = require('@aws-sdk/client-elastic-load-balancing-v2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elbv2/describeLoadBalancerAttributes.js b/collectors/aws/elbv2/describeLoadBalancerAttributes.js index 84d656761b..f3aa752a54 100644 --- a/collectors/aws/elbv2/describeLoadBalancerAttributes.js +++ b/collectors/aws/elbv2/describeLoadBalancerAttributes.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancingV2 -} = require("@aws-sdk/client-elastic-load-balancing-v2"); +} = require('@aws-sdk/client-elastic-load-balancing-v2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elbv2/describeTags.js b/collectors/aws/elbv2/describeTags.js index 8e77224035..ea3831e1cb 100644 --- a/collectors/aws/elbv2/describeTags.js +++ b/collectors/aws/elbv2/describeTags.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancingV2 -} = require("@aws-sdk/client-elastic-load-balancing-v2"); +} = require('@aws-sdk/client-elastic-load-balancing-v2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/elbv2/describeTargetGroups.js b/collectors/aws/elbv2/describeTargetGroups.js index e2b6b8fc32..db751f3dce 100644 --- a/collectors/aws/elbv2/describeTargetGroups.js +++ b/collectors/aws/elbv2/describeTargetGroups.js @@ -1,6 +1,6 @@ const { ElasticLoadBalancingV2 -} = require("@aws-sdk/client-elastic-load-balancing-v2"); +} = require('@aws-sdk/client-elastic-load-balancing-v2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/emr/describeSecurityConfiguration.js b/collectors/aws/emr/describeSecurityConfiguration.js index e6110738ca..5e8b231ae7 100644 --- a/collectors/aws/emr/describeSecurityConfiguration.js +++ b/collectors/aws/emr/describeSecurityConfiguration.js @@ -1,6 +1,6 @@ const { EMR -} = require("@aws-sdk/client-emr"); +} = require('@aws-sdk/client-emr'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/firehose/describeDeliveryStream.js b/collectors/aws/firehose/describeDeliveryStream.js index 36c3ce3257..a36e901252 100644 --- a/collectors/aws/firehose/describeDeliveryStream.js +++ b/collectors/aws/firehose/describeDeliveryStream.js @@ -1,6 +1,6 @@ const { Firehose -} = require("@aws-sdk/client-firehose"); +} = require('@aws-sdk/client-firehose'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/describePublishingDestination.js b/collectors/aws/guardduty/describePublishingDestination.js index cbd2ed8ec1..555a75c47b 100644 --- a/collectors/aws/guardduty/describePublishingDestination.js +++ b/collectors/aws/guardduty/describePublishingDestination.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/getDetector.js b/collectors/aws/guardduty/getDetector.js index a9fb0ef9ee..ffdece566e 100644 --- a/collectors/aws/guardduty/getDetector.js +++ b/collectors/aws/guardduty/getDetector.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/getFindings.js b/collectors/aws/guardduty/getFindings.js index 85d856a5e6..aca7007e80 100644 --- a/collectors/aws/guardduty/getFindings.js +++ b/collectors/aws/guardduty/getFindings.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/getMasterAccount.js b/collectors/aws/guardduty/getMasterAccount.js index 3318531022..391babf757 100644 --- a/collectors/aws/guardduty/getMasterAccount.js +++ b/collectors/aws/guardduty/getMasterAccount.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/listFindings.js b/collectors/aws/guardduty/listFindings.js index 9215d960a8..028a5a174e 100644 --- a/collectors/aws/guardduty/listFindings.js +++ b/collectors/aws/guardduty/listFindings.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/guardduty/listPublishingDestinations.js b/collectors/aws/guardduty/listPublishingDestinations.js index a78e6632bf..04fd389e9d 100644 --- a/collectors/aws/guardduty/listPublishingDestinations.js +++ b/collectors/aws/guardduty/listPublishingDestinations.js @@ -1,6 +1,6 @@ const { GuardDuty -} = require("@aws-sdk/client-guardduty"); +} = require('@aws-sdk/client-guardduty'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/generateCredentialReport.js b/collectors/aws/iam/generateCredentialReport.js index 9c59225ad3..6e8c0fccaf 100644 --- a/collectors/aws/iam/generateCredentialReport.js +++ b/collectors/aws/iam/generateCredentialReport.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/iam/getGroupPolicy.js b/collectors/aws/iam/getGroupPolicy.js index 268abe03ff..71218b3de5 100644 --- a/collectors/aws/iam/getGroupPolicy.js +++ b/collectors/aws/iam/getGroupPolicy.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/getInstanceProfile.js b/collectors/aws/iam/getInstanceProfile.js index a6a5a32a6c..e044e9de19 100644 --- a/collectors/aws/iam/getInstanceProfile.js +++ b/collectors/aws/iam/getInstanceProfile.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/getPolicyVersion.js b/collectors/aws/iam/getPolicyVersion.js index 74ee893c93..a1adcf26c5 100644 --- a/collectors/aws/iam/getPolicyVersion.js +++ b/collectors/aws/iam/getPolicyVersion.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/getRolePolicy.js b/collectors/aws/iam/getRolePolicy.js index 994cb7cb31..9ea4347a4f 100644 --- a/collectors/aws/iam/getRolePolicy.js +++ b/collectors/aws/iam/getRolePolicy.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/getUserPolicy.js b/collectors/aws/iam/getUserPolicy.js index 514848dbe0..97ecf9cec4 100644 --- a/collectors/aws/iam/getUserPolicy.js +++ b/collectors/aws/iam/getUserPolicy.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/iam/listRoles.js b/collectors/aws/iam/listRoles.js index fa510eaf13..10fa2e6bbc 100644 --- a/collectors/aws/iam/listRoles.js +++ b/collectors/aws/iam/listRoles.js @@ -1,6 +1,6 @@ const { IAM -} = require("@aws-sdk/client-iam"); +} = require('@aws-sdk/client-iam'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/kinesis/describeStream.js b/collectors/aws/kinesis/describeStream.js index 652fdd7495..3a6ba9eae7 100644 --- a/collectors/aws/kinesis/describeStream.js +++ b/collectors/aws/kinesis/describeStream.js @@ -1,6 +1,6 @@ const { Kinesis -} = require("@aws-sdk/client-kinesis"); +} = require('@aws-sdk/client-kinesis'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/kms/getKeyPolicy.js b/collectors/aws/kms/getKeyPolicy.js index 3150be8329..1d97d3f8cb 100644 --- a/collectors/aws/kms/getKeyPolicy.js +++ b/collectors/aws/kms/getKeyPolicy.js @@ -1,6 +1,6 @@ const { KMS -} = require("@aws-sdk/client-kms"); +} = require('@aws-sdk/client-kms'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/kms/listGrants.js b/collectors/aws/kms/listGrants.js index 0e441b3848..c7b813d0ed 100644 --- a/collectors/aws/kms/listGrants.js +++ b/collectors/aws/kms/listGrants.js @@ -1,6 +1,6 @@ const { KMS -} = require("@aws-sdk/client-kms"); +} = require('@aws-sdk/client-kms'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/lexmodelsv2/describeBotAlias.js b/collectors/aws/lexmodelsv2/describeBotAlias.js index dacc0ac98c..855d4bf4e9 100644 --- a/collectors/aws/lexmodelsv2/describeBotAlias.js +++ b/collectors/aws/lexmodelsv2/describeBotAlias.js @@ -1,6 +1,6 @@ const { LexModelsV2 -} = require("@aws-sdk/client-lex-models-v2"); +} = require('@aws-sdk/client-lex-models-v2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/lookoutvision/describeModel.js b/collectors/aws/lookoutvision/describeModel.js index de1ac598af..c168debd5f 100644 --- a/collectors/aws/lookoutvision/describeModel.js +++ b/collectors/aws/lookoutvision/describeModel.js @@ -1,6 +1,6 @@ const { LookoutVision -} = require("@aws-sdk/client-lookoutvision"); +} = require('@aws-sdk/client-lookoutvision'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/managedblockchain/getMember.js b/collectors/aws/managedblockchain/getMember.js index 6801a94ead..4b96294fff 100644 --- a/collectors/aws/managedblockchain/getMember.js +++ b/collectors/aws/managedblockchain/getMember.js @@ -1,6 +1,6 @@ const { ManagedBlockchain -} = require("@aws-sdk/client-managedblockchain"); +} = require('@aws-sdk/client-managedblockchain'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/mwaa/getEnvironment.js b/collectors/aws/mwaa/getEnvironment.js index bf54ebd933..79cc4b4bef 100644 --- a/collectors/aws/mwaa/getEnvironment.js +++ b/collectors/aws/mwaa/getEnvironment.js @@ -1,6 +1,6 @@ const { MWAA -} = require("@aws-sdk/client-mwaa"); +} = require('@aws-sdk/client-mwaa'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js b/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js index bcf12b4601..27e9555ab7 100644 --- a/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js +++ b/collectors/aws/opensearchserverless/getEncryptionSecurityPolicy.js @@ -1,6 +1,6 @@ const { OpenSearchServerless -} = require("@aws-sdk/client-opensearchserverless"); +} = require('@aws-sdk/client-opensearchserverless'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js b/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js index f0a225be85..0c5282a19e 100644 --- a/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js +++ b/collectors/aws/opensearchserverless/getNetworkSecurityPolicy.js @@ -1,6 +1,6 @@ const { OpenSearchServerless -} = require("@aws-sdk/client-opensearchserverless"); +} = require('@aws-sdk/client-opensearchserverless'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js b/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js index 7aa351b95f..ab5bf8f4dc 100644 --- a/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js +++ b/collectors/aws/opensearchserverless/listEncryptionSecurityPolicies.js @@ -1,6 +1,6 @@ const { OpenSearchServerless -} = require("@aws-sdk/client-opensearchserverless"); +} = require('@aws-sdk/client-opensearchserverless'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js b/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js index 46b88c7bd1..711a707e08 100644 --- a/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js +++ b/collectors/aws/opensearchserverless/listNetworkSecurityPolicies.js @@ -1,6 +1,6 @@ const { OpenSearchServerless -} = require("@aws-sdk/client-opensearchserverless"); +} = require('@aws-sdk/client-opensearchserverless'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/rds/describeDBParameters.js b/collectors/aws/rds/describeDBParameters.js index 9da47e164c..c5cc22be7a 100644 --- a/collectors/aws/rds/describeDBParameters.js +++ b/collectors/aws/rds/describeDBParameters.js @@ -1,6 +1,6 @@ const { RDS -} = require("@aws-sdk/client-rds"); +} = require('@aws-sdk/client-rds'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/s3/index.js b/collectors/aws/s3/index.js index dbeffb8eb2..bfee439a4d 100644 --- a/collectors/aws/s3/index.js +++ b/collectors/aws/s3/index.js @@ -1,6 +1,6 @@ const { S3 -} = require("@aws-sdk/client-s3"); +} = require('@aws-sdk/client-s3'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/s3control/getPublicAccessBlock.js b/collectors/aws/s3control/getPublicAccessBlock.js index bfa006f22f..50160d6642 100644 --- a/collectors/aws/s3control/getPublicAccessBlock.js +++ b/collectors/aws/s3control/getPublicAccessBlock.js @@ -1,6 +1,6 @@ const { S3Control -} = require("@aws-sdk/client-s3-control"); +} = require('@aws-sdk/client-s3-control'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/ses/getIdentityDkimAttributes.js b/collectors/aws/ses/getIdentityDkimAttributes.js index cbacbfd634..f300b5216e 100644 --- a/collectors/aws/ses/getIdentityDkimAttributes.js +++ b/collectors/aws/ses/getIdentityDkimAttributes.js @@ -1,6 +1,6 @@ const { SES -} = require("@aws-sdk/client-ses"); +} = require('@aws-sdk/client-ses'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/sqs/getQueueAttributes.js b/collectors/aws/sqs/getQueueAttributes.js index d0720d9bbd..c9f65b6770 100644 --- a/collectors/aws/sqs/getQueueAttributes.js +++ b/collectors/aws/sqs/getQueueAttributes.js @@ -1,6 +1,6 @@ const { SQS -} = require("@aws-sdk/client-sqs"); +} = require('@aws-sdk/client-sqs'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/ssm/describeParameters.js b/collectors/aws/ssm/describeParameters.js index aa927d0920..7250f3c880 100644 --- a/collectors/aws/ssm/describeParameters.js +++ b/collectors/aws/ssm/describeParameters.js @@ -1,6 +1,6 @@ const { SSM -} = require("@aws-sdk/client-ssm"); +} = require('@aws-sdk/client-ssm'); var helpers = require(__dirname + '/../../../helpers/aws'); module.exports = function(AWSConfig, collection, retries, callback) { diff --git a/collectors/aws/support/describeTrustedAdvisorCheckResult.js b/collectors/aws/support/describeTrustedAdvisorCheckResult.js index fdda8634a5..73b42f3dec 100644 --- a/collectors/aws/support/describeTrustedAdvisorCheckResult.js +++ b/collectors/aws/support/describeTrustedAdvisorCheckResult.js @@ -1,6 +1,6 @@ const { Support -} = require("@aws-sdk/client-support"); +} = require('@aws-sdk/client-support'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/wafregional/listResourcesForWebACL.js b/collectors/aws/wafregional/listResourcesForWebACL.js index bc5d9ad54d..7225a0098e 100644 --- a/collectors/aws/wafregional/listResourcesForWebACL.js +++ b/collectors/aws/wafregional/listResourcesForWebACL.js @@ -1,6 +1,6 @@ const { WAFRegional -} = require("@aws-sdk/client-waf-regional"); +} = require('@aws-sdk/client-waf-regional'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/wafv2/getWebACL.js b/collectors/aws/wafv2/getWebACL.js index bee8db398e..98c2d77898 100644 --- a/collectors/aws/wafv2/getWebACL.js +++ b/collectors/aws/wafv2/getWebACL.js @@ -1,6 +1,6 @@ const { WAFV2 -} = require("@aws-sdk/client-wafv2"); +} = require('@aws-sdk/client-wafv2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/wafv2/getWebACLForCognitoUserPool.js b/collectors/aws/wafv2/getWebACLForCognitoUserPool.js index 363be64942..16a709aa77 100644 --- a/collectors/aws/wafv2/getWebACLForCognitoUserPool.js +++ b/collectors/aws/wafv2/getWebACLForCognitoUserPool.js @@ -1,6 +1,6 @@ const { WAFV2 -} = require("@aws-sdk/client-wafv2"); +} = require('@aws-sdk/client-wafv2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); diff --git a/collectors/aws/wafv2/listResourcesForWebACL.js b/collectors/aws/wafv2/listResourcesForWebACL.js index 3914c06828..118a957583 100644 --- a/collectors/aws/wafv2/listResourcesForWebACL.js +++ b/collectors/aws/wafv2/listResourcesForWebACL.js @@ -1,6 +1,6 @@ const { WAFV2 -} = require("@aws-sdk/client-wafv2"); +} = require('@aws-sdk/client-wafv2'); var async = require('async'); var helpers = require(__dirname + '/../../../helpers/aws'); From fda92bf045b844c7f686928d3030f74ec720fc33 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Thu, 14 Dec 2023 17:26:09 -0400 Subject: [PATCH 06/10] Remove dynamodbClient --- collectors/aws/collector.js | 17 +---------------- collectors/aws/collector_multipart.js | 6 ------ 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index c0699b68d7..7599d7bed3 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -33,25 +33,9 @@ var collectData = require(__dirname + '/../../helpers/shared.js'); // Codemod has attempted to pass values to each service client in this file. // You may need to update clients outside of this file, if they use global config. -//var agent = new https.Agent({maxSockets: 100}) const { Agent } = require('https'); const { Agent: HttpAgent } = require("http"); const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); -// Override max sockets -/* AWSConfig.NodeHttpHandler = new NodeHttpHandler({ - httpsAgent: new Agent({maxSockets: 100 - }), - httpAgent: new HttpAgent({maxSockets: 100 - }) -}), -const dynamodbClient = new DynamoDBClient({ - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({maxSockets: 100 - }), - httpAgent: new HttpAgent({maxSockets: 100 - }) - }), -});*/ var rateError = {message: 'rate', statusCode: 429}; @@ -90,6 +74,7 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; + // Override max sockets var AWSEC2 = new EC2 ({ AWSConfig, requestHandler: new NodeHttpHandler({ diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index 0ec847d22e..86efebb5c6 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -35,12 +35,6 @@ var collectData = require(__dirname + '/../../helpers/shared.js'); // You may need to update clients outside of this file, if they use global config. const { Agent } = require('https'); const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); -const dynamodbClient = new DynamoDBClient({ - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({maxSockets: 100 - }), - }), -}); var CALLS_CONFIG = { TOTAL_PARTS: 14, From 395878184dfd7e6dc557e8712cfa654ca5be2725 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Wed, 17 Jan 2024 23:03:21 -0400 Subject: [PATCH 07/10] add RequestHandler to AWSConfig --- collectors/aws/collector.js | 9 +++++---- collectors/aws/collector_multipart.js | 11 +++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 7599d7bed3..41978de0ba 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -20,12 +20,8 @@ const { EC2 } = require('@aws-sdk/client-ec2'); -const { - DynamoDBClient -} = require('@aws-sdk/client-dynamodb'); var async = require('async'); -//var https = require('https'); var helpers = require(__dirname + '/../../helpers/aws'); var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); @@ -62,6 +58,11 @@ var collect = function(AWSConfig, settings, callback) { var debugMode = settings.debug_mode; if (debugMode) AWSXRay = require('aws-xray-sdk'); + const customRequestHandler = new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100}), + httpAgent: new HttpAgent({maxSockets: 100}) + }); + AWSConfig.requestHandler = customRequestHandler; AWSConfig.maxRetries = 8; AWSConfig.retryDelayOptions = {base: 100}; diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index 86efebb5c6..dfdf6520d9 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -20,9 +20,6 @@ const { EC2 } = require('@aws-sdk/client-ec2'); -const { - DynamoDBClient -} = require('@aws-sdk/client-dynamodb'); var async = require('async'); var helpers = require(__dirname + '/../../helpers/aws'); @@ -30,9 +27,6 @@ var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); // Override max sockets -// JS SDK v3 does not support global configuration. -// Codemod has attempted to pass values to each service client in this file. -// You may need to update clients outside of this file, if they use global config. const { Agent } = require('https'); const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); @@ -71,6 +65,11 @@ var collect = function(AWSConfig, settings, callback) { var debugMode = settings.debug_mode; if (debugMode) AWSXRay = require('aws-xray-sdk'); + const customRequestHandler = new NodeHttpHandler({ + httpsAgent: new Agent({maxSockets: 100}), + httpAgent: new HttpAgent({maxSockets: 100}) + }); + AWSConfig.requestHandler = customRequestHandler; AWSConfig.maxRetries = 8; AWSConfig.retryDelayOptions = {base: 100}; From 49d70cbed4a8d226e537c98647afd93067848baa Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Wed, 17 Jan 2024 23:51:48 -0400 Subject: [PATCH 08/10] Add requestHandler to AWSConfig --- collectors/aws/collector.js | 5 +---- collectors/aws/collector_multipart.js | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 41978de0ba..9ac528a0a1 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -25,9 +25,6 @@ var async = require('async'); var helpers = require(__dirname + '/../../helpers/aws'); var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); -// JS SDK v3 does not support global configuration. -// Codemod has attempted to pass values to each service client in this file. -// You may need to update clients outside of this file, if they use global config. const { Agent } = require('https'); const { Agent: HttpAgent } = require("http"); @@ -57,7 +54,7 @@ var collect = function(AWSConfig, settings, callback) { var AWSXRay; var debugMode = settings.debug_mode; if (debugMode) AWSXRay = require('aws-xray-sdk'); - + // Override max sockets const customRequestHandler = new NodeHttpHandler({ httpsAgent: new Agent({maxSockets: 100}), httpAgent: new HttpAgent({maxSockets: 100}) diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index dfdf6520d9..9aefa0fc77 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -26,8 +26,8 @@ var helpers = require(__dirname + '/../../helpers/aws'); var collectors = require(__dirname + '/../../collectors/aws'); var collectData = require(__dirname + '/../../helpers/shared.js'); -// Override max sockets const { Agent } = require('https'); +const { Agent: HttpAgent } = require("http"); const { NodeHttpHandler } = require('@aws-sdk/node-http-handler'); var CALLS_CONFIG = { @@ -64,7 +64,7 @@ var collect = function(AWSConfig, settings, callback) { var AWSXRay; var debugMode = settings.debug_mode; if (debugMode) AWSXRay = require('aws-xray-sdk'); - + // Override max sockets const customRequestHandler = new NodeHttpHandler({ httpsAgent: new Agent({maxSockets: 100}), httpAgent: new HttpAgent({maxSockets: 100}) From feb77e07b2c353580f72a01befeeecb45f6ece12 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Thu, 18 Jan 2024 00:00:07 -0400 Subject: [PATCH 09/10] Remove requestHandler from AWSEC2 as its added to AWSConfig --- collectors/aws/collector.js | 11 +---------- collectors/aws/collector_multipart.js | 10 +--------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js index 9ac528a0a1..c80e6efb78 100644 --- a/collectors/aws/collector.js +++ b/collectors/aws/collector.js @@ -72,16 +72,7 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - // Override max sockets - var AWSEC2 = new EC2 ({ - AWSConfig, - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({maxSockets: 100 - }), - httpAgent: new HttpAgent({maxSockets: 100 - }) - }), - }); + var AWSEC2 = new EC2(AWSConfig); var params = {AllRegions: true}; var excludeRegions = []; diff --git a/collectors/aws/collector_multipart.js b/collectors/aws/collector_multipart.js index 9aefa0fc77..a4a5637f55 100644 --- a/collectors/aws/collector_multipart.js +++ b/collectors/aws/collector_multipart.js @@ -88,15 +88,7 @@ var collect = function(AWSConfig, settings, callback) { let runApiCalls = []; - var AWSEC2 = new EC2 ({ - AWSConfig, - requestHandler: new NodeHttpHandler({ - httpsAgent: new Agent({maxSockets: 100 - }), - httpAgent: new HttpAgent({maxSockets: 100 - }) - }), - }); + var AWSEC2 = new EC2(AWSConfig); var params = {AllRegions: true}; var excludeRegions = []; var timeoutCheck; From cf7349f324a875eb23b801ff7bfd7c49140229e5 Mon Sep 17 00:00:00 2001 From: Nuha Shawahna Date: Thu, 18 Jan 2024 00:04:20 -0400 Subject: [PATCH 10/10] use cloudsploitscan as package name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5de252ce50..172029195c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,5 +25,5 @@ ENV PATH "$PATH:/var/scan/node_modules/.bin" # command line arguments to the run command to control how this executes. # Thus, you can use the parameters that you would normally give to index.js # when running in a container. -ENTRYPOINT ["cloudsploit-scan"] +ENTRYPOINT ["cloudsploitscan"] CMD []