4.3.0/6.1.0 deploy-handler - policyVersion as str4.3.0

- external version 4.3.0
- internal version 6.1.0 for code change - no API change

- deployment-handler now expects the policyVersion as semver
  or any string to support for DMaaP MR update notification
  from the new PDP
- changed Dockerfile to use the alpine base image
  to reduce the footprint
- brought the latest packages except zip lib
- added package-lock.json to freeze the dependencies
- latest log4js - change of configuration file format
- fixed call to cloudify API /node-instances
  added &_sort=id to make the pagination consistent
- changed uuid/v4 to uuid.v4() to avoid the deprecation warning
- unit test
  = coverage by nyc now
  = on policy API - assert all expected nock calls are done
- integration testing with the latest policy-handler (DCAEGEN2-1851)
  and the new policy-engine is requested

unit test coverage summary
Statements   : 83.78% ( 1023/1221 )
Branches     : 62.95% ( 333/529 )
Functions    : 84.35% ( 194/230 )
Lines        : 84.18% ( 1011/1201 )

Change-Id: I174aa0b8804af0378755de86be833b0b763ddc1d
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-2085

4 files changed, 12 insertions, 11 deletions

diff --git a/lib/cloudify.js b/lib/cloudify.js
index e0683bf..77e6d72 100644
--- a/lib/cloudify.js
+++ b/lib/cloudify.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -389,7 +389,7 @@ exports.getNodeInstances = function (mainReq, on_next_node_instances, offset) {
     offset = offset || 0;
     const reqOptions = {
         method : "GET",
-        uri : cfyAPI + "/node-instances?_include=id,deployment_id,runtime_properties&_size=1000&_offset=" + offset
+        uri : cfyAPI + "/node-instances?_include=id,deployment_id,runtime_properties&_sort=id&_size=1000&_offset=" + offset
     };
 
     addAuthToOptions(reqOptions, mainReq);
diff --git a/lib/logging.js b/lib/logging.js
index 8d94f87..5c99ec2 100644
--- a/lib/logging.js
+++ b/lib/logging.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -270,5 +270,6 @@ exports.getLogger = function() {
 };
 
 exports.setLevel = function(level) {
-	log4js.setGlobalLogLevel(level);
+	level = (level || 'debug').toLowerCase();
+	debugLogger.level = level;
 };
diff --git a/lib/policy.js b/lib/policy.js
index 098a4a4..4d56096 100644
--- a/lib/policy.js
+++ b/lib/policy.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -172,7 +172,7 @@ function update_policies(req, res) {
 
                 const latest_policy = policy_update.latest_policies[policy_id];
                 if (!latest_policy || !latest_policy.policy_body
-                || isNaN(latest_policy.policy_body.policyVersion)) {return;}
+                || latest_policy.policy_body.policyVersion == null) {return;}
 
                 if (!deployment.is_deployment_busy && latest_policy.policy_body.policyVersion
                 === (deployed_policy.policy_body && deployed_policy.policy_body.policyVersion)) {return;}
@@ -189,7 +189,7 @@ function update_policies(req, res) {
 
                     const latest_policy = policy_update.latest_policies[policy_id];
                     const policy_body = latest_policy && latest_policy.policy_body;
-                    if (!policy_body || isNaN(policy_body.policyVersion)) {return;}
+                    if (!policy_body || policy_body.policyVersion == null) {return;}
 
                     have_policies = true;
                     deployment.added_policies[policy_filter_id] = deployment.added_policies[policy_filter_id] || {
@@ -241,7 +241,7 @@ function get_policies_from_cloudify(req, res, next) {
                         "policy_versions": {}
                     };
                     const policy = node_instance.runtime_properties.policies[policy_id];
-                    if (policy.policy_body && policy.policy_body.policyVersion) {
+                    if (policy.policy_body && policy.policy_body.policyVersion != null) {
                         deployed_policy.policy_versions[policy.policy_body.policyVersion] = true;
                     }
                     deployed_policy.pending_update = deployed_policy.pending_update || pending_update;
diff --git a/lib/utils.js b/lib/utils.js
index 8caf280..b4558bd 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations
 
 "use strict";
 
-const uuid = require('uuid/v4');
+const uuid = require('uuid');
 
 // Utility functions
 
@@ -35,7 +35,7 @@ exports.hasProperty = function(o, key) {
 
 /* Generate a random ID string */
 exports.generateId = function() {
-	return uuid();
+	return uuid.v4();
 };
 
 const hide_fields = ["passphrase", "pfx"];