Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
36ecf5c
Updated apikey code
asif-rashid Mar 1, 2023
5e3c7d5
Update API documentation
asif-rashid Mar 6, 2023
b1dd024
Update API documentation
asif-rashid Mar 20, 2023
c6a9d8d
Update manifest to remove unnecessary route
asif-rashid Mar 20, 2023
e64b39c
Add staging environment to OpenAPI
asif-rashid Mar 20, 2023
b53b1cd
adding examples to springdocs api
shamilto-epa Mar 21, 2023
824f3d6
adding dependency for jackson to recognize java 8 classes
shamilto-epa Mar 21, 2023
ee69c12
removing unused imports
shamilto-epa Mar 21, 2023
b804a05
Merge pull request #1 from USEPA/feature/ITDATAHUB-514
asif-rashid Mar 22, 2023
d02410e
adding comments for openApiCustomizer, removing created timestamp fro…
shamilto-epa Mar 24, 2023
639fd01
Feature/itdatahub 514 (#3)
shamilto-epa Mar 30, 2023
0c0b92e
Implement projection
asif-rashid Apr 5, 2023
da10c51
Implement projection
asif-rashid Apr 12, 2023
c86f31f
Add spring profile based server address for openapi
asif-rashid Apr 15, 2023
a09c8a1
fixed the cors issue
asif-rashid Apr 15, 2023
6065ae6
fixed the cors issue
asif-rashid Apr 18, 2023
cbf9432
update cors test code
asif-rashid Apr 24, 2023
2138bbc
APIKey less access for CCD implemented and shell scripts for cloud.go…
asif-rashid May 17, 2023
d61c2b2
Update API key for skipping the restriction
asif-rashid May 25, 2023
1604934
Upgrade the code to spring 6 #4 (#5)
asif-rashid Nov 30, 2023
8ced561
implemented both assay and data endpoints #6 (#7)
asif-rashid Dec 4, 2023
2b7b14b
removed old code, but later work on unit testing #8 (#9)
asif-rashid Dec 4, 2023
1876487
Updated the code for new views names.
asif-rashid Dec 11, 2023
0d068f3
Updated the code for new views names.
asif-rashid Dec 14, 2023
5c5a299
Update config and move the spring boot 3.2.0.
asif-rashid Dec 20, 2023
e3a8ea9
Reduce the memory requirement to 1GB.
asif-rashid Dec 20, 2023
341b6ff
Upgrade the java-cfenv to latest version
asif-rashid Dec 21, 2023
aff698c
Implemented summary endpoint #14 (#15)
asif-rashid Dec 28, 2023
7b1185e
Implemented all assays endpoint #11 (#16)
asif-rashid Dec 28, 2023
c3ffe23
17 create a apikeystore bean to use with api authentication (#18)
asif-rashid Jan 2, 2024
caf8659
Create security-scan.yml
okemghou Feb 12, 2024
bfe81e7
Update security-scan.yml
okemghou Feb 12, 2024
56421f5
Merge pull request #20 from USEPA/dev-756
jpowel01 Feb 13, 2024
163875a
Added a custom header on Zap scan (#21)
okemghou Feb 26, 2024
be84931
fixed the cloud.gov caching issue related to api-key #22 (#23)
asif-rashid Feb 26, 2024
1fa33a7
fixed the cloud.gov caching issue related to api-key #22
asif-rashid Mar 18, 2024
dfa3ee8
add more memory to cloud.gov instance (1GB to 2GB)
asif-rashid Mar 18, 2024
a513b2f
Update example values
asif-rashid Mar 19, 2024
a23e7c3
Implemented health check endpoint #24 (#25)
asif-rashid Apr 21, 2024
73b46e8
26 implement data layer unit tests (#27)
asif-rashid May 13, 2024
11f6629
26 implement data layer unit tests (#28)
asif-rashid May 13, 2024
3a24767
34 update domain object with new materialized views (#35)
asif-rashid Jun 18, 2024
6d6f659
refactor the code to make api docs easily managed. #38 (#39)
asif-rashid Jul 8, 2024
880293a
update URLs for api security.
asif-rashid Jul 8, 2024
73434b7
update code for dynamic host loading. #40 (#41)
asif-rashid Jul 15, 2024
1d3f8bc
40 dynamic loading of approved hostnames from database (#42)
asif-rashid Aug 9, 2024
182680a
Update pom.xml
okemghou Aug 15, 2024
e397d24
Create gh-packages-deployment.yml
okemghou Aug 15, 2024
1fb9d45
Update gh-packages-deployment.yml
okemghou Aug 15, 2024
5cd8582
Create deploy-staging.yml
okemghou Sep 12, 2024
81c74ee
Update manifest-stg.yml
okemghou Sep 12, 2024
62466db
Update deploy-staging.yml
okemghou Sep 12, 2024
ca9572d
Update deploy-staging.yml
okemghou Sep 12, 2024
62c3e67
Merge pull request #43 from USEPA/DEV-887
jpowel01 Oct 16, 2024
8d51980
Merge pull request #47 from USEPA/DEV-875
jpowel01 Oct 16, 2024
91e6f61
Create deploy-prod.yml (#49)
jpowel01 Oct 21, 2024
1885079
37 extract interface assayresource and add api documentation tags for…
bridirks Jan 15, 2025
ac4bbf5
Update the API documentation with domain classes description for Assa…
bridirks Jan 15, 2025
d04ba71
29 implement test for application bioactivityapplication (#48)
bridirks Jan 15, 2025
9ccc680
Fixed multiple value bug for Gene and Citation fields in assay/search…
bridirks Jan 15, 2025
cd63206
Created POST method for all endpoints #13 (#55)
bridirks Jan 28, 2025
0d2be37
Integrated new view into bioactivity endpoint #57 (#58)
bridirks Feb 13, 2025
61e102b
Update BioactivityDataRepository.java (#56)
bridirks Feb 18, 2025
412c311
Fixed build issue mentioned by DevOps.
asif-rashid Feb 19, 2025
16e98bc
[DEV-969] Build the API Jar file and Deploy it Internally (#60)
okemghou Feb 20, 2025
3cb59df
Update security-scan.yml
okemghou Feb 20, 2025
652d485
[DEV-978] Create environment profile for staging deployment (#61)
okemghou Feb 24, 2025
49eb722
Update manifest-stg.yml
jpowel01 Feb 25, 2025
74a177d
Update manifest-stg.yml
jpowel01 Feb 25, 2025
267afc9
Dev 989 (#62)
jpowel01 Feb 25, 2025
aee6da7
CE-4511 Added ccd list projection for assay list (#63)
SrikanthDeevi Feb 27, 2025
265bb10
CE-4513 -Added new endpoint for assay list chemicals by aeid (#64)
SrikanthDeevi Mar 12, 2025
6ddfdb3
Create new search endpoints for SearchAssay #65 (#66)
bridirks Mar 12, 2025
75c5766
CE-4513 Added projections for bioactivity/assay/search/by-aeid (#68)
SrikanthDeevi Mar 12, 2025
502a039
Add new action
jpowel01 Mar 13, 2025
0f63ab4
dev > staging (#69)
jpowel01 Mar 13, 2025
e36ccb1
Adding route to manifest-stg.yml
jpowel01 Mar 13, 2025
0245759
Merge branch 'staging' into dev
jpowel01 Mar 13, 2025
8c1b3df
Merge pull request #70 from USEPA/dev
jpowel01 Mar 13, 2025
e35a9be
dev to stg 03-25-2025 (#77)
asif-rashid Mar 25, 2025
f231830
Dev -> Stg 5-7-2025 (#114)
asif-rashid May 7, 2025
abc7446
dev -> stg 5-7-2025 (#116)
asif-rashid May 7, 2025
bd446e3
dev -> stg 5-14-2025 (#118)
asif-rashid Jun 9, 2025
51f55b7
dev to stg 6-9-2025 (#123)
asif-rashid Jun 9, 2025
4fd21f8
Dev to Stg (#130)
SrikanthDeevi Aug 13, 2025
83e6589
Dev to Stg 8-22-2025 (#134)
asif-rashid Aug 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: deploy-prod

on:
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
required: true
default: 'warning'
type: choice
options:
- info
- warning
- debug

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
ref: main
- uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'corretto'

- name: Run the Maven clean package
run: mvn clean package -DskipTests

- uses: actions/upload-artifact@master
with:
name: bioactivity-jar
path: ./target

deploy:
runs-on: ubuntu-latest
needs: build

steps:
- uses: actions/checkout@v2
with:
ref: main
- uses: actions/download-artifact@master
with:
name: bioactivity-jar
path: ./target
- name: Deploy to cloud.gov
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-prod
cf_command: push -f manifest-prod.yml --no-start

bind-db-service:
runs-on: ubuntu-latest
needs: deploy

steps:
- name: Bind app to DB service
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-prod
cf_command: bind-service ccte-bioactivity-prod db-prod

restage:
runs-on: ubuntu-latest
needs: bind-db-service

steps:
- name: Restage app
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-prod
cf_command: restage ccte-bioactivity-prod
84 changes: 84 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: deploy-staging

on:
workflow_dispatch:
inputs:
logLevel:
description: 'Log level'
required: true
default: 'warning'
type: choice
options:
- info
- warning
- debug

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
ref: staging
- uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'corretto'

- name: Run the Maven clean package
run: mvn clean package -DskipTests

- uses: actions/upload-artifact@master
with:
name: bioactivity-jar
path: ./target

deploy:
runs-on: ubuntu-latest
needs: build

steps:
- uses: actions/checkout@v4
with:
ref: staging
- uses: actions/download-artifact@master
with:
name: bioactivity-jar
path: ./target
- name: Deploy to cloud.gov
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_STAGING_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_STAGING_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-stg
cf_command: push -f manifest-stg.yml --no-start

bind-db-service:
runs-on: ubuntu-latest
needs: deploy

steps:
- name: Bind app to DB service
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_STAGING_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_STAGING_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-stg
cf_command: bind-service ccte-bioactivity-stg db-prod

restage:
runs-on: ubuntu-latest
needs: bind-db-service

steps:
- name: Restage app
uses: cloud-gov/cg-cli-tools@main
with:
cf_username: ${{ secrets.CF_STAGING_SERVICE_USERNAME }}
cf_password: ${{ secrets.CF_STAGING_SERVICE_KEY }}
cf_org: epa-ord
cf_space: ccte-stg
cf_command: restage ccte-bioactivity-stg
34 changes: 34 additions & 0 deletions .github/workflows/docker-build-push-ghcr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Docker-ghcr

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
push:
branches: [ "dev", "staging", "main" ]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]


jobs:
build-push:

runs-on: ubuntu-latest
environment: ${{ github.head_ref || github.ref_name }}
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout code
uses: USEPA/ccte-docker-build@main
with:
username: USEPA
password: ${{ secrets.GITHUB_TOKEN }}
image_name: ${{ github.repository }}-${{ github.head_ref || github.ref_name }}
build_args: APP_SERVER_ENVIRONMENT=${{ github.head_ref || github.ref_name }}
17 changes: 17 additions & 0 deletions .github/workflows/email-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: email

on:
schedule:
- cron: '00 9 * * 1,4'

jobs:
send-email:
runs-on: "th878"
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: send email every monday and thursday
run: |
cd /data/watchtower/ctx-API/container-results/api-bioactivity
ls -la
python3 email.py
38 changes: 38 additions & 0 deletions .github/workflows/gh-packages-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: GH Packages Deployment

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
push:
branches: [ "main" ]

jobs:
maven-build-deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.17
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: '17'
cache: 'maven'
server-id: github # value of repository/id field of the pom.xml
server-username: GITHUB_USER_REF # env variable name for username
server-password: GITHUB_TOKEN_REF # env variable name for GitHub Pers
- name: Maven Package
env:
GITHUB_USER_REF: USEPA
GITHUB_TOKEN_REF: ${{ secrets.GH_PACKAGE_REPO_PASSWORD }}
run: |
mvn clean package -DskipTests
- name: Deploy to Github Package Registry
env:
GITHUB_USER_REF: USEPA
GITHUB_TOKEN_REF: ${{ secrets.GITHUB_TOKEN }}
run: |
mvn deploy -DskipTests
71 changes: 71 additions & 0 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Security Workflows

on:
push:
branches: [ dev, staging ]
tags: [ 'v*.*.*' ]
#schedule:
# - cron: '00 9 * * 1,3,5'

jobs:
container-scan:
runs-on: th878
environment: ${{ github.head_ref || github.ref_name }}
permissions:
contents: read
packages: write
id-token: write

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run Container Security Scan Action
uses: USEPA/ccte-container-scan@main
with:
image_name: api-bioactivity-security-cs
dockerfile: Dockerfile
output_path: ./output/bioactivity-report.html
cleanup_path: /data/watchtower/ctx-API/container-results/api-bioactivity/bioactivity-report.html
watchtower_path: /data/watchtower/ctx-API/container-results/api-bioactivity/bioactivity-report.html

trufflehog:
runs-on: ubuntu-latest
steps:
- name: Run Scan
uses: USEPA/ccte-secret-scan@main
with:
base_branch: ${{ github.event.repository.default_branch }}

build-and-upload-sbom:
runs-on: th878
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Generate and Upload SBOM
uses: USEPA/ccte-sbom-generator-java@main
with:
java_version: '17'
jira_url: ${{ secrets.JIRA_URL }}
jira_token: ${{ secrets.JIRA_TOKEN }}
server_hostname: 'ccte-api-dependency-track.epa.gov'
api_key: ${{ secrets.SECRET_OWASP_DT_KEY }}
project_name: 'ccte-api-bioactivity'
project_version: ${{ github.ref_name }}

Zap-scan:
runs-on: "th878"
#if: github.event_name == 'schedule'
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Run Application Security Scan
uses: USEPA/ccte-Zap-Scan@main
with:
zap_token: ${{ secrets.GITHUB_TOKEN }}
zap_target: 'https://api-ccte-stg.epa.gov/docs/bioactivity.json'
zap_format: 'openapi'
zap_cmd_options: '-a'
x_api_key: ${{ secrets.X_API_KEY }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ build/

### VS Code ###
.vscode/
/src/main/resources/config/application-dev.yml
/src/main/resources/config/application-local.yml
Loading