From 7471c65360d7b352d152b2d57e3cb4149bbaaab5 Mon Sep 17 00:00:00 2001 From: Khavin Shankar Date: Sat, 19 Oct 2024 01:33:51 +0530 Subject: [PATCH 1/3] added missing mandatory env to .local.env and .prebuild.env --- docker/.local.env | 2 ++ docker/.prebuilt.env | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/docker/.local.env b/docker/.local.env index 83b5dadb33..cfbd0d888a 100644 --- a/docker/.local.env +++ b/docker/.local.env @@ -34,3 +34,5 @@ ABDM_GATEWAY_URL=https://dev.abdm.gov.in ABDM_ABHA_URL=https://abhasbx.abdm.gov.in ABDM_FACILITY_URL=https://facilitysbx.abdm.gov.in ABDM_CM_ID=sbx +CURRENT_DOMAIN=https://care.ohc.network +BACKEND_DOMAIN=https://careapi.ohc.network diff --git a/docker/.prebuilt.env b/docker/.prebuilt.env index 8bcc36312e..18a9422988 100644 --- a/docker/.prebuilt.env +++ b/docker/.prebuilt.env @@ -39,3 +39,13 @@ HCX_PASSWORD=Opensaber@123 HCX_PROTOCOL_BASE_PATH=http://staging-hcx.swasth.app/api/v0.7 HCX_USERNAME=qwertyreboot@gmail.com HCX_CERT_URL=https://raw.githubusercontent.com/Swasth-Digital-Health-Foundation/hcx-platform/main/demo-app/server/resources/keys/x509-self-signed-certificate.pem + +# ABDM envs: added to avoid test failures +ABDM_CLIENT_ID=SBX_001 +ABDM_CLIENT_SECRET=xxxx +ABDM_GATEWAY_URL=https://dev.abdm.gov.in +ABDM_ABHA_URL=https://abhasbx.abdm.gov.in +ABDM_FACILITY_URL=https://facilitysbx.abdm.gov.in +ABDM_CM_ID=sbx +CURRENT_DOMAIN=https://care.ohc.network +BACKEND_DOMAIN=https://careapi.ohc.network From f1c2f772f5efc922f2e2ae9831fd2658c8abeb0e Mon Sep 17 00:00:00 2001 From: Khavin Shankar Date: Sat, 19 Oct 2024 01:55:01 +0530 Subject: [PATCH 2/3] removed abdm config from plug_config --- docker/.local.env | 10 ---------- docker/.prebuilt.env | 10 ---------- plug_config.py | 9 +-------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/docker/.local.env b/docker/.local.env index cfbd0d888a..b00327fc9b 100644 --- a/docker/.local.env +++ b/docker/.local.env @@ -26,13 +26,3 @@ HCX_PASSWORD=Opensaber@123 HCX_PROTOCOL_BASE_PATH=http://staging-hcx.swasth.app/api/v0.7 HCX_USERNAME=qwertyreboot@gmail.com HCX_CERT_URL=https://raw.githubusercontent.com/Swasth-Digital-Health-Foundation/hcx-platform/main/demo-app/server/resources/keys/x509-self-signed-certificate.pem - -# ABDM envs: added to avoid test failures -ABDM_CLIENT_ID=SBX_001 -ABDM_CLIENT_SECRET=xxxx -ABDM_GATEWAY_URL=https://dev.abdm.gov.in -ABDM_ABHA_URL=https://abhasbx.abdm.gov.in -ABDM_FACILITY_URL=https://facilitysbx.abdm.gov.in -ABDM_CM_ID=sbx -CURRENT_DOMAIN=https://care.ohc.network -BACKEND_DOMAIN=https://careapi.ohc.network diff --git a/docker/.prebuilt.env b/docker/.prebuilt.env index 18a9422988..8bcc36312e 100644 --- a/docker/.prebuilt.env +++ b/docker/.prebuilt.env @@ -39,13 +39,3 @@ HCX_PASSWORD=Opensaber@123 HCX_PROTOCOL_BASE_PATH=http://staging-hcx.swasth.app/api/v0.7 HCX_USERNAME=qwertyreboot@gmail.com HCX_CERT_URL=https://raw.githubusercontent.com/Swasth-Digital-Health-Foundation/hcx-platform/main/demo-app/server/resources/keys/x509-self-signed-certificate.pem - -# ABDM envs: added to avoid test failures -ABDM_CLIENT_ID=SBX_001 -ABDM_CLIENT_SECRET=xxxx -ABDM_GATEWAY_URL=https://dev.abdm.gov.in -ABDM_ABHA_URL=https://abhasbx.abdm.gov.in -ABDM_FACILITY_URL=https://facilitysbx.abdm.gov.in -ABDM_CM_ID=sbx -CURRENT_DOMAIN=https://care.ohc.network -BACKEND_DOMAIN=https://careapi.ohc.network diff --git a/plug_config.py b/plug_config.py index 27be9de162..c177c62cde 100644 --- a/plug_config.py +++ b/plug_config.py @@ -1,13 +1,6 @@ from plugs.manager import PlugManager from plugs.plug import Plug -abdm_plugin = Plug( - name="abdm", - package_name="git+https://github.com/ohcnetwork/care_abdm.git", - version="@main", - configs={}, -) - hcx_plugin = Plug( name="hcx", package_name="git+https://github.com/ohcnetwork/care_hcx.git", @@ -15,6 +8,6 @@ configs={}, ) -plugs = [hcx_plugin, abdm_plugin] +plugs = [hcx_plugin] manager = PlugManager(plugs) From ee5caf9bcad844d3943761b1660d2702ff97353f Mon Sep 17 00:00:00 2001 From: Aakash Singh Date: Sat, 19 Oct 2024 02:01:50 +0530 Subject: [PATCH 3/3] Discard changes to plug_config.py --- plug_config.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plug_config.py b/plug_config.py index c177c62cde..27be9de162 100644 --- a/plug_config.py +++ b/plug_config.py @@ -1,6 +1,13 @@ from plugs.manager import PlugManager from plugs.plug import Plug +abdm_plugin = Plug( + name="abdm", + package_name="git+https://github.com/ohcnetwork/care_abdm.git", + version="@main", + configs={}, +) + hcx_plugin = Plug( name="hcx", package_name="git+https://github.com/ohcnetwork/care_hcx.git", @@ -8,6 +15,6 @@ configs={}, ) -plugs = [hcx_plugin] +plugs = [hcx_plugin, abdm_plugin] manager = PlugManager(plugs)