From 5a3ab5eee1b25fcc38c61b00b61d9501b283121a Mon Sep 17 00:00:00 2001
From: Sava Daniel <35995331+skutner@users.noreply.github.com>
Date: Thu, 15 Dec 2022 17:45:31 +0200
Subject: [PATCH] Pharmaledger-IMI/epi-workspace#1106 changed defaults in
 envJson and apihubJson (#205)

---
 charts/epi/Chart.yaml                           | 2 +-
 charts/epi/README.md                            | 8 ++++----
 charts/epi/templates/_configmap-environment.tpl | 9 +++++----
 charts/epi/templates/_helpers.tpl               | 9 ++++++++-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/charts/epi/Chart.yaml b/charts/epi/Chart.yaml
index fffa1d1e..38f4e40c 100644
--- a/charts/epi/Chart.yaml
+++ b/charts/epi/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.11
+version: 0.5.12
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/epi/README.md b/charts/epi/README.md
index da52fc75..cc322b5c 100644
--- a/charts/epi/README.md
+++ b/charts/epi/README.md
@@ -1,6 +1,6 @@
 # epi
 
-![Version: 0.5.11](https://img.shields.io/badge/Version-0.5.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-informational?style=flat-square)
+![Version: 0.5.12](https://img.shields.io/badge/Version-0.5.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.1](https://img.shields.io/badge/AppVersion-1.6.1-informational?style=flat-square)
 
 A Helm chart for Pharma Ledger epi (electronic product information) application
 
@@ -158,7 +158,7 @@ It is recommended to put non-sensitive configuration values in an configuration
 2. Install via helm to namespace `default`
 
     ```bash
-    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.11 \
+    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.12 \
         --install \
         --values my-config.yaml \
     ```
@@ -364,7 +364,7 @@ Run `helm upgrade --helm` for full list of options.
     You can install into other namespace than `default` by setting the `--namespace` parameter, e.g.
 
     ```bash
-    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.11 \
+    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.12 \
         --install \
         --namespace=my-namespace \
         --values my-config.yaml \
@@ -375,7 +375,7 @@ Run `helm upgrade --helm` for full list of options.
     Provide the `--wait` argument and time to wait (default is 5 minutes) via `--timeout`
 
     ```bash
-    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.11 \
+    helm upgrade my-release-name pharmaledger-imi/epi --version=0.5.12 \
         --install \
         --wait --timeout=600s \
         --values my-config.yaml \
diff --git a/charts/epi/templates/_configmap-environment.tpl b/charts/epi/templates/_configmap-environment.tpl
index ead3c030..a1c98738 100644
--- a/charts/epi/templates/_configmap-environment.tpl
+++ b/charts/epi/templates/_configmap-environment.tpl
@@ -88,8 +88,9 @@ data:
       "sw": false,
       "pwa": false,
       "allowPinLogin": false,
-      "companyName": {{ required "config.companyName must be set" .Values.config.companyName | quote }},
-      "disabledFeatures": "04, 05, 06, 07, 08, 09",
+      "companyName": "PLA",
+      "disabledFeatures": "02, 04, 05, 06, 07, 08, 09",
+      "lockFeatures": true,
       "epiProtocolVersion": 1,
       "appBuildVersion": {{ required "config.epiVersion must be set" .Values.config.epiVersion | quote}}
     }
@@ -114,8 +115,8 @@ data:
       "sw": false,
       "pwa": false,
       "allowPinLogin": false,
-      "lockFeatures": false,
-      "disabledFeatures": "04, 05, 06, 07, 08, 09",
+      "lockFeatures": true,
+      "disabledFeatures": "02, 04, 05, 06, 07, 08, 09",
       "easterEggEnabled": true,
       "epiProtocolVersion": 1,
       "appBuildVersion": {{ required "config.epiVersion must be set" .Values.config.epiVersion | quote}}
diff --git a/charts/epi/templates/_helpers.tpl b/charts/epi/templates/_helpers.tpl
index 6f5ec9b1..012e14eb 100644
--- a/charts/epi/templates/_helpers.tpl
+++ b/charts/epi/templates/_helpers.tpl
@@ -145,7 +145,9 @@ Configuration env.json
   "PSK_CONFIG_LOCATION": "../apihub-root/external-volume/config",
   "DEV": false,
   "VAULT_DOMAIN": {{ required "config.vaultDomain must be set" .Values.config.vaultDomain | quote}},
-  "BUILD_SECRET_KEY": {{ required "config.buildSecretKey must be set" .Values.config.buildSecretKey | quote}}
+  "BUILD_SECRET_KEY": {{ required "config.buildSecretKey must be set" .Values.config.buildSecretKey | quote}},
+  "BDNS_ROOT_HOSTS": "http://127.0.0.1:8080",
+  "OPENDSU_ENABLE_DEBUG": true
 }
 {{- end }}
 
@@ -173,6 +175,7 @@ Taken from https://github.com/PharmaLedger-IMI/epi-workspace/blob/v1.3.1/apihub-
     "epi-mapping-engine",
     "epi-mapping-engine-results",
     "leaflet-web-api",
+    "get-gtin-owner",
     "acdc-reporting",
     "debugLogger",
     "mq",
@@ -192,6 +195,10 @@ Taken from https://github.com/PharmaLedger-IMI/epi-workspace/blob/v1.3.1/apihub-
       "module": "./../../gtin-resolver",
       "function": "getWebLeaflet"
     },
+    "get-gtin-owner": {
+      "module": "./../../gtin-resolver",
+      "function": "getGTINOwner"
+    },
     "acdc-reporting": {
       "module": "./../../reporting-service/middleware",
       "function": "Init"