Default events (#35)

* Add default event handler

* Fix tests

Author: kkuzmin

al_aws.js

@@ -49,7 +49,7 @@ var getS3ConfigChanges = function(callback) {
                 let config = JSON.parse(object.Body.toString());
                 return callback(null, config);
             } catch(ex) {
-                return callback('Unable to parse config cahnges.')
+                return callback('Unable to parse config changes.')
             }
         }
     });

al_aws_collector.js

@@ -4,6 +4,7 @@
  *
  * Base class for AWS Lambda based collectors.
  *
+ * Last message ID: AWSC0010
  * @end
  * -----------------------------------------------------------------------------
  */
@@ -124,7 +125,7 @@ class AlAwsCollector {
                     return mapCallback(null, resp);
                 })
                 .catch(function(exception) {
-                    return mapCallback(`Endpoints ${service} update failure ${exception}`);
+                    return mapCallback(`AWSC0001 Endpoints ${service} update failure ${exception}`);
                 });
             },
             function (mapErr, mapResult) {
@@ -157,7 +158,7 @@ class AlAwsCollector {
                     // register even if there is an error in getting the endpoints.
                     this.updateEndpoints((err, newConfig) => {
                         if(err){
-                            console.warn('Error updating endpoints', err);
+                            console.warn('AWSC0002 Error updating endpoints', err);
                         } else {
                             // reassign env vars because the config change occurs in the same run in registration.
                             const {
@@ -183,7 +184,7 @@ class AlAwsCollector {
                         asyncCallback(null);
                     })
                     .catch(exception => {
-                        asyncCallback("registration error: " + exception);
+                        asyncCallback('AWSC0003 registration error: ' + exception);
                     });
             }
         ],
@@ -222,7 +223,7 @@ class AlAwsCollector {
             collector._azcollectc.checkin(checkin)
             .then(resp => {
                 if(resp && resp.force_update === true){
-                    console.info("Force update");
+                    console.info('AWSC0004 Force update');
                     return collector.update(callback);
                 }
                 else{
@@ -280,7 +281,7 @@ class AlAwsCollector {
                         });
                         break;
                     default:
-                        return callback(`Unknown Alertlogic ingestion type: ${ingestType}`);
+                        return callback(`AWSC0005 Unknown Alertlogic ingestion type: ${ingestType}`);
                 }
             }
         });
@@ -350,17 +351,32 @@ class AlAwsCollector {
         ],
         function(err, config) {
             if (err) {
-                console.info('Lambda self-update config error: ', err);
+                console.info('AWSC0006 Lambda self-update config error: ', err);
             } else {
                 if (config !== undefined) {
-                    console.info('Lambda self-update config successful. Config: ', config);
+                    console.info('AWSC0007 Lambda self-update config successful. Config: ', config);
                 } else {
-                    console.info('Lambda self-update config nothing to update');
+                    console.info('AWSC0008 Lambda self-update config nothing to update');
                 }
             }
             callback(err, config);
         });
     }
+    
+    handleDefaultEvents(scheduledEvent, callback) {
+        let collector = this;
+        
+        switch (scheduledEvent.Type) {
+            case 'SelfUpdate':
+                return collector.update(callback);
+                break;
+            case 'Checkin':
+                return collector.checkin(callback);
+                break;
+            default:
+                return callback('AWSC0009 Unknown scheduled event detail type: ' + scheduledEvent.Type);
+        }
+    }
 
     _applyConfigChanges(newValues, config, callback) {
         var jsonConfig = JSON.stringify(config);
@@ -376,7 +392,7 @@ class AlAwsCollector {
             return callback(null, newConfig);
         }
         catch(ex) {
-            return callback('Unable to apply new config values');
+            return callback('AWSC0010 Unable to apply new config values');
         }
     }
 

test/al_aws_collector_test.js

@@ -232,7 +232,10 @@ describe('al_aws_collector tests', function() {
             AlAwsCollector.load().then(function(creds) {
                 var collector = new AlAwsCollector(
                 mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
-                collector.checkin(function(error) {
+                const testEvent = {
+                        Type: 'Checkin'
+                    };
+                collector.handleDefaultEvents(testEvent, function(error) {
                     assert.equal(error, undefined);
                     sinon.assert.calledWith(alserviceStub.post, colMock.CHECKIN_URL, colMock.CHECKIN_AZCOLLECT_QUERY);
                     done();
@@ -677,7 +680,7 @@ describe('al_aws_collector tests', function() {
             });
 
             collector.selfConfigUpdate((err, config) => {
-                assert.equal('Unable to apply new config values', err);
+                assert.equal('AWSC0010 Unable to apply new config values', err);
                 assert.equal(config, undefined);
             });
         });
@@ -719,7 +722,10 @@ describe('al_aws_collector tests', function() {
         it('code update only', () => {
             delete(process.env.aws_lambda_update_config_name);
 
-            collector.update((err) => {
+            const testEvent = {
+                Type: 'SelfUpdate'
+            };
+            collector.handleDefaultEvents(testEvent, (err) => {
                 assert.equal(err, undefined);
             });
 
@@ -837,7 +843,7 @@ describe('al_aws_collector error tests', function() {
             invokedFunctionArn : colMock.FUNCTION_ARN,
             done : () => {
                 sinon.assert.calledWith(alserviceStub.post, colMock.REG_URL, colMock.REG_AZCOLLECT_QUERY);
-                sinon.assert.calledWith(responseStub, sinon.match.any, sinon.match.any, m_response.FAILED, {Error: 'registration error: post error'});
+                sinon.assert.calledWith(responseStub, sinon.match.any, sinon.match.any, m_response.FAILED, {Error: 'AWSC0003 registration error: post error'});
                 done();
             }
         };
@@ -874,5 +880,19 @@ describe('al_aws_collector error tests', function() {
             });
         });
     });
+    
+    it('default scheduled event error', function(done) {
+        AlAwsCollector.load().then(function(creds) {
+            var collector = new AlAwsCollector(
+                context, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
+            const testEvent = {
+                Type: 'Unknown'
+            };
+            collector.handleDefaultEvents(testEvent, function(error) {
+                assert.equal(error, 'AWSC0009 Unknown scheduled event detail type: Unknown');
+                done();
+            });
+        });
+    });
 
 });