From 5b94543c712051f8bf210a4e22ad22b95372903e Mon Sep 17 00:00:00 2001 From: Kamal Mohammed Date: Fri, 8 Mar 2024 14:24:05 -0700 Subject: [PATCH 1/4] Update Trivy scan version to v2 --- .github/workflows/on.pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml index a6fc8ac..2eae993 100644 --- a/.github/workflows/on.pr.yml +++ b/.github/workflows/on.pr.yml @@ -42,7 +42,7 @@ jobs: severity: 'CRITICAL' - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v1 + uses: github/codeql-action/upload-sarif@v2 with: sarif_file: 'trivy-results.sarif' - name: Cache SonarCloud packages From 5480ceea7d911b58bb7af753e8ed2bdd8d376bd2 Mon Sep 17 00:00:00 2001 From: Kamal Mohammed Date: Tue, 23 Apr 2024 01:08:19 -0600 Subject: [PATCH 2/4] Upgrade ZAPSCAN to 0.7.0 --- .../workflows/build.from.developer.branch.deploy.to.dev.yml | 4 ++-- .github/workflows/build.from.main.branch.deploy.to.dev.yml | 4 ++-- .github/workflows/build.from.release.branch.deploy.to.dev.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml index d7ffd8b..1ca4b55 100644 --- a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml @@ -155,6 +155,6 @@ jobs: # now hit it with a zap scan - name: ZAP Scan - uses: zaproxy/action-api-scan@v0.1.0 + uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca/api/v1/api-docs' + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' diff --git a/.github/workflows/build.from.main.branch.deploy.to.dev.yml b/.github/workflows/build.from.main.branch.deploy.to.dev.yml index 5080e84..c0f916e 100644 --- a/.github/workflows/build.from.main.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.main.branch.deploy.to.dev.yml @@ -137,6 +137,6 @@ jobs: # now hit it with a zap scan - name: ZAP Scan - uses: zaproxy/action-api-scan@v0.1.0 + uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file diff --git a/.github/workflows/build.from.release.branch.deploy.to.dev.yml b/.github/workflows/build.from.release.branch.deploy.to.dev.yml index 1df930a..ecafe31 100644 --- a/.github/workflows/build.from.release.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.release.branch.deploy.to.dev.yml @@ -144,6 +144,6 @@ jobs: # now hit it with a zap scan - name: ZAP Scan - uses: zaproxy/action-api-scan@v0.1.0 + uses: zaproxy/action-api-scan@v0.7.0 with: - target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}-dev.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file + target: 'https://${{ env.REPO_NAME }}-${{ env.OPENSHIFT_NAMESPACE }}.apps.silver.devops.gov.bc.ca/api/v1/api-docs' \ No newline at end of file From dbf7e2711cfed3c582d1d55fab48cc6781ec9ebf Mon Sep 17 00:00:00 2001 From: githubmamatha Date: Fri, 26 Apr 2024 10:31:41 -0700 Subject: [PATCH 3/4] Grad2-2604 Message changes for 2018 grad program non graduates. --- .../1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql diff --git a/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql b/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql new file mode 100644 index 0000000..90ff72c --- /dev/null +++ b/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql @@ -0,0 +1,2 @@ +UPDATE TRANSCRIPT_MESSAGE SET GRAD_PROJECTED_MESSAGE='Based on the information provided by the school, this student cannot satisfy the requirements for the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE = '2018-EN' AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; +UPDATE TRANSCRIPT_MESSAGE SET GRAD_MAIN_MESSAGE = 'Based on the information provided by the school, this student has not yet graduated in the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE = '2018-PF' AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; \ No newline at end of file From c2aa24d4d3de696a4eca5ee085c1bf2d653d30f5 Mon Sep 17 00:00:00 2001 From: githubmamatha Date: Sat, 27 Apr 2024 03:05:36 -0700 Subject: [PATCH 4/4] Grad2-2604 Made the required changes. --- .../1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql b/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql index 90ff72c..11df1b3 100644 --- a/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql +++ b/api/src/main/resources/db/migration/1.0/V1.0.86__DML-UPDATE_DATA-TRANSCRIPT_MESSAGE.sql @@ -1,2 +1,2 @@ -UPDATE TRANSCRIPT_MESSAGE SET GRAD_PROJECTED_MESSAGE='Based on the information provided by the school, this student cannot satisfy the requirements for the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE = '2018-EN' AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; -UPDATE TRANSCRIPT_MESSAGE SET GRAD_MAIN_MESSAGE = 'Based on the information provided by the school, this student has not yet graduated in the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE = '2018-PF' AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; \ No newline at end of file +UPDATE TRANSCRIPT_MESSAGE SET GRAD_PROJECTED_MESSAGE='Based on the information provided by the school, this student cannot satisfy the requirements for the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE IN('2018-EN', '2018-PF') AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; +UPDATE TRANSCRIPT_MESSAGE SET GRAD_MAIN_MESSAGE = 'Based on the information provided by the school, this student has not yet graduated in the Graduation Program %s. Note: Students are no longer eligible to graduate on the 2018 graduation program unless required courses were completed by June 30, 2024. Contact your school counselor for more information.' WHERE GRADUATION_PROGRAM_CODE IN('2018-EN', '2018-PF') AND MESSAGE_TYPE_CODE = 'NOT_GRADUATED'; \ No newline at end of file