Resolved PR conflicts

aquasecurity · Aug 29, 2020 · fa0c3ee · fa0c3ee
1 parent 99ac135
commit fa0c3ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/collectors/aws/collector.js b/collectors/aws/collector.js
@@ -1014,7 +1014,6 @@ var collect = function(AWSConfig, settings, callback) {
                         if (err) collection[serviceLower][callKey][region].err = err;
 
                         if (!data) return regionCb();
-
                         if (callObj.property && !data[callObj.property]) return regionCb();
                         if (callObj.secondProperty && !data[callObj.secondProperty]) return regionCb();
 
@@ -1112,6 +1111,7 @@ var collect = function(AWSConfig, settings, callback) {
                             });
                         } else {
                             var executor = new AWS[service](LocalAWSConfig);
+
                             if (!collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region] ||
                                 !collection[callObj.reliesOnService][callObj.reliesOnCall][LocalAWSConfig.region].data) {
                                 return regionCb();

diff --git a/exports.js b/exports.js
@@ -93,17 +93,17 @@ module.exports = {
         'eksLoggingEnabled'             : require(__dirname + '/plugins/aws/eks/eksLoggingEnabled.js'),
         'eksPrivateEndpoint'            : require(__dirname + '/plugins/aws/eks/eksPrivateEndpoint.js'),
         'eksSecurityGroups'             : require(__dirname + '/plugins/aws/eks/eksSecurityGroups.js'),
-        
+
         'insecureCiphers'               : require(__dirname + '/plugins/aws/elb/insecureCiphers.js'),
         'elbHttpsOnly'                  : require(__dirname + '/plugins/aws/elb/elbHttpsOnly.js'),
         'elbLoggingEnabled'             : require(__dirname + '/plugins/aws/elb/elbLoggingEnabled.js'),
         'elbNoInstances'                : require(__dirname + '/plugins/aws/elb/elbNoInstances.js'),
-        
+
         'elbv2LoggingEnabled'             : require(__dirname + '/plugins/aws/elbv2/elbv2LoggingEnabled.js'),
         'elbv2HttpsOnly'                  : require(__dirname + '/plugins/aws/elbv2/elbv2HttpsOnly.js'),
         'elbv2NoInstances'                : require(__dirname + '/plugins/aws/elbv2/elbv2NoInstances.js'),
         'elbv2WafEnabled'                 : require(__dirname + '/plugins/aws/elbv2/elbv2WafEnabled.js'),
-        
+
         'esPublicEndpoint'              : require(__dirname + '/plugins/aws/es/esPublicEndpoint.js'),
         'esRequireIAMAuth'              : require(__dirname + '/plugins/aws/es/esRequireIAMAuth.js'),
         'esEncryptedDomain'             : require(__dirname + '/plugins/aws/es/esEncryptedDomain.js'),