Merge pull request #31 from alertlogic/npm

merge Npm branch to master

Author: kkuzmin

.gitignore

@@ -8,3 +8,4 @@ nbproject/
 coverage/
 test/ide_test.js
 .env
+*.swp

.travis.yml

@@ -3,6 +3,6 @@ language: node_js
 node_js:
   - "8"
 install:
-  - make deps
+  - npm install
 script:
-  - make test
+  - npm run test

al_aws_collector.js

@@ -221,7 +221,13 @@ class AlAwsCollector {
             );
             collector._azcollectc.checkin(checkin)
             .then(resp => {
-                return callback(null);
+                if(resp && resp.force_update === true){
+                    console.info("Force update");
+                    return collector.update(callback);
+                }
+                else{
+                    return callback(null);
+                }
             })
             .catch(exception => {
                 return callback(exception);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alertlogic/al-aws-collector-js",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "license": "MIT",
   "description": "Alert Logic AWS Collector Common Library",
   "repository": {

test/al_aws_collector_test.js

@@ -240,6 +240,33 @@ describe('al_aws_collector tests', function() {
             });
         });
 
+        it('checkin forced update success', function(done) {
+            alserviceStub.post.restore();
+            alserviceStub.post = sinon.stub(m_alCollector.AlServiceC.prototype, 'post').callsFake(
+                    function fakeFn(path, extraOptions) {
+                        return new Promise(function(resolve, reject) {
+                            return resolve({force_update: true});
+                        });
+                    });
+            let fakeSelfUpdate = sinon.stub(AlAwsCollector.prototype, 'selfUpdate').callsFake(
+                (callback) => { callback(); });
+            let fakeSelfConfigUpdate = sinon.stub(AlAwsCollector.prototype, 'selfConfigUpdate').callsFake(
+                    (callback) => { callback(); });
+            AlAwsCollector.load().then(function(creds) {
+                var collector = new AlAwsCollector(
+                mockContext, 'cwe', AlAwsCollector.IngestTypes.SECMSGS,'1.0.0', creds, undefined, [], []);
+                collector.checkin(function(error) {
+                    assert.equal(error, undefined);
+                    sinon.assert.calledWith(alserviceStub.post, colMock.CHECKIN_URL, colMock.CHECKIN_AZCOLLECT_QUERY);
+                    sinon.assert.called(fakeSelfConfigUpdate);
+                    sinon.assert.called(fakeSelfUpdate);
+                    fakeSelfUpdate.restore();
+                    fakeSelfConfigUpdate.restore();
+                    done();
+                });
+            });
+        });
+
         it('checkin with custom check success', function(done) {
             AlAwsCollector.load().then(function(creds) {
                 var spyHealthCheck = sinon.spy(function(callback) {