Feature/dev tomaster

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,30 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.  
+
+# Type of change  
+
+- [ ] Bug fix  
+- [ ] New feature  
+- [ ] Enhancement  
+- [ ] Refactoring  
+- [ ] Documentation  
+- [ ] Other ( please specify )  
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+

.github/workflows/build-on-pull-request.yml

@@ -1,22 +1,33 @@
-name: Build On Pull Request
+name: Build and Static Code Analysis On Pull Request
 on:
   pull_request:
-    branches: [ "master","develop" ]
-
+    branches: [ "develop" ]
 jobs:
-  Build:
+  Build_and_analyse:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: 8
-          distribution: 'adopt'
-      - name: Build with Maven  
-        run: mvn clean install
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Test with Maven
+      run: mvn test
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: Java        
+
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/package-prod.yml

@@ -0,0 +1,41 @@
+name: Package-prod
+
+on:
+  push:
+    branches: [ "master"]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+     branches: [ "master" ]
+     paths-ignore:
+     - target/**
+
+env:
+  ENV_VAR: prod
+
+jobs:
+  Package-prod:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Create WAR file 
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

.github/workflows/package.yml

@@ -0,0 +1,50 @@
+
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+    steps:
+
+    - name: Checkout code 
+      uses: actions/checkout@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: Identity-API
+        path: target/identity-0.0.1.war  

.github/workflows/sast-and-package.yml

@@ -1,10 +1,21 @@
-name: Static Code Analysis and Packaging
+name: Package
+
 on:
   push:
-    branches: [ "master","develop" ]
-
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+
+env:
+  ENV_VAR: test
+
 jobs:
-  CodeQL:
+  Package-test:
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -14,37 +25,23 @@ jobs:
     strategy:
       fail-fast: false
     steps:
+
     - name: Checkout code 
       uses: actions/checkout@v2
+
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: Java    
+
+
     - name: Build with Maven
-      run: mvn clean install
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        languages: Java   
-
-  Packaging:
-    needs: codeql
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-    - name: Setup JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: 8
-        distribution: 'adopt'
-    - name: Create WAR file 
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Build WAR file
       run: mvn -B package --file pom.xml
+
     - name: Upload WAR file as artifact
       uses: actions/upload-artifact@v2 
       with:

.github/workflows/sast.yml

@@ -0,0 +1,52 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+          java-version: 8
+          distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.gitignore

@@ -29,3 +29,7 @@ nbdist/
 mvnw
 mvnw.cmd
 .mvn
+
+# Properties
+src/main/environment/1097_local.properties
+src/main/environment/common_local.properties

README.md

@@ -1,5 +1,5 @@
 # AMRIT - Identity Service 
-[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) 
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)  ![branch parameter](https://github.com/PSMRI/Identity-API/actions/workflows/sast-and-package.yml/badge.svg)
 
 Identity API is a microservice which is used for the creation and management of beneficaries.
 

pom.xml

@@ -27,10 +27,11 @@
 		<m2e.apt.activation>jdt_apt</m2e.apt.activation>
 		<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
 		<org.projectlombok.version>1.16.18</org.projectlombok.version>
-		<environment>dev</environment>
+		<environment>${ENV_VAR}</environment>
 		<target-properties>target/classes/application.properties</target-properties>
 		<source-properties>src/main/environment/common_${environment}.properties</source-properties>
 		<maven.test.skip>true</maven.test.skip>
+		<sonar.java.binaries>target</sonar.java.binaries>
 	</properties>
 	<dependencies>
 		<dependency>

src/main/environment/1097_dev.properties

@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 

src/main/environment/1097_local.properties

@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://localhost:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/1097_test.properties

@@ -1,8 +1,8 @@
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://10.208.122.38:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 

src/main/environment/1097_uat.properties

@@ -1,7 +1,7 @@
 
 # DataSource settings: set here your own configurations for the database
 
-spring.datasource.url=jdbc:mysql://172.16.19.43:3306/db_1097_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_dev.properties

@@ -1,7 +1,7 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
-encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 

src/main/environment/common_local.properties

@@ -1,5 +1,5 @@
 # DataSource settings: set here your own configurations for the database
-spring.datasource.url=jdbc:mysql://localhost:3306/db_identity?autoReconnect=true&useSSL=false
-encDbUserName=DSekNOtG9a+qythoUDNKuw==
-encDbPass=DSekNOtG9a+qythoUDNKuw==
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver