Call azcollect register to check input collector id (#37)

* Call azcollect register to check input collector id

* Fix publish makefile target

* Bump package version

Author: kkuzmin

Makefile

@@ -14,7 +14,7 @@ test: compile
 	npm run test
 
 publish:
-	npm run publish
+	npm run rel
 
 clean:
 	rm -rf node_modules

al_aws_collector.js

@@ -131,7 +131,8 @@ class AlAwsCollector {
             region : this._region,
             functionName : this._name,
             version : this._version,
-            dataType : this._ingestType
+            dataType : this._ingestType,
+            collectorId : this._collectorId
         };
     }
 
@@ -198,18 +199,14 @@ class AlAwsCollector {
                 }
             },
             (asyncCallback) => {
-                if (!process.env.collector_id || process.env.collector_id === 'none') {
-                    this._azcollectc.register(regValues)
-                        .then(resp => {
-                            const newCollectorId = resp.collector ? resp.collector.id : 'none';
-                            return m_alAws.setEnv({ collector_id: newCollectorId }, asyncCallback);
-                        })
-                        .catch(exception => {
-                            return asyncCallback('AWSC0003 registration error: ' + exception);
-                        });
-                } else {
-                    return asyncCallback(null);
-                }
+                this._azcollectc.register(regValues)
+                    .then(resp => {
+                        const newCollectorId = resp.collector ? resp.collector.id : 'none';
+                        return m_alAws.setEnv({ collector_id: newCollectorId }, asyncCallback);
+                    })
+                    .catch(exception => {
+                        return asyncCallback('AWSC0003 registration error: ' + exception);
+                    });
             }
         ],
         (err)=> {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alertlogic/al-aws-collector-js",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "license": "MIT",
   "description": "Alert Logic AWS Collector Common Library",
   "repository": {
@@ -11,7 +11,7 @@
   "scripts": {
     "lint": "jshint --exclude \"./node_modules/*\" **/*.js",
     "test": "JUNIT_REPORT_PATH=./test/report.xml nyc --reporter=cobertura mocha --colors --reporter mocha-jenkins-reporter",
-    "publish": "npm publish --access=public"
+    "rel": "npm publish --access=public"
   },
   "main": "index.js",
   "maintainers": [

test/collector_mock.js

@@ -15,6 +15,7 @@ process.env.aws_lambda_s3_bucket = S3_BUCKET;
 process.env.stack_name = STACK_NAME;
 process.env.aws_lambda_zipfile_name = S3_ZIPFILE;
 process.env.aws_lambda_update_config_name = S3_CONFIGURATION_FILE_NAME;
+process.env.collector_id = 'collector-id';
 
 
 const AIMS_TEST_CREDS = {