From 11229d655ba68c0696a0e930eab41e494ea70e8c Mon Sep 17 00:00:00 2001 From: dandelany Date: Tue, 5 May 2026 02:09:13 -0700 Subject: [PATCH 1/2] small fixes to action server port parsing, github workflows --- .github/workflows/pgcmp.yml | 6 ++++-- .github/workflows/publish.yml | 10 ++++++++-- .gitignore | 1 + action-server/src/db.ts | 2 +- action-server/src/threads/worker.ts | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pgcmp.yml b/.github/workflows/pgcmp.yml index 49dd7ea1cf..0c96d26a21 100644 --- a/.github/workflows/pgcmp.yml +++ b/.github/workflows/pgcmp.yml @@ -6,13 +6,15 @@ on: - "deployment/hasura/migrations/**" - "deployment/postgres-init-db/sql/**" - ".github/workflows/pgcmp.yml" - - ".github/workflows/scripts/compareDatabases*" + - ".github/scripts/compareDatabases*" + - ".github/scripts/explanations_*" push: paths: - "deployment/hasura/migrations/**" - "deployment/postgres-init-db/sql/**" - ".github/workflows/pgcmp.yml" - - ".github/workflows/scripts/compareDatabases*" + - ".github/scripts/compareDatabases*" + - ".github/scripts/explanations_*" branches: - develop - dev-[0-9]+.[0-9]+.[0-9]+ diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index eee7236120..606e0886a2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -140,7 +140,7 @@ jobs: scan: runs-on: ubuntu-latest - needs: containers + needs: [init, containers] if: needs.init.outputs.SHOULD_PUBLISH_IMAGES == 'true' strategy: matrix: @@ -159,6 +159,12 @@ jobs: steps: - uses: actions/checkout@v6 + - name: Extract metadata for ${{ matrix.image }} + id: metadata-step + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }} + - name: Scan ${{ matrix.image }} for vulnerabilities # pinned to commit for release https://github.com/aquasecurity/trivy-action/releases/tag/v0.24.0 uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 @@ -166,7 +172,7 @@ jobs: TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db with: - image-ref: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }}:develop + image-ref: ${{ env.REGISTRY }}/${{ env.OWNER }}/${{ matrix.image }}:${{ steps.metadata-step.outputs.version }} ignore-unfixed: true exit-code: "1" severity: "CRITICAL" diff --git a/.gitignore b/.gitignore index df07bec9fb..8812357c1a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ **/target/* .*.swp .tags +.codex ### Build ### .m2 diff --git a/action-server/src/db.ts b/action-server/src/db.ts index 6d285493ab..b96fcc03a4 100644 --- a/action-server/src/db.ts +++ b/action-server/src/db.ts @@ -17,7 +17,7 @@ export class ActionsDbManager { logger.info(`Creating PG pool`); ActionsDbManager.pool = new pg.Pool({ host: AERIE_DB_HOST, - port: parseInt(AERIE_DB_PORT, 5432), + port: parseInt(AERIE_DB_PORT, 10), database: AERIE_DB, user: ACTION_DB_USER, password: ACTION_DB_PASSWORD, diff --git a/action-server/src/threads/worker.ts b/action-server/src/threads/worker.ts index 03784e05a6..831331a0cd 100644 --- a/action-server/src/threads/worker.ts +++ b/action-server/src/threads/worker.ts @@ -20,7 +20,7 @@ function getDbPool() { dbPool = new pg.Pool({ host: AERIE_DB_HOST, - port: parseInt(AERIE_DB_PORT, 5432), + port: parseInt(AERIE_DB_PORT, 10), database: AERIE_DB, user: ACTION_DB_USER, password: ACTION_DB_PASSWORD, From dc6e458298cd49cee9c50d467823dfdb9b7f3334 Mon Sep 17 00:00:00 2001 From: Dan Delany Date: Tue, 5 May 2026 16:01:06 -0700 Subject: [PATCH 2/2] remove confusing radix arg from parseInt calls in action-server --- action-server/src/db.ts | 2 +- action-server/src/threads/worker.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action-server/src/db.ts b/action-server/src/db.ts index b96fcc03a4..f598aaa0d1 100644 --- a/action-server/src/db.ts +++ b/action-server/src/db.ts @@ -17,7 +17,7 @@ export class ActionsDbManager { logger.info(`Creating PG pool`); ActionsDbManager.pool = new pg.Pool({ host: AERIE_DB_HOST, - port: parseInt(AERIE_DB_PORT, 10), + port: parseInt(AERIE_DB_PORT), database: AERIE_DB, user: ACTION_DB_USER, password: ACTION_DB_PASSWORD, diff --git a/action-server/src/threads/worker.ts b/action-server/src/threads/worker.ts index 831331a0cd..b292767959 100644 --- a/action-server/src/threads/worker.ts +++ b/action-server/src/threads/worker.ts @@ -20,7 +20,7 @@ function getDbPool() { dbPool = new pg.Pool({ host: AERIE_DB_HOST, - port: parseInt(AERIE_DB_PORT, 10), + port: parseInt(AERIE_DB_PORT), database: AERIE_DB, user: ACTION_DB_USER, password: ACTION_DB_PASSWORD,