From 9f00fcf5d561fc2e57a542044e2c2078c25e9a28 Mon Sep 17 00:00:00 2001 From: JanardhanBS-SyncByte Date: Mon, 25 Nov 2024 19:04:32 +0530 Subject: [PATCH] [MOSIP-37358]Update readme Signed-off-by: JanardhanBS-SyncByte --- .github/workflows/clear-artifacts.yml | 2 +- .github/workflows/release-changes.yml | 2 +- .github/workflows/tag.yml | 2 +- deploy/install.sh | 4 ++-- helm/converters/Chart.yaml | 2 +- helm/converters/values.yaml | 2 +- kernel-bio-converter/Dockerfile | 13 ------------- kernel-bio-converter/pom.xml | 2 +- .../bio/converter/controller/ConvertController.java | 2 +- .../bio/converter/ConverterServiceImplTest.java | 7 +++++++ 10 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/clear-artifacts.yml b/.github/workflows/clear-artifacts.yml index 1c54a3c..c78316f 100644 --- a/.github/workflows/clear-artifacts.yml +++ b/.github/workflows/clear-artifacts.yml @@ -14,4 +14,4 @@ jobs: uses: mosip/kattu/.github/workflows/clear-artifacts.yml@master secrets: ACCESS_TOKEN: ${{ secrets.access_token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/release-changes.yml b/.github/workflows/release-changes.yml index 9092c81..d4eec49 100644 --- a/.github/workflows/release-changes.yml +++ b/.github/workflows/release-changes.yml @@ -26,4 +26,4 @@ jobs: BASE: ${{ inputs.BASE }} secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - ACTION_PAT: ${{ secrets.ACTION_PAT }} \ No newline at end of file + ACTION_PAT: ${{ secrets.ACTION_PAT }} diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index c43d755..32e5db3 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -32,4 +32,4 @@ jobs: PRE_RELEASE: ${{ inputs.PRE_RELEASE }} DRAFT: ${{ inputs.DRAFT }} secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} \ No newline at end of file + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/deploy/install.sh b/deploy/install.sh index 3ba31d4..ccf2c6b 100644 --- a/deploy/install.sh +++ b/deploy/install.sh @@ -7,7 +7,7 @@ if [ $# -ge 1 ] ; then fi NS=converters -CHART_VERSION=0.0.1-develop +CHART_VERSION=1.3.0-beta.1-develop echo Create $NS namespace kubectl create ns $NS @@ -36,4 +36,4 @@ set -o errexit ## set -e : exit the script if any statement returns a non-true 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 -installing_converters # calling function \ No newline at end of file +installing_converters # calling function diff --git a/helm/converters/Chart.yaml b/helm/converters/Chart.yaml index 3bf7710..2136856 100644 --- a/helm/converters/Chart.yaml +++ b/helm/converters/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: converters description: A Helm chart for MOSIP converters module type: application -version: 0.0.1-develop +version: 1.3.0-beta.1-develop appVersion: "" dependencies: - name: common diff --git a/helm/converters/values.yaml b/helm/converters/values.yaml index 0fdef94..9416a04 100644 --- a/helm/converters/values.yaml +++ b/helm/converters/values.yaml @@ -53,7 +53,7 @@ service: image: registry: docker.io repository: mosipqa/kernel-bio-converter - tag: develop + tag: release-1.3.x ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/kernel-bio-converter/Dockerfile b/kernel-bio-converter/Dockerfile index b9ee7e4..3412665 100644 --- a/kernel-bio-converter/Dockerfile +++ b/kernel-bio-converter/Dockerfile @@ -1,5 +1,4 @@ FROM mosipid/openjdk-21-jre:21.0.4 - # label to be assigned along with Docker build [Mandatory] ARG SOURCE ARG COMMIT_HASH @@ -57,28 +56,18 @@ ARG container_user_gid=1001 # set working directory for the user WORKDIR /home/${container_user} - ENV work_dir=/home/${container_user} - ARG loader_path=${work_dir}/additional_jars/ - ENV loader_path_env=${loader_path} - ARG logging_level_root=INFO - ENV logging_level_root_env=${logging_level_root} # set working directory for the user WORKDIR /home/${container_user} - ENV work_dir=/home/${container_user} - ARG loader_path=${work_dir}/additional_jars/ - ENV loader_path_env=${loader_path} - ARG logging_level_root=INFO - ENV logging_level_root_env=${logging_level_root} # install packages and create user @@ -87,9 +76,7 @@ RUN apt-get update && \ groupadd -g ${container_user_gid} ${container_user_group} && \ useradd -u ${container_user_uid} -g ${container_user_group} -s /bin/bash -m ${container_user} && \ mkdir -p /home/${container_user} ${loader_path} - ENV loader_path_env=${loader_path} - COPY ./target/kernel-bio-converter-*.jar kernel-bio-converter.jar # change permissions of file inside working dir diff --git a/kernel-bio-converter/pom.xml b/kernel-bio-converter/pom.xml index 0946832..81a6a64 100644 --- a/kernel-bio-converter/pom.xml +++ b/kernel-bio-converter/pom.xml @@ -434,4 +434,4 @@ - \ No newline at end of file + diff --git a/kernel-bio-converter/src/main/java/io/mosip/kernel/bio/converter/controller/ConvertController.java b/kernel-bio-converter/src/main/java/io/mosip/kernel/bio/converter/controller/ConvertController.java index d35c5f3..3cfb7ca 100644 --- a/kernel-bio-converter/src/main/java/io/mosip/kernel/bio/converter/controller/ConvertController.java +++ b/kernel-bio-converter/src/main/java/io/mosip/kernel/bio/converter/controller/ConvertController.java @@ -76,4 +76,4 @@ public ResponseWrapper> convert( return responseDto; } -} \ No newline at end of file +} diff --git a/kernel-bio-converter/src/test/java/io/mosip/kernel/bio/converter/ConverterServiceImplTest.java b/kernel-bio-converter/src/test/java/io/mosip/kernel/bio/converter/ConverterServiceImplTest.java index 7b807d3..727ccbf 100644 --- a/kernel-bio-converter/src/test/java/io/mosip/kernel/bio/converter/ConverterServiceImplTest.java +++ b/kernel-bio-converter/src/test/java/io/mosip/kernel/bio/converter/ConverterServiceImplTest.java @@ -4,14 +4,21 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; import java.awt.image.BufferedImage; +import java.io.ByteArrayInputStream; import java.io.FileInputStream; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import javax.imageio.ImageIO; + import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;