Merge pull request #18 from JDragovichAlertLogic/catch-raw-string-errors

fix error handling to catch raw string errors
alertlogic · Jul 3, 2019 · 549bb5d · 549bb5d
2 parents c209634 + b566894
commit 549bb5d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/master.js b/master.js
@@ -365,8 +365,13 @@ class AlAzureMaster {
         function(errStatus) {
             var status;
             if (errStatus) {
-                master._azureContext.log.warn('Health check failed with',  errStatus.details);
-                status = errStatus;
+                if(typeof errStatus === 'string'){
+                    master._azureContext.log.warn('Health check failed with: ',  errStatus);
+                    status = master.errorStatusFmt('ALAZU000004', errStatus);
+                } else {
+                    master._azureContext.log.warn('Health check failed with',  errStatus.details);
+                    status = errStatus;
+                }
             } else {
                 status = {
                     status: 'ok',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alertlogic/al-azure-collector-js",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "description": "Alert Logic Azure Collector Common Library",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
     "sinon": "^7.2.3"
   },
   "dependencies": {
-    "@alertlogic/al-collector-js": "^1.1.2",
+    "@alertlogic/al-collector-js": "^1.3.0",
     "async": "^2.6.1",
     "azure": "^2.3.1-preview",
     "parse-key-value": "^1.0.0",

diff --git a/test/collector_test.js b/test/collector_test.js
@@ -64,8 +64,8 @@ describe('Collector tests', function() {
 
         fakePost = sinon.stub(alcollector.AlServiceC.prototype, 'post').callsFake(
             function fakeFn(path, extraOptions) {
-                assert.equal(extraOptions.headers['Content-Type'], 'alertlogic.com/pass-through');
-                assert.equal(path, '/data/aicspmsgs');
+                assert.equal(extraOptions.headers['Content-Type'], 'alertlogic.com/lm3-protobuf');
+                assert.equal(path, '/data/logmsgs');
                 assert.equal(expectedBody, extraOptions.body.toString('base64'));
 
                 return new Promise(function(resolve, reject){
@@ -106,8 +106,8 @@ describe('Collector tests', function() {
 
         fakePost = sinon.stub(alcollector.AlServiceC.prototype, 'post').callsFake(
             function fakeFn(path, extraOptions) {
-                assert.equal(extraOptions.headers['Content-Type'], 'alertlogic.com/pass-through');
-                assert.equal(path, '/data/aicspmsgs');
+                assert.equal(extraOptions.headers['Content-Type'], 'alertlogic.com/lm3-protobuf');
+                assert.equal(path, '/data/logmsgs');
                 assert.equal(expectedBody, extraOptions.body.toString('base64'));
 
                 return new Promise(function(resolve, reject){

diff --git a/test/master_test.js b/test/master_test.js
@@ -560,6 +560,37 @@ describe('Master tests', function() {
             });
         });
 
+        it('Verify checkin with custom health-check error that returns a raw string', function(done) {
+            var customHealthFuns = [
+                function(m, callback) {
+                    return callback(null);
+                },
+                function(m, callback) {
+                    return callback("A Raw String Error");
+                }
+            ];
+            var master = new AlAzureMaster(mock.DEFAULT_FUNCTION_CONTEXT, 'ehub', '1.0.0', customHealthFuns);
+            master.checkin('2017-12-22T14:31:39', function(err){
+                if (err) console.log(err);
+                const expectedCheckin = { 
+                    body: {
+                        version: '1.0.0',
+                        app_tenant_id: 'tenant-id',
+                        collection_stats: { 'log': { 'bytes': 10, 'events': 15 } },
+                        host_id: 'existing-host-id',
+                        source_id: 'existing-source-id',
+                        statistics: [{ 'Master': { 'errors': 0, 'invocations': 2 } }, { 'Collector': { 'errors': 1, 'invocations': 10 } }, { 'Updater': { 'errors': 0, 'invocations': 0 } }],
+                        status: 'error',
+                        details: ["A Raw String Error"],
+                        error_code: 'ALAZU000004'
+                    }
+                };
+                const expectedUrl = '/azure/ehub/checkin/subscription-id/kktest11-rg/kktest11-name';
+                sinon.assert.calledWithMatch(fakePost, expectedUrl, expectedCheckin);
+                done();
+            });
+        });
+
         it('Verify checkin with custom health-check error', function(done) {
             var customHealthFuns = [
                 function(m, callback) {