Merge branch 'aquasecurity:master' into nuhasha/MigrateAWSSDK

Author: nuhasha

collectors/aws/ses/getIdentityDkimAttributes.js

@@ -12,7 +12,6 @@ module.exports = function(AWSConfig, collection, retries, callback) {
     var allDkimAttributes = [];
     var processIdentityChunk = function(chunkIndex) {
         if (chunkIndex >= identityChunks.length) {
-            allDkimAttributes =  allDkimAttributes.flatMap(obj => Object.values(obj));
             collection.ses.getIdentityDkimAttributes[AWSConfig.region].data = {
                 DkimAttributes: allDkimAttributes
             };
@@ -30,17 +29,18 @@ module.exports = function(AWSConfig, collection, retries, callback) {
                 if (err) {
                     collection.ses.getIdentityDkimAttributes[AWSConfig.region].err = err;
                 } else if (data && data.DkimAttributes) {
-                    allDkimAttributes = allDkimAttributes.concat(data.DkimAttributes);
+                    allDkimAttributes = {
+                        ...allDkimAttributes,
+                        ...data.DkimAttributes
+                    };
                 }
-
                 processIdentityChunk(chunkIndex + 1);
             });
         }, 1000);
     };
 
     processIdentityChunk(0);
 };
-
 function chunkArray(arr, chunkSize) {
     var result = [];
     for (var i = 0; i < arr.length; i += chunkSize) {

collectors/azure/collector.js

@@ -53,6 +53,7 @@ let collect = function(AzureConfig, settings, callback) {
     var helpers = require(__dirname + '/../../helpers/azure/auth.js');
 
     let services = [];
+    let skip_locations= settings.skip_regions || [];
 
     // Login using the Azure config
     helpers.login(AzureConfig, function(loginErr, loginData) {
@@ -140,7 +141,7 @@ let collect = function(AzureConfig, settings, callback) {
             function(cb) {
                 function processTopCall(collectionObj, service, subCallObj, subCallCb) {
                     processCall(subCallObj, function(processCallErr, processCallData) {
-                        helpers.addLocations(subCallObj, service, collectionObj, processCallErr, processCallData);
+                        helpers.addLocations(subCallObj, service, collectionObj, processCallErr, processCallData , skip_locations);
                         subCallCb();
                     });
                 }

collectors/google/collector.js

@@ -30,6 +30,9 @@ var tertiarycalls = apiCalls.tertiarycalls;
 
 var specialcalls = apiCalls.specialcalls;
 
+var additionalCalls = apiCalls.additionalCalls;
+
+
 var collect = function(GoogleConfig, settings, callback) {
     var collection = {};
 
@@ -175,6 +178,38 @@ var collect = function(GoogleConfig, settings, callback) {
                         }
                     });
                 },
+                function(cb) {
+                    async.eachOfLimit(additionalCalls, 10, function(additionalCallObj, service, additionalCallCb) {
+                        helpers.processCall(GoogleConfig, collection, settings, regions, additionalCallObj, service, client, function() {
+                            if (settings.identifier && additionalCalls[service].sendIntegration && additionalCalls[service].sendIntegration.enabled) {
+                                if (!additionalCalls[service].sendIntegration.integrationReliesOn) {
+                                    integrationCall(collection, settings, service, [], [additionalCalls], function() {
+                                        additionalCallCb();
+                                    });
+                                } else {
+                                    services.push(service);
+                                    additionalCallCb();
+                                }
+                            } else {
+                                additionalCallCb();
+                            }
+                        });
+                    }, function() {
+                        if (settings.identifier) {
+                            async.each(services, function(serv, callB) {
+                                integrationCall(collection, settings, serv, [], [additionalCalls], callB);
+                            }, function(err) {
+                                if (err) {
+                                    console.log(err);
+                                }
+                                services = [];
+                                cb();
+                            });
+                        } else {
+                            cb();
+                        }
+                    });
+                },
                 function(cb) {
                     async.eachOfLimit(specialcalls, 10, function(specialCallObj, service, specialCallCb) {
                         async.eachOfLimit(specialCallObj, 10, function(subCallObj, one, subCallCb) {
@@ -197,7 +232,7 @@ var collect = function(GoogleConfig, settings, callback) {
                 },
 
             ], function() {
-                if (collection && (!collection.projects || !collection.projects.get)) {
+                if (collection && (!collection.projects || !collection.projects.get || (collection.projects && collection.projects.get && !Object.keys(collection.projects.get).length))) {
                     collection.projects = {
                         ...collection.projects,
                         get: {