From dbab04e8789e29fc8dd9e86b693812ea0e071c6a Mon Sep 17 00:00:00 2001
From: Alex Shatov <alexs@att.com>
Date: Fri, 28 Feb 2020 14:59:50 -0500
Subject: 4.3.0/6.1.0 deploy-handler - policyVersion as str

- 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
---
 Dockerfile_UT | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

(limited to 'Dockerfile_UT')

diff --git a/Dockerfile_UT b/Dockerfile_UT
index ee5791d..147cdb9 100644
--- a/Dockerfile_UT
+++ b/Dockerfile_UT
@@ -1,4 +1,21 @@
-FROM node:10.16.0
+# ========================================================================
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# ========================================================================
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the "License");
+# you may not use this software except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#             http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=================================================
+
+FROM node:10.16-alpine
 
 ENV INSROOT /opt/app
 ENV APPUSER dh
@@ -6,32 +23,31 @@ ENV APPDIR ${INSROOT}/${APPUSER}
 
 WORKDIR ${APPDIR}
 
-RUN uname -a \
- && mkdir -p ${APPDIR}/lib \
- && mkdir -p ${APPDIR}/tests \
- && mkdir -p ${APPDIR}/etc \
- && mkdir -p ${APPDIR}/log \
- && useradd -d ${APPDIR} ${APPUSER}
-
 COPY *.js ${APPDIR}/
 COPY *.json ${APPDIR}/
 COPY *.txt ${APPDIR}/
 COPY *.yaml ${APPDIR}/
+COPY .*.yaml ${APPDIR}/
 COPY ./lib/ ${APPDIR}/lib/
 COPY ./tests/ ${APPDIR}/tests/
 COPY ./etc/ ${APPDIR}/etc/
 
-RUN npm install \
+RUN uname -a \
+ && npm install \
+ && mkdir -p ${APPDIR}/log \
+ && addgroup ${APPUSER} \
+ && adduser -S -h ${APPDIR} -G ${APPUSER} ${APPUSER} \
  && chown -R ${APPUSER}:${APPUSER} ${APPDIR} \
  && chmod 777 ${APPDIR}/lib \
  && chmod 777 ${APPDIR}/tests \
  && chmod 777 ${APPDIR}/log \
  && chmod 777 ${APPDIR}/etc \
  && pwd \
- && ls -laR -Inode_modules
+ && npm ls --depth 0 && echo "$(ls -l node_modules | grep -c ^d) folders in node_modules" \
+ && ls -la
 
 USER ${APPUSER}
 VOLUME ${APPDIR}/log
 EXPOSE 8443
-ENTRYPOINT ["/usr/local/bin/npm", "test"]
-# ENTRYPOINT ["/usr/local/bin/npm", "run", "test-only"]
+
+ENTRYPOINT ["/usr/local/bin/npm", "run", "coverage"]
-- 
cgit 1.2.3-korg