Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.4.0 #1157

Merged
merged 55 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0250a94
Lot3 work (#958)
sambles May 2, 2024
626469d
Docker compose, removed debugging options from default (#1036)
sambles May 13, 2024
3763ecf
Fix missing filestore arg in complex model file prep (#1041)
sambles May 17, 2024
6a3bf8a
Fixed missing call to param update method - V1 Workers (#1045)
sambles May 17, 2024
20b0aa3
Azure Postgres Flexible server support (#1040)
sambles May 23, 2024
724a036
Fix running V2 workers with custom OED specification files (#1051)
sambles May 24, 2024
d446d21
Add stable/2.3.x to compatibility checks and fixed V2 worker monitor …
sambles May 24, 2024
5f50b6d
Tidy up docker compose examples (#1047)
sambles May 29, 2024
afa1f67
Set scan external to manual trigger only (#1058)
sambles May 30, 2024
6742e93
Set version 2.3.5 (#1060)
sambles May 30, 2024
f8f66fa
Fix autoscaling ramping down when new analysis run is triggered (#1…
sambles Jun 5, 2024
30583a0
Fix for keycloak using MS cert (#1066)
sambles Jun 20, 2024
51ade55
Accept settings JSON on analysis or model creation (#1067)
sambles Jun 27, 2024
9cf3b66
Make sure ConfigParser has required sections if not set in conf.ini f…
sambles Jul 1, 2024
44655cc
Use version 2 of the API on api ls commands (#1070)
Locoxella Jul 2, 2024
1762a77
Fix to handle exceptions which can't be serialized by celery (#1073)
sambles Jul 2, 2024
fcb10d4
replace logger.info with logger.exception to show full trace (#1077)
sambles Jul 10, 2024
68767d8
Fix API spec - return for create & update for 'analyses' and 'model' …
sambles Jul 10, 2024
c10f5cd
Fix/api responses v2 (#1081)
sambles Jul 12, 2024
4d90338
Fixed CVEs from fiona package (#1089)
sambles Jul 24, 2024
43ede7f
setuptools fails with packaging<22.0 (#1091)
sambles Jul 24, 2024
4d3ff13
add hook calls to v2 (#1088)
sambles Jul 24, 2024
0fc2759
Fixed sever setting an analyses to an error state when submitting a b…
sambles Jul 24, 2024
1a71192
Updated Package Requirements: twisted==24.7.0rc1 (#1094)
sambles Aug 1, 2024
388b8d2
Fix/1092 task cancellation issue (#1093)
sambles Aug 5, 2024
a94367b
ffs (#1099)
sambles Aug 7, 2024
f98cf70
Only run attach project issues workflow from Our repo - not forks (#1…
sambles Aug 9, 2024
bb918e7
Set version 2.3.7 (#1102)
sambles Aug 14, 2024
b86c565
Fix log storage in results tar files (#1103)
sambles Aug 16, 2024
99a189a
Fix params for V1 workers ~ so custom hooks are called (#1104)
sambles Aug 16, 2024
5e6028f
Fix/gen log storage (#1107) (#1108)
sambles Aug 16, 2024
9d2cc4a
set artifact to v4 (#1109)
sambles Sep 5, 2024
2351984
Added model storage_links endpoint (#1113)
sambles Sep 19, 2024
80c1702
Fixed group mapper class in Keyclock realm config (#1112)
sambles Sep 19, 2024
4983646
test example from github trivy-action
sambles Oct 28, 2024
6804612
Merge pull request #1127 from OasisLMF/test/trivy-cache
sambles Oct 28, 2024
559fb35
pull request #1128 from OasisLMF/update/main-python-3.12
sambles Oct 21, 2024
a585706
Add cybermodels support in the OasisAPI - V1 Only (#1133)
sambles Oct 31, 2024
8f6e3a6
Fix/1135 model settings conf (#1139)
sambles Nov 19, 2024
4d05dba
Fix PR action (#1142)
sambles Nov 22, 2024
5a60810
skip merge commits (#1147)
sambles Nov 26, 2024
21693fb
Fix/1140 status db indexing (main) (#1144)
sambles Nov 26, 2024
f642000
Fixed pip install on model worker images (#1134)
sambles Nov 28, 2024
a72bd44
Add endpoints to list and return individual files from tar (#1151)
vinulw Dec 9, 2024
60f1b76
Expose components versions in API (#1152)
vinulw Jan 8, 2025
9e7e7c4
Feature/1097 track subtask retries (#1155)
sambles Jan 20, 2025
445c394
Fix/testing oed4 update (#1160)
sambles Jan 28, 2025
efb4bf0
Fix/hooks file loading (#1161)
sambles Jan 31, 2025
5f2dbd6
Workaround for ods tools issue #174 (#1163)
sambles Feb 3, 2025
b56453a
Fix/v2 location loading (#1162)
sambles Feb 3, 2025
b2a8ef6
Only apply the "unstick" task pending workaround to V2 queues (#1158)
sambles Feb 3, 2025
8964fd4
Updated Package Requirements: aiohttp==3.10.10 django==3.2.25 jinja2=…
awsbuild Feb 3, 2025
21d3bc9
Set version 2.4.0
awsbuild Feb 3, 2025
9b270c3
retest
sambles Feb 3, 2025
1031d21
Update changelog
awsbuild Feb 4, 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
6 changes: 4 additions & 2 deletions .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ env:
IGNORE_UNFIXED: 'true'
SEVERITY: 'CRITICAL,HIGH'
IMAGE_REPO: 'coreoasis/github-actions'
TRIVY_SKIP_DB_UPDATE: true
TRIVY_SKIP_JAVA_DB_UPDATE: true

jobs:
build:
Expand Down Expand Up @@ -163,7 +165,7 @@ jobs:

- name: Store image size report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.dive }}
path: ${{ matrix.dive }}
Expand Down Expand Up @@ -201,7 +203,7 @@ jobs:

- name: Store CVE report
if: success() || failure() && env.SEVERITY != 'SKIP'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.report }}
path: ${{ matrix.report }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Set up Python 3.10
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: '3.10'
python-version: '3.12'

- name: Install requirments
run: pip install -r requirements-server.txt

- name: Download package
if: needs.ods_tools.outputs.whl_filename != ''
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bin_package
path: ${{ github.workspace }}/
Expand Down Expand Up @@ -83,21 +83,21 @@ jobs:
OASIS_GEN_SWAGGER_V2: 1

- name: Store OpenAPI schema
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: openapi-schema
path: ${{ env.SCHEMA_ALL }}
retention-days: 3

- name: Store OpenAPI schema (only v1)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: v1-openapi-schema
path: ${{ env.SCHEMA_V1 }}
retention-days: 3

- name: Store OpenAPI schema (only v2)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: v2-openapi-schema
path: ${{ env.SCHEMA_V2 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.12"

- name: install pip tools
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/project-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
track_pr:
runs-on: ubuntu-latest
if: github.event.pull_request.head.repo.fork == false
steps:
- name: Get project data
env:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/project-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
track_issue:
runs-on: ubuntu-latest
if: github.repository_owner == 'OasisLMF'
steps:
- name: Get project data
env:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -330,21 +330,21 @@ jobs:
docker run --entrypoint "eve" ${{ needs.build_images.outputs.worker_image }} '-v' 2> KTOOLS_VERSION

- name: 'store OASISLMF_VERSION'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: OASISLMF_VERSION
path: OASISLMF_VERSION
retention-days: 5

- name: 'store ODS_VERSION'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ODS_VERSION
path: ODS_VERSION
retention-days: 5

- name: 'store KTOOLS_VERSION'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: KTOOLS_VERSION
path: KTOOLS_VERSION
Expand All @@ -362,19 +362,19 @@ jobs:
test "v$KTOOL_VER" = ${{ env.ktools_release }} || exit 1

- name: Download API schema
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: openapi-schema
path: ${{ github.workspace }}/

- name: Download API schema (v1)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: v1-openapi-schema
path: ${{ github.workspace }}/

- name: Download API schema (v2)
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: v2-openapi-schema
path: ${{ github.workspace }}/
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/scan-db-cache.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Update Trivy Cache

on:
schedule:
- cron: '0 0 * * *' # Run daily at midnight UTC
workflow_dispatch: # Allow manual triggering

jobs:
update-trivy-db:
runs-on: ubuntu-latest
steps:
- name: Setup oras
uses: oras-project/setup-oras@v1

- name: Get current date
id: date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT

- name: Download and extract the vulnerability DB
run: |
mkdir -p $GITHUB_WORKSPACE/.cache/trivy/db
oras pull ghcr.io/aquasecurity/trivy-db:2
tar -xzf db.tar.gz -C $GITHUB_WORKSPACE/.cache/trivy/db
rm db.tar.gz

- name: Download and extract the Java DB
run: |
mkdir -p $GITHUB_WORKSPACE/.cache/trivy/java-db
oras pull ghcr.io/aquasecurity/trivy-java-db:1
tar -xzf javadb.tar.gz -C $GITHUB_WORKSPACE/.cache/trivy/java-db
rm javadb.tar.gz

- name: Cache DBs
uses: actions/cache/save@v4
with:
path: ${{ github.workspace }}/.cache/trivy
key: cache-trivy-${{ steps.date.outputs.date }}
11 changes: 3 additions & 8 deletions .github/workflows/scan-external.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
name: External Vulnerability Scanning

on:
push:
branches:
- main
pull_request:
branches:
- stable**

workflow_dispatch:
inputs:
cve_severity:
Expand All @@ -22,6 +15,8 @@ on:
env:
SEVERITY: 'HIGH,CRITICAL'
IGNORE_UNFIXED: 'true'
TRIVY_SKIP_DB_UPDATE: true
TRIVY_SKIP_JAVA_DB_UPDATE: true

jobs:
scan_external_images:
Expand Down Expand Up @@ -102,7 +97,7 @@ jobs:

- name: Store report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.report }}
path: ${{ matrix.report }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
branches:
- main
- stable**
schedule:
- cron: '0 */6 * * *' # Run scan every 6 hours

workflow_dispatch:
inputs:
Expand Down Expand Up @@ -47,6 +45,9 @@ jobs:
REPORT: 'repo-results.sarif'
IGNORE_UNFIXED: 'true'
EXIT_CODE: '1'
TRIVY_SKIP_DB_UPDATE: true
TRIVY_SKIP_JAVA_DB_UPDATE: true

runs-on: ubuntu-latest
steps:
- name: Adding code-scanning URL
Expand Down Expand Up @@ -103,7 +104,7 @@ jobs:

- name: Store CVE report
if: success() || failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.REPORT }}
path: ${{ env.REPORT }}
Expand Down
62 changes: 62 additions & 0 deletions .github/workflows/test-db-migration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: DB migration Test

on:
push:
branches:
- main
pull_request:
workflow_dispatch:
inputs:
prev_release_tag:
description: 'OasisPlatform tag [semvar]'
required: false

workflow_call:
inputs:
prev_release_tag:
description: 'Platform tag to set the DB migration from'
required: false
type: string
platform_branch:
description: "Platform branch to migrate to (remote trigger) [git ref]"
required: True
type: string

jobs:
DB_migrate:
runs-on: ubuntu-22.04
env:
PLAT_BRANCH: ${{ github.ref }}
PREV_RELEASE_TAG: ${{ inputs.prev_release_tag }}

steps:
- name: Branch selection (remote trigger)
if: inputs.platform_branch != ''
run: echo "PLAT_BRANCH=${{ inputs.platform_branch }}" >> $GITHUB_ENV

- name: Checkout
uses: actions/checkout@v3
with:
repository: OasisLMF/OasisPlatform
ref: ${{ env.PLAT_BRANCH }}
fetch-depth: 0

- name: Find 'prev_release_tag'
if: inputs.prev_release_tag == ''
run: |
tag=$( ./scripts/find_release.sh -t 1)
echo "PREV_RELEASE_TAG=$tag" >> $GITHUB_ENV

- name: Create DB to migrate from
run: |
./scripts/create-db-sqlite3.sh ${{ env.PREV_RELEASE_TAG }}

- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: '3.12'
- run: pip install -r requirements-server.txt

- name: Run Migration
run: |
python ./manage.py migrate
Loading