[MOSIP-32901] Merging changes from release back to develop

api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java

@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
 import org.testng.TestNG;
@@ -24,10 +25,9 @@
 import io.mosip.testrig.apirig.dataprovider.BiometricDataProvider;
 import io.mosip.testrig.apirig.dbaccess.DBManager;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
+import io.mosip.testrig.apirig.utils.AuthTestsUtil;
 import io.mosip.testrig.apirig.utils.CertificateGenerationUtil;
 import io.mosip.testrig.apirig.utils.CertsUtil;
-import io.mosip.testrig.apirig.utils.ConfigManager;
-import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
 import io.mosip.testrig.apirig.utils.EsignetConfigManager;
 import io.mosip.testrig.apirig.utils.EsignetUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
@@ -60,7 +60,6 @@ public class MosipTestRunner {
 	public static void main(String[] arg) {
 
 		try {
-
 			Map<String, String> envMap = System.getenv();
 			LOGGER.info("** ------------- Get ALL ENV varibales --------------------------------------------- **");
 			for (String envName : envMap.keySet()) {
@@ -74,8 +73,9 @@ public static void main(String[] arg) {
 			} else {
 				ExtractResource.copyCommonResources();
 			}
+			AdminTestUtil.init();
 			EsignetConfigManager.init();
-			BaseTestCase.suiteSetup(getRunType());
+			suiteSetup(getRunType());
 			SkipTestCaseHandler.loadTestcaseToBeSkippedList("testCaseSkippedList.txt");
 			setLogLevels();
 
@@ -127,14 +127,41 @@ public static void main(String[] arg) {
 		} catch (Exception e) {
 			LOGGER.error("Exception " + e.getMessage());
 		}
-
 		OTPListener.bTerminate = true;
 
 		HealthChecker.bTerminate = true;
 
 		System.exit(0);
 
 	}
+
+	public static void suiteSetup(String runType) {
+		if (EsignetConfigManager.IsDebugEnabled())
+			LOGGER.setLevel(Level.ALL);
+		else
+			LOGGER.info("Test Framework for Mosip api Initialized");
+		BaseTestCase.initialize();
+		LOGGER.info("Done with BeforeSuite and test case setup! su TEST EXECUTION!\n\n");
+
+		if (!runType.equalsIgnoreCase("JAR")) {
+			AuthTestsUtil.removeOldMosipTempTestResource();
+		}
+		BaseTestCase.currentModule = GlobalConstants.ESIGNET;
+		BaseTestCase.certsForModule = GlobalConstants.ESIGNET;
+		DBManager.executeDBQueries(EsignetConfigManager.getKMDbUrl(), EsignetConfigManager.getKMDbUser(),
+				EsignetConfigManager.getKMDbPass(), EsignetConfigManager.getKMDbSchema(),
+				getGlobalResourcePath() + "/" + "config/keyManagerDataDeleteQueriesForEsignet.txt");
+		DBManager.executeDBQueries(EsignetConfigManager.getIdaDbUrl(), EsignetConfigManager.getIdaDbUser(),
+				EsignetConfigManager.getPMSDbPass(), EsignetConfigManager.getIdaDbSchema(),
+				getGlobalResourcePath() + "/" + "config/idaDeleteQueriesForEsignet.txt");
+		DBManager.executeDBQueries(EsignetConfigManager.getMASTERDbUrl(), EsignetConfigManager.getMasterDbUser(),
+				EsignetConfigManager.getMasterDbPass(), EsignetConfigManager.getMasterDbSchema(),
+				getGlobalResourcePath() + "/" + "config/masterDataDeleteQueriesForEsignet.txt");
+		BaseTestCase.setReportName(GlobalConstants.ESIGNET);
+		AdminTestUtil.initiateesignetTest();
+		BaseTestCase.otpListener = new OTPListener();
+		BaseTestCase.otpListener.run();
+	}
 
 	private static void setLogLevels() {
 		AdminTestUtil.setLogLevel();
@@ -155,7 +182,6 @@ public static void startTestRunner() {
 		File homeDir = null;
 		TestNG runner = new TestNG();
 		List<String> suitefiles = new ArrayList<>();
-		List<String> modulesToRun = BaseTestCase.listOfModules;
 		String os = System.getProperty("os.name");
 		LOGGER.info(os);
 		if (getRunType().contains("IDE") || os.toLowerCase().contains("windows")) {
@@ -167,12 +193,8 @@ public static void startTestRunner() {
 			LOGGER.info("ELSE :" + homeDir);
 		}
 		for (File file : homeDir.listFiles()) {
-			for (String fileName : modulesToRun) {
-				if (file.getName().toLowerCase().contains(fileName)) {
-					suitefiles.add(file.getAbsolutePath());
-				} else if (fileName.equals("all") && file.getName().toLowerCase().contains("testng")) {
-					suitefiles.add(file.getAbsolutePath());
-				}
+			if (file.getName().toLowerCase().contains(GlobalConstants.ESIGNET)) {
+				suitefiles.add(file.getAbsolutePath());
 			}
 		}
 		runner.setTestSuites(suitefiles);
@@ -181,25 +203,6 @@ public static void startTestRunner() {
 		runner.run();
 	}
 
-	/**
-	 * The method to return class loader resource path
-	 * 
-	 * @return String
-	 * @throws IOException
-	 */
-	/*
-	 * public static String getGlobalResourcePath() { if
-	 * (checkRunType().equalsIgnoreCase("JAR")) { return new
-	 * File(jarUrl).getParentFile().getAbsolutePath() +
-	 * "/MosipTestResource/MosipTemporaryTestResource"; } else if
-	 * (checkRunType().equalsIgnoreCase("IDE")) { String path = new
-	 * File(MosipTestRunner.class.getClassLoader().getResource("").getPath()).
-	 * getAbsolutePath() + "/MosipTestResource/MosipTemporaryTestResource"; if
-	 * (path.contains(GlobalConstants.TESTCLASSES)) path =
-	 * path.replace(GlobalConstants.TESTCLASSES, "classes"); return path; } return
-	 * "Global Resource File Path Not Found"; }
-	 */
-
 	public static String getGlobalResourcePath() {
 		if (cachedPath != null) {
 			return cachedPath;
@@ -225,15 +228,6 @@ public static String getGlobalResourcePath() {
 
 	public static String getResourcePath() {
 		return getGlobalResourcePath();
-//		if (checkRunType().equalsIgnoreCase("JAR")) {
-//			return new File(jarUrl).getParentFile().getAbsolutePath();
-//		} else if (checkRunType().equalsIgnoreCase("IDE")) {
-//			String path = new File(MosipTestRunner.class.getClassLoader().getResource("").getPath()).getAbsolutePath();
-//			if (path.contains(GlobalConstants.TESTCLASSES))
-//				path = path.replace(GlobalConstants.TESTCLASSES, "classes");
-//			return path;
-//		}
-//		return "Global Resource File Path Not Found";
 	}
 
 	public static String generatePulicKey() {
@@ -334,4 +328,4 @@ public static String getRunType() {
 			return "IDE";
 	}
 
-}
+}

deploy/.gitignore

@@ -0,0 +1 @@
+esignet-global-cm.yaml

deploy/README.md

@@ -24,9 +24,13 @@
       * __Logging__ : Setup logging as per [steps](https://github.com/mosip/k8s-infra/tree/v1.2.0.2/logging).
       * __Monitoring__ : Setup monitoring consisting elasticsearch, kibana, grafana using [steps](https://github.com/mosip/k8s-infra/tree/v1.2.0.2/monitoring).
 ### Install Pre-requisites
-```
-./install-prereq.sh
-```
+* `esignet-global` configmap: For eSignet K8's env, `esignet-global` configmap in `esignet` namespace contains Domain related information. Follow below steps to add domain details for `esignet-global` configmap.
+  * Copy `esignet-global-cm.yaml.sample` to `esignet-global-cm.yaml`.
+  * Update the domain names in `esignet-global-cm.yaml` correctly for your environment.
+* Install pre-requisites
+  ```
+  ./install-prereq.sh
+  ```
 ### Initialise pre-requisites
 * Update values file for postgres init [here](postgres/init_values.yaml).
 * Execute `initialise-prereq.sh` script to initialise postgres and keycloak and set esignet captcha.

deploy/captcha/install.sh

@@ -9,10 +9,25 @@ fi
 NS=captcha
 CHART_VERSION=0.1.0-develop
 
-echo Create $NS namespace
-kubectl create ns $NS
-
 function installing_captcha() {
+
+  while true; do
+      read -p "Do you want to continue installing captcha validation service? (y/n): " ans
+      if [ "$ans" = "Y" ] || [ "$ans" = "y" ]; then
+          break
+      elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
+          exit 1
+      else
+          echo "Please provide a correct option (Y or N)"
+      fi
+  done
+
+  NS=captcha
+  CHART_VERSION=0.1.0-develop
+
+  echo Create $NS namespace
+  kubectl create ns $NS || true
+
   echo Istio label
 
   kubectl label ns $NS istio-injection=disabled --overwrite

deploy/config-server/install.sh

@@ -6,17 +6,18 @@ if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
+# set commands for error handling.
+set -e
+set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
+set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
+set -o errtrace  # trace ERR through 'time command' and other functions
+set -o pipefail  # trace ERR through pipes
+
 NS=esignet
 CHART_VERSION=0.0.1-develop
 
     echo Create $NS namespace
-    kubectl create ns $NS
-    # set commands for error handling.
-    set -e
-    set -o errexit   ## set -e : exit the script if any statement returns a non-true return value
-    set -o nounset   ## set -u : exit the script if you try to use an uninitialised variable
-    set -o errtrace  # trace ERR through 'time command' and other functions
-    set -o pipefail  # trace ERR through pipes
+    kubectl create ns $NS || true
 
     echo Istio label
     kubectl label ns $NS istio-injection=enabled --overwrite

deploy/esignet-global-cm.yaml → deploy/esignet-global-cm.yaml.sample

@@ -10,6 +10,7 @@ metadata:
   namespace: esignet
 data:
   mosip-version: develop
+  imstallation-domain: sandbox.xyz.net
   mosip-api-host: api.sandbox.xyz.net
   mosip-iam-external-host: iam.sandbox.xyz.net
   mosip-api-internal-host: api-internal.sandbox.xyz.net

deploy/esignet/install.sh

@@ -6,16 +6,31 @@ if [ $# -ge 1 ] ; then
   export KUBECONFIG=$1
 fi
 
-NS=esignet
-CHART_VERSION=0.0.1-test
-
-ESIGNET_HOST=$(kubectl -n esignet get cm esignet-global -o jsonpath={.data.mosip-esignet-host})
-
 echo Create $NS namespace
 kubectl create ns $NS
 
 function installing_esignet() {
 
+  while true; do
+      read -p "Do you want to continue installing esignet services? (y/n): " ans
+      if [ "$ans" = "Y" ] || [ "$ans" = "y" ]; then
+          break
+      elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
+          exit 1
+      else
+          echo "Please provide a correct option (Y or N)"
+      fi
+  done
+
+
+  NS=esignet
+  CHART_VERSION=1.5.0-develop
+
+  ESIGNET_HOST=$(kubectl -n esignet get cm esignet-global -o jsonpath={.data.mosip-esignet-host})
+
+  echo Create $NS namespace
+  kubectl create ns $NS || true
+
   echo Istio label
   helm repo add mosip https://mosip.github.io/mosip-helm
   helm repo update

deploy/initialise-prereq.sh

@@ -42,16 +42,44 @@ function initialising_Prerequisites() {
       prompt_for_initialisation "$module" "${prompts[$module]}"
   done
 
-  ESIGNET_HOST=$(kubectl -n esignet get cm esignet-global -o jsonpath={.data.mosip-esignet-host})
-  echo Please enter the recaptcha admin site key for domain $ESIGNET_HOST
-  read ESITE_KEY
-  echo Please enter the recaptcha admin secret key for domain $ESIGNET_HOST
-  read ESECRET_KEY
+while true; do
+  read -p "Do you want to continue configuring Captcha secrets for esignet ? (y/n) : " ans
+    if [ $ans='Y' ] || [ $ans='y' ]; then
+      echo "Please create captcha site and secret key for esignet domain: esignet.sandbox.xyz.net"
 
-  echo Setting up captcha secrets
-  kubectl -n $NS create secret generic esignet-captcha --from-literal=esignet-captcha-site-key=$ESITE_KEY --from-literal=esignet-captcha-secret-key=$ESECRET_KEY --dry-run=client -o yaml | kubectl apply -f -
+      ESIGNET_HOST=$(kubectl -n esignet get cm esignet-global -o jsonpath={.data.mosip-esignet-host})
+      echo Please enter the recaptcha admin site key for domain $ESIGNET_HOST
+      read ESITE_KEY
+      echo Please enter the recaptcha admin secret key for domain $ESIGNET_HOST
+      read ESECRET_KEY
 
-  echo Setting up dummy values for esignet misp license key
+      echo "Setting up captcha secrets"
+      kubectl -n $NS create secret generic esignet-captcha --from-literal=esignet-captcha-site-key=$ESITE_KEY --from-literal=esignet-captcha-secret-key=$ESECRET_KEY --dry-run=client -o yaml | kubectl apply -f -
+      echo "Captcha secrets for esignet configured sucessfully"
+
+      ./copy_cm_func.sh secret esignet-captcha $NS captcha
+
+      # Check if the second environment variable exists
+      ENV_VAR_EXISTS=$(kubectl -n captcha get deployment captcha -o jsonpath="{.spec.template.spec.containers[0].env[?(@.name=='MOSIP_CAPTCHA_SECRET_ESIGNET')].name}")
+
+      if [[ -z "$ENV_VAR_EXISTS" ]]; then
+          # If the environment variable does not exist, add it
+          echo "Environment variable 'MOSIP_CAPTCHA_SECRET_ESIGNET' does not exist. Adding it..."
+          kubectl patch deployment -n captcha captcha --type='json' -p='[{"op": "add", "path": "/spec/template/spec/containers/0/env/-", "value": {"name": "MOSIP_CAPTCHA_SECRET_ESIGNET", "valueFrom": {"secretKeyRef": {"name": "esignet-captcha", "key": "esignet-captcha-secret-key"}}}}]'
+      else
+          # If the environment variable exists, update it
+          echo "Environment variable 'MOSIP_CAPTCHA_SECRET_ESIGNET' exists. Updating it..."
+          kubectl patch deployment -n captcha captcha --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/env[?(@.name==\"MOSIP_CAPTCHA_SECRET_ESIGNET\")]", "value": {"name": "MOSIP_CAPTCHA_SECRET_ESIGNET", "valueFrom": {"secretKeyRef": {"name": "esignet-captcha", "key": "esignet-captcha-secret-key"}}}}]'
+      fi
+
+    elif [ "$ans" = "N" ] || [ "$ans" = "n" ]; then
+      exit 1
+    else
+      echo "Please provide a correct option (Y or N)"
+    fi
+done
+
+  echo "Setting up dummy values for esignet misp license key"
   kubectl -n $NS create secret generic esignet-misp-onboarder-key --from-literal=mosip-esignet-misp-key='' --dry-run=client -o yaml | kubectl apply -f -
 
   echo "All prerequisite services initialised successfully."

deploy/install-prereq.sh

@@ -8,8 +8,6 @@ if [ $# -ge 1 ]; then
 fi
 
 ROOT_DIR=$(pwd)
-SOFTHSM_NS=softhsm
-SOFTHSM_CHART_VERSION=12.0.1
 
 function prompt_for_deployment() {
   local module_name=$1
@@ -30,36 +28,25 @@ function prompt_for_deployment() {
 
 function installing_prerequisites() {
 
-  helm repo add mosip https://mosip.github.io/mosip-helm
-  helm repo update
-
-  # Create esignet, softhsm namespace if not present
-  kubectl create ns esignet || true
-  kubectl create ns "$SOFTHSM_NS" || true
-
   # Apply esignet-global config-map
-  kubectl apply -f esignet-global-cm.yaml
-
-  echo "Istio label"
-  kubectl label ns "$SOFTHSM_NS" istio-injection=enabled --overwrite
-
-  # Deploy Softhsm for Esignet.
-  echo "Installing Softhsm for esignet"
-  helm -n "$SOFTHSM_NS" install esignet-softhsm mosip/softhsm -f softhsm-values.yaml --version "$SOFTHSM_CHART_VERSION" --wait
-  echo "Installed Softhsm for esignet"
+  echo "Creating esignet-global configmap in esignet namespace"
+  kubectl -n esignet apply -f esignet-global-cm.yaml
 
-  declare -a modules=("istio-gateway" "postgres" "keycloak" "kafka" "redis")
+  declare -a modules=("istio-gateway" "postgres" "keycloak" "kafka" "redis" "softhsm")
   declare -A prompts=(
-    ["keycloak"]="Do you want to deploy keycloak in the keycloak namespace?"
-    ["kafka"]="Do you want to deploy Kafka in the kafka namespace?"
+    ["softhsm"]="Do you want to install softhsm for esignet service in softhsm namespace? Opt "n" in case it already exists in Softhsm namespace: "
+    ["keycloak"]="Do you want to deploy keycloak in the keycloak namespace? Opt "n" in case it already exists in keycloak namespace : "
+    ["kafka"]="Do you want to deploy Kafka in the kafka namespace? Opt "n" in case it already exists in kafka namespace : "
   )
 
   echo "Installing prerequisite services"
 
   for module in "${modules[@]}"; do
-    if [ "$module" == "istio-gateway" ] || [ "$module" == "redis" ] || [ "$module" == "postgres" ]; then
+    if [ "$module" == "istio-gateway" ] || [ "$module" == "postgres" ] || [ "$module" == "redis" ]; then
       cd "$ROOT_DIR/$module"
       ./install.sh
+    elif  [[ -n "${prompts[$module]}" ]]; then
+      prompt_for_deployment "$module" "${prompts[$module]}"
     fi
   done
   echo "All prerequisite services deployed successfully."

deploy/keycloak/keycloak-init-values.yaml

@@ -14,8 +14,6 @@ keycloak:
         "actionTokenGeneratedByUserLifespan": 300
         "passwordPolicy": "length(8)"
         "resetPasswordAllowed": 'True'
-        "registrationAllowed": 'True'
-        "verifyEmail": 'True'
         "bruteForceProtected": 'True'
         "permanentLockout": 'False'
         "maxFailureWaitSeconds": 900