chore: address sonarlint issues

cht-config/Dockerfile

@@ -2,19 +2,19 @@ FROM node:16-slim
 
 RUN apt update \
     && apt install --no-install-recommends -y \
+      curl \
       git \
       python3-pip \
       python3-setuptools \
       python3-wheel \
-      curl
-
-RUN python3 -m pip install git+https://github.com/medic/[email protected]#egg=pyxform-medic
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && python3 -m pip install git+https://github.com/medic/[email protected]#egg=pyxform-medic
 
 WORKDIR /scripts/cht-config
 
 COPY ./ ./
 
-RUN npm install 
-RUN npm install -g cht-conf 
+RUN npm install --ignore-scripts && npm install -g --ignore-scripts cht-conf 
 
-CMD npm run deploy
+CMD ["npm", "run", "deploy"]

configurator/Dockerfile

@@ -9,4 +9,4 @@ RUN npm install
 
 COPY ./ ./
 
-CMD npm run configure
+CMD ["npm", "run", "configure"]

configurator/index.js

@@ -14,11 +14,19 @@ async function handleConfiguration () {
     ContactGroups: []
   };
 
+  const openMRSConfig = {
+    host: OPENMRS_HOST,
+    port: OPENMRS_PORT,
+    username: OPENMRS_USERNAME,
+    password: OPENMRS_PASSWORD,
+    protocol: OPENMRS_PROTOCOL
+  }
+
   metadata.Users.push(await generateUser(OPENHIM_USER_PASSWORD));
   metadata.Clients.push(await generateClient(OPENHIM_CLIENT_PASSWORD));
   metadata.Channels.push(await generateHapiFhirChannel());
   if (OPENMRS_HOST) {
-    metadata.Channels.push(await generateOpenMRSChannel(OPENMRS_HOST, OPENMRS_PORT, OPENMRS_USERNAME, OPENMRS_PASSWORD, OPENMRS_PROTOCOL));
+    metadata.Channels.push(await generateOpenMRSChannel(openMRSConfig));
   }
 
   const data = JSON.stringify(metadata);

configurator/libs/generators.js

@@ -94,7 +94,8 @@ async function generateHapiFhirChannel () {
   };
 }
 
-async function generateOpenMRSChannel (host, port, username, password, type) {
+async function generateOpenMRSChannel (config) {
+  const { host, port, username, password, type } = config;
   return {
     methods: [
       'GET',

mediator/src/mappers/cht.ts

@@ -1,5 +1,4 @@
-import { getIdType, copyIdToNamedIdentifier, addSourceMeta } from '../utils/fhir';
-import { openMRSIdentifierType } from './openmrs';
+import { getIdType, copyIdToNamedIdentifier } from '../utils/fhir';
 
 export const chtDocumentIdentifierType: fhir4.CodeableConcept = {
   text: 'CHT Document ID'