From 94a2eb58f25bb760951d7806964aa27283f09c4a Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 29 Oct 2024 18:41:35 +0530 Subject: [PATCH 1/3] [Automated] Update native jar versions in toml files --- ballerina/Dependencies.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 0969bec..4d42431 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -100,9 +100,6 @@ dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "lang.value"} ] -modules = [ - {org = "ballerina", packageName = "io", moduleName = "io"} -] [[package]] org = "ballerina" @@ -400,7 +397,7 @@ modules = [ [[package]] org = "ballerinax" name = "java.jdbc" -version = "1.12.0" +version = "1.12.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "io"}, @@ -467,7 +464,6 @@ org = "ballerinax" name = "persist.sql" version = "1.4.1" dependencies = [ - {org = "ballerina", name = "io"}, {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "log"}, {org = "ballerina", name = "persist"}, @@ -491,7 +487,7 @@ modules = [ [[package]] org = "ballerinax" name = "postgresql" -version = "1.13.0" +version = "1.13.1" scope = "testOnly" dependencies = [ {org = "ballerina", name = "crypto"}, From 6278b7e63ddfd1e64282e29ed5b6ff87c7356c31 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Tue, 29 Oct 2024 22:25:08 +0530 Subject: [PATCH 2/3] Add env to fix the TOOMANYREQUESTS issues --- .github/workflows/trivy-scan.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 458aab5..a3bf024 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -8,6 +8,9 @@ on: jobs: call_workflow: name: Run Trivy Scan Workflow + env: + TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db if: ${{ github.repository_owner == 'ballerina-platform' }} uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main secrets: inherit From 1aa698c2aded652acf7d3311db141c93a083f1d0 Mon Sep 17 00:00:00 2001 From: Danesh Kuruppu Date: Wed, 30 Oct 2024 09:56:01 +0530 Subject: [PATCH 3/3] Add env to fix the TOOMANYREQUESTS issues --- .github/workflows/publish-release.yml | 3 +++ .github/workflows/trivy-scan.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 054ecc6..5b3d638 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -27,6 +27,9 @@ jobs: - name: Create lib directory if not exists run: mkdir -p ballerina/lib - name: Run Trivy vulnerability scanner + env: + TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db + TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db uses: aquasecurity/trivy-action@master with: scan-type: 'rootfs' diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index a3bf024..458aab5 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -8,9 +8,6 @@ on: jobs: call_workflow: name: Run Trivy Scan Workflow - env: - TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db,public.ecr.aws/aquasecurity/trivy-db - TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db if: ${{ github.repository_owner == 'ballerina-platform' }} uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main secrets: inherit