Skip to content

Commit fc53d1f

Browse files
ravishanigarapumahimaegswetatech24Vidyaaa24Anjana2310
authored
Feature/dev tomaster (PSMRI#36)
* Readme file added (#1) * Create README.md Added new readme.md file * Update README.md * Removed unnecessary dependencies from pom.xml (#2) * Removed unnecessary dependencies from pom.xml, added crypto.utils to resolve build issues * pom.xml cleanup * updated code-of-conduct, copying, contributing, readme (#3) * Create CONTRIBUTING.md * Create CODE_OF_CONDUCT.md * Create COPYING * Update README.md * modified .gitignore file (#4) * modified .gitignore file * Delete target directory * Update .gitignore * Delete logs directory * code smell fixes (#6) * Added copyright text (#7) Co-authored-by: Anjana K J <[email protected]> * code smell fix (PSMRI#8) * code smell fix * code smell fixes * Sonarqube reported code smell fix * done correction for application.properties * Swagger changes (PSMRI#9) * Swagger changes * Swagger changes * Code smell fix (PSMRI#10) * code smell fixes (PSMRI#11) * Create sast-and-package-prod.yml (PSMRI#12) * Create sast-and-package-prod.yml * Update sast-and-package-prod.yml * Code smell changes (PSMRI#13) * Update README.md * code smell fixes * Added environment variable * Added password changes & edit environment variable (PSMRI#16) * Added environment variable * Added password changes * Passing environment variable * Passing environment variable (PSMRI#17) * Passing environment variable * Passing environment variable (PSMRI#19) * Passing environment variable (PSMRI#20) * Passing environment variable * Passing environment variable * Workflow change (PSMRI#21) * Update sast-and-package-prod.yml * Update sast-and-package.yml * CreatedDate filed for Identity (PSMRI#22) * CreatedDate filed for Identity * removed uncommented code * Send SMS null Id issue (PSMRI#23) * CreatedDate filed for Identity * removed uncommented code * deleting DB config * Send SMS Null ID Issue * mmu cr changes * update changes * changes mmu cr * Update sast-and-package-prod.yml (PSMRI#26) * edit api changes * Identity API cleanup and password masking * Updated the language option for codeql and added maven test * Added CodeQl tool to do static code analysis on pull request * Implementing Basic reverse sync operation * Fix issue on controller * Updated the language option for codeql and added maven test * Added CodeQl tool to do static code analysis on pull request * Implementing Basic reverse sync operation * Fix issue on controller * Identity API cleanup and password masking * edit api changes * change made in description of identity controller (PSMRI#30) * Multiple beneficiaries sync issue changes for FLW (PSMRI#31) Co-authored-by: Devika <[email protected]> * Delete .github/workflows/sast-and-package-prod.yml * Delete .github/workflows/sast-and-package.yml * Create package-prod.yml * Create package.yml * Create sast.yml * Use a logger to log this exception (PSMRI#32) * Added Pull Request template, added placeholders in properties file, and added admin_local to git ignore (PSMRI#33) --------- Co-authored-by: Mahima Elizabeth George <[email protected]> Co-authored-by: Sweta Prakash <[email protected]> Co-authored-by: Vidyadevi Salunkhe <[email protected]> Co-authored-by: Anjana2310 <[email protected]> Co-authored-by: Anjana K J <[email protected]> Co-authored-by: Harimohan Rajamohanan <[email protected]> Co-authored-by: swetatech24 <[email protected]> Co-authored-by: Anjana <[email protected]> Co-authored-by: mukul5947 <[email protected]> Co-authored-by: Indrani Bandyopadhyay <[email protected]> Co-authored-by: devikasuresh20 <[email protected]> Co-authored-by: indraniBan <[email protected]> Co-authored-by: Sunil GV <[email protected]> Co-authored-by: roopesh-beehyv <[email protected]> Co-authored-by: helenKaryamsetty <[email protected]> Co-authored-by: Babacar Ndiaye <[email protected]> Co-authored-by: Devika <[email protected]>
1 parent 817f37c commit fc53d1f

File tree

160 files changed

+3713
-2005
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+3713
-2005
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Description
2+
3+
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.
4+
5+
# Type of change
6+
7+
- [ ] Bug fix
8+
- [ ] New feature
9+
- [ ] Enhancement
10+
- [ ] Refactoring
11+
- [ ] Documentation
12+
- [ ] Other ( please specify )
13+
14+
# How Has This Been Tested?
15+
16+
Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
17+
18+
- [ ] Test A
19+
- [ ] Test B
20+
21+
# Checklist:
22+
23+
- [ ] My code follows the style guidelines of this project
24+
- [ ] I have performed a self-review of my own code
25+
- [ ] I have commented my code, particularly in hard-to-understand areas
26+
- [ ] I have made corresponding changes to the documentation
27+
- [ ] My changes generate no new warnings
28+
- [ ] Any dependent changes have been merged and published in downstream modules
29+
30+

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

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,33 @@
1-
name: Build On Pull Request
1+
name: Build and Static Code Analysis On Pull Request
22
on:
33
pull_request:
4-
branches: [ "master","develop" ]
5-
4+
branches: [ "develop" ]
65
jobs:
7-
Build:
6+
Build_and_analyse:
87
runs-on: ubuntu-latest
98
steps:
10-
- name: Checkout code
11-
uses: actions/checkout@v3
12-
with:
13-
ref: ${{ github.event.pull_request.head.ref }}
14-
repository: ${{ github.event.pull_request.head.repo.full_name }}
9+
- name: Checkout code
10+
uses: actions/checkout@v3
11+
with:
12+
ref: ${{ github.event.pull_request.head.ref }}
13+
repository: ${{ github.event.pull_request.head.repo.full_name }}
1514

16-
- name: Setup JDK 8
17-
uses: actions/setup-java@v2
18-
with:
19-
java-version: 8
20-
distribution: 'adopt'
21-
- name: Build with Maven
22-
run: mvn clean install
15+
- name: Setup JDK 8
16+
uses: actions/setup-java@v2
17+
with:
18+
java-version: 8
19+
distribution: 'adopt'
20+
21+
- name: Test with Maven
22+
run: mvn test
23+
24+
- name: Initialize CodeQL
25+
uses: github/codeql-action/init@v2
26+
with:
27+
languages: Java
28+
29+
- name: Build with Maven
30+
run: mvn clean install
31+
32+
- name: Perform CodeQL Analysis
33+
uses: github/codeql-action/analyze@v2

‎.github/workflows/package-prod.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Package-prod
2+
3+
on:
4+
push:
5+
branches: [ "master"]
6+
paths-ignore:
7+
- target/**
8+
9+
pull_request:
10+
branches: [ "master" ]
11+
paths-ignore:
12+
- target/**
13+
14+
env:
15+
ENV_VAR: prod
16+
17+
jobs:
18+
Package-prod:
19+
runs-on: ubuntu-latest
20+
steps:
21+
22+
- name: Checkout code
23+
uses: actions/checkout@v3
24+
25+
- name: Setup JDK 8
26+
uses: actions/setup-java@v2
27+
with:
28+
java-version: 8
29+
distribution: 'adopt'
30+
31+
- name: Build with Maven
32+
run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
33+
34+
- name: Create WAR file
35+
run: mvn -B package --file pom.xml
36+
37+
- name: Upload WAR file as artifact
38+
uses: actions/upload-artifact@v2
39+
with:
40+
name: Identity-API
41+
path: target/identity-0.0.1.war

‎.github/workflows/package.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
2+
name: Package
3+
4+
on:
5+
push:
6+
branches: [ "develop"]
7+
paths-ignore:
8+
- target/**
9+
10+
pull_request:
11+
branches: [ "develop" ]
12+
paths-ignore:
13+
- target/**
14+
15+
env:
16+
ENV_VAR: test
17+
18+
jobs:
19+
Package-test:
20+
runs-on: ubuntu-latest
21+
permissions:
22+
actions: read
23+
contents: read
24+
security-events: write
25+
26+
strategy:
27+
fail-fast: false
28+
steps:
29+
30+
- name: Checkout code
31+
uses: actions/checkout@v2
32+
33+
- name: Setup JDK 8
34+
uses: actions/setup-java@v2
35+
with:
36+
java-version: 8
37+
distribution: 'adopt'
38+
39+
40+
- name: Build with Maven
41+
run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
42+
43+
- name: Build WAR file
44+
run: mvn -B package --file pom.xml
45+
46+
- name: Upload WAR file as artifact
47+
uses: actions/upload-artifact@v2
48+
with:
49+
name: Identity-API
50+
path: target/identity-0.0.1.war

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

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1-
name: Static Code Analysis and Packaging
1+
name: Package
2+
23
on:
34
push:
4-
branches: [ "master","develop" ]
5-
5+
branches: [ "develop"]
6+
paths-ignore:
7+
- target/**
8+
9+
pull_request:
10+
branches: [ "develop" ]
11+
paths-ignore:
12+
- target/**
13+
14+
env:
15+
ENV_VAR: test
16+
617
jobs:
7-
CodeQL:
18+
Package-test:
819
runs-on: ubuntu-latest
920
permissions:
1021
actions: read
@@ -14,37 +25,23 @@ jobs:
1425
strategy:
1526
fail-fast: false
1627
steps:
28+
1729
- name: Checkout code
1830
uses: actions/checkout@v2
31+
1932
- name: Setup JDK 8
2033
uses: actions/setup-java@v2
2134
with:
2235
java-version: 8
2336
distribution: 'adopt'
24-
- name: Initialize CodeQL
25-
uses: github/codeql-action/init@v2
26-
with:
27-
languages: Java
37+
38+
2839
- name: Build with Maven
29-
run: mvn clean install
30-
- name: Perform CodeQL Analysis
31-
uses: github/codeql-action/analyze@v2
32-
with:
33-
languages: Java
34-
35-
Packaging:
36-
needs: codeql
37-
runs-on: ubuntu-latest
38-
steps:
39-
- name: Checkout code
40-
uses: actions/checkout@v3
41-
- name: Setup JDK 8
42-
uses: actions/setup-java@v2
43-
with:
44-
java-version: 8
45-
distribution: 'adopt'
46-
- name: Create WAR file
40+
run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
41+
42+
- name: Build WAR file
4743
run: mvn -B package --file pom.xml
44+
4845
- name: Upload WAR file as artifact
4946
uses: actions/upload-artifact@v2
5047
with:

‎.github/workflows/sast.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: CodeQL
2+
3+
on:
4+
push:
5+
branches: [ "develop" ]
6+
paths-ignore:
7+
- target/**
8+
9+
pull_request:
10+
branches: [ "develop" ]
11+
paths-ignore:
12+
- target/**
13+
14+
jobs:
15+
analyze:
16+
name: Analyze
17+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
18+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
19+
permissions:
20+
actions: read
21+
contents: read
22+
security-events: write
23+
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
language: [ 'java' ]
28+
29+
steps:
30+
- name: Checkout code
31+
uses: actions/checkout@v3
32+
with:
33+
ref: ${{ github.event.pull_request.head.ref }}
34+
repository: ${{ github.event.pull_request.head.repo.full_name }}
35+
36+
# Initializes the CodeQL tools for scanning.
37+
- name: Initialize CodeQL
38+
uses: github/codeql-action/init@v2
39+
40+
- name: Setup JDK 8
41+
uses: actions/setup-java@v2
42+
with:
43+
java-version: 8
44+
distribution: 'adopt'
45+
46+
- name: Build with Maven
47+
run: mvn clean install
48+
49+
- name: Perform CodeQL Analysis
50+
uses: github/codeql-action/analyze@v2
51+
with:
52+
category: "/language:${{matrix.language}}"

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ nbdist/
2929
mvnw
3030
mvnw.cmd
3131
.mvn
32+
33+
# Properties
34+
src/main/environment/1097_local.properties
35+
src/main/environment/common_local.properties

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AMRIT - Identity Service
2-
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
2+
[![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)
33

44
Identity API is a microservice which is used for the creation and management of beneficaries.
55

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
2828
<org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
2929
<org.projectlombok.version>1.16.18</org.projectlombok.version>
30-
<environment>dev</environment>
30+
<environment>${ENV_VAR}</environment>
3131
<target-properties>target/classes/application.properties</target-properties>
3232
<source-properties>src/main/environment/common_${environment}.properties</source-properties>
3333
<maven.test.skip>true</maven.test.skip>
34+
<sonar.java.binaries>target</sonar.java.binaries>
3435
</properties>
3536
<dependencies>
3637
<dependency>

‎src/main/environment/1097_dev.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# DataSource settings: set here your own configurations for the database
22

3-
spring.datasource.url=jdbc:mysql://10.208.122.32:3306/db_1097_identity?autoReconnect=true&useSSL=false
4-
encDbUserName=0YaEPoKpzM3TrEAHTLYQaf+DfR4mdaeP
5-
encDbPass=V+g/nL6/+ely0bgD7Du0yX83xNRl1H9Y
3+
spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
4+
spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
5+
spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
66
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
77

88

0 commit comments

Comments
 (0)