Merge pull request #1615 from mohanachandran-s/develop-java21

MOSIP-35886 - Modified the injection of Auth Demo Service utils
mosip · Sep 24, 2024 · 13845be · 13845be
2 parents d1b37d0 + 07ec5f8
commit 13845be
Show file tree

Hide file tree

Showing 65 changed files with 4,893 additions and 585 deletions.
diff --git a/.github/workflows/apitest-push-trigger.yml b/.github/workflows/apitest-push-trigger.yml
@@ -56,6 +56,33 @@ jobs:
     uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: ./apitest-commons
+    secrets:
+      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      ORG_KEY: ${{ secrets.ORG_KEY }}
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
+      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+      GPG_SECRET: ${{ secrets.GPG_SECRET }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+  build-maven-authentication-demo-service:
+    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
+    with:
+      SERVICE_LOCATION: ./authentication-demo-service
+      BUILD_ARTIFACT: authentication-demo-service
+    secrets:
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
+      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+      GPG_SECRET: ${{ secrets.GPG_SECRET }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+
+  sonar_analysis-authentication-demo-service:
+    needs: build-maven-authentication-demo-service
+    if: "${{  github.event_name != 'pull_request' }}"
+    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
+    with:
+      SERVICE_LOCATION: ./authentication-demo-service
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       ORG_KEY: ${{ secrets.ORG_KEY }}

diff --git a/.github/workflows/chart-lint-publish.yml b/.github/workflows/chart-lint-publish.yml
@@ -0,0 +1,62 @@
+name: Validate / Publish helm charts
+
+on:
+  release:
+    types: [published]
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths:
+      - 'helm/**'
+  workflow_dispatch:
+    inputs:
+      IGNORE_CHARTS:
+        description: 'Provide list of charts to be ignored separated by pipe(|)'
+        required: false
+        default: '""'
+        type: string
+      CHART_PUBLISH:
+        description: 'Chart publishing to gh-pages branch'
+        required: false
+        default: 'NO'
+        type: string
+        options:
+          - YES
+          - NO
+      INCLUDE_ALL_CHARTS:
+        description: 'Include all charts for Linting/Publishing (YES/NO)'
+        required: false
+        default: 'NO'
+        type: string
+        options:
+          - YES
+          - NO
+  push:
+    branches:
+      - '!release-branch'
+      - '!master'
+      - 1.*
+      - 0.*
+      - develop
+      - release*
+    paths:
+      - 'helm/**'
+
+jobs:
+  chart-lint-publish:
+    uses: mosip/kattu/.github/workflows/chart-lint-publish.yml@master
+    with:
+      CHARTS_DIR: ./helm
+      CHARTS_URL: https://mosip.github.io/mosip-helm
+      REPOSITORY: mosip-helm
+      BRANCH: gh-pages
+      INCLUDE_ALL_CHARTS: "${{ inputs.INCLUDE_ALL_CHARTS || 'NO' }}"
+      IGNORE_CHARTS: "${{ inputs.IGNORE_CHARTS || '\"\"' }}"
+      CHART_PUBLISH: "${{ inputs.CHART_PUBLISH || 'YES' }}"
+      LINTING_CHART_SCHEMA_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/chart-schema.yaml"
+      LINTING_LINTCONF_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/lintconf.yaml"
+      LINTING_CHART_TESTING_CONFIG_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/chart-testing-config.yaml"
+      LINTING_HEALTH_CHECK_SCHEMA_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/health-check-schema.yaml"
+      DEPENDENCIES: "mosip,https://mosip.github.io/mosip-helm;"
+    secrets:
+      TOKEN: ${{ secrets.ACTION_PAT }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml
@@ -36,7 +36,7 @@
 	<properties>
 		<!-- kernel versions -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<kernel-websubclient-api.version>1.2.1-java21-SNAPSHOT</kernel-websubclient-api.version>
+		<kernel-websubclient-api.version>1.2.1-SNAPSHOT</kernel-websubclient-api.version>
 
 		<!-- maven -->
 		<maven.compiler.target>21</maven.compiler.target>
@@ -55,18 +55,19 @@
 		<aws.javasdk.version>1.11.368</aws.javasdk.version>
 
 		<!-- Hibernate version -->
-		<hibernate.version>6.5.2.Final</hibernate.version>
+		<hibernate.version>5.2.17.Final</hibernate.version>
 
 		<!-- automationtests version -->
 		<wink-json4j-provider.version>1.1.2-incubating</wink-json4j-provider.version>
-		<kernel.version>1.2.1-java21-SNAPSHOT</kernel.version>
+		<kernel.version>1.2.1-SNAPSHOT</kernel.version>
 		<zjsonpatch.version>0.4.7</zjsonpatch.version>
 		<extentreports.aventstack.version>3.0.0</extentreports.aventstack.version>
 		<extentreports.relevantcodes.version>2.41.2</extentreports.relevantcodes.version>
 		<maven.model.version>3.3.9</maven.model.version>
 		<testng.version>6.11</testng.version>
 		<zt.zip.version>1.13</zt.zip.version>
 		<fileName>apitest-commons-1.2.1-java21-SNAPSHOT-jar-with-dependencies</fileName>
+
 	</properties>
 
 	<dependencies>
@@ -334,29 +335,6 @@
 			<artifactId>javax.mail-api</artifactId>
 			<version>1.6.2</version>
 		</dependency>
-
-		<!-- Encryption Decryption Util Jar -->
-
-		<dependency>
-			<groupId>io.mosip.kernel</groupId>
-			<artifactId>kernel-registration-packet-manager</artifactId>
-			<version>1.1.5.3</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework</groupId>
-					<artifactId>spring-expression</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcprov-jdk15on</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.mosip.kernel</groupId>
-			<artifactId>kernel-crypto-jce</artifactId>
-			<version>1.1.5.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.wink</groupId>
 			<artifactId>wink-json4j-provider</artifactId>
@@ -399,7 +377,7 @@
 		<dependency>
 			<groupId>io.mosip.mock.mds</groupId>
 			<artifactId>mock-mds</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -449,13 +427,13 @@
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-templatemanager-velocity</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-keymanager-service</artifactId>
-			<version>1.2.1-java21-SNAPSHOT</version>
+			<version>1.2.1-SNAPSHOT</version>
 			<classifier>lib</classifier>
 			<exclusions>
 				<exclusion>
@@ -470,6 +448,10 @@
 					<groupId>org.bouncycastle</groupId>
 					<artifactId>bcpkix-jdk15on</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate.orm</groupId>
+					<artifactId>hibernate-core</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
@@ -490,7 +472,7 @@
 			<dependency>
 				<groupId>io.mosip.kernel</groupId>
 				<artifactId>kernel-bom</artifactId>
-				<version>1.2.1-java21-SNAPSHOT</version>
+				<version>1.2.1-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/admin/fw/config/BeanConfig.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/admin/fw/config/BeanConfig.java
@@ -1,14 +1,29 @@
 package io.mosip.testrig.apirig.admin.fw.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import io.mosip.kernel.crypto.jce.core.CryptoCore;
+import io.mosip.testrig.apirig.utils.BioDataUtility;
+import io.mosip.testrig.apirig.utils.CryptoCore;
+import io.mosip.testrig.apirig.utils.EncryptionDecrptionUtil;
+
 
 @Configuration
-@Import({ CryptoCore.class })
+@Import({CryptoCore.class})
 @ComponentScan(basePackages = { "io.mosip.testrig.apirig", "io.mosip.testrig.dslrig"})
 public class BeanConfig {
 	int i = 0;
+
+	@Bean
+	public BioDataUtility bioDataUtility() {
+		return new BioDataUtility();
+	}
+
+	@Bean
+	public EncryptionDecrptionUtil encryptionDecrptionUtil() {
+		return new EncryptionDecrptionUtil();
+	}
+
 }
diff --git a/...est-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java b/...est-commons/src/main/java/io/mosip/testrig/apirig/dataprovider/BiometricDataProvider.java
@@ -64,7 +64,6 @@
 public class BiometricDataProvider {
 
 	public static HashMap<String, Integer> portmap = new HashMap();
-	//private static final Logger logger = LoggerFactory.getLogger(BiometricDataProvider.class);
 	private static final Logger logger = Logger.getLogger(BiometricDataProvider.class);
 
 	// String constants

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dbaccess/AuditDBManager.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dbaccess/AuditDBManager.java
@@ -146,7 +146,6 @@ private static SessionFactory getDataBaseConnectionSessionFactory(String dbName)
 			config.setProperty("hibernate.show_sql", propsKernel.getProperty("show_sql"));
 			config.setProperty("hibernate.current_session_context_class",
 					propsKernel.getProperty("current_session_context_class"));
-			config.addFile(new File(MosipTestRunner.getGlobalResourcePath() + "/dbFiles/dbConfig.xml"));
 			factory = config.buildSessionFactory();		
 		} catch (HibernateException e) {
 			DBCONNECTION_LOGGER.error("Exception in Database Connection with following message: " + e.getMessage());

diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/dto/TestCaseDTO.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/dto/TestCaseDTO.java
@@ -20,4 +20,5 @@ public class TestCaseDTO {
 	private String allowedErrorCodes;
 	private String[] kycFields;
 	private String description;
+	private String uniqueIdentifier;
 }