From 295cf84a8bc7ef3aa08916487afc682a3832e6ff Mon Sep 17 00:00:00 2001 From: Andre Pestana Date: Thu, 20 Feb 2025 16:10:23 -0800 Subject: [PATCH 1/2] initial commit --- .github/workflows/release-deploy-all.yml | 2 +- configs/env-example | 2 +- devops/Makefile | 4 ++-- sources/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-deploy-all.yml b/.github/workflows/release-deploy-all.yml index 7d43fdd850..6ea6d8b9a6 100644 --- a/.github/workflows/release-deploy-all.yml +++ b/.github/workflows/release-deploy-all.yml @@ -80,7 +80,7 @@ env: ATBC_LOGIN_ENDPOINT: ${{ secrets.ATBC_LOGIN_ENDPOINT }} ATBC_ENDPOINT: ${{ secrets.ATBC_ENDPOINT }} SWAGGER_ENABLED: true - APPLICATION_ARCHIVE_DAYS: 43 + APPLICATION_ARCHIVE_DAYS: ${{ vars.APPLICATION_ARCHIVE_DAYS }} BYPASS_APPLICATION_SUBMIT_VALIDATIONS: ${{ secrets.BYPASS_APPLICATION_SUBMIT_VALIDATIONS }} BYPASS_CRA_INCOME_VERIFICATION: ${{ secrets.BYPASS_CRA_INCOME_VERIFICATION }} API_SECRET_NAME: ${{ secrets.OPENSHIFT_SIMS_CREDS_NAME }} diff --git a/configs/env-example b/configs/env-example index b8afa4fc97..2265bf4d5b 100644 --- a/configs/env-example +++ b/configs/env-example @@ -11,7 +11,7 @@ BUILD_ID=0 API_PORT=3000 APP_PORT=8080 SWAGGER_ENABLED=true -APPLICATION_ARCHIVE_DAYS=43 +APPLICATION_ARCHIVE_DAYS=365 # Database POSTGRES_USER= diff --git a/devops/Makefile b/devops/Makefile index b64befbbd5..5f59c4f66f 100644 --- a/devops/Makefile +++ b/devops/Makefile @@ -18,7 +18,7 @@ export BYPASS_CRA_INCOME_VERIFICATION := $(or $(BYPASS_CRA_INCOME_VERIFICATION), export IS_FULLTIME_ALLOWED := $(or $(IS_FULLTIME_ALLOWED), false) export BYPASS_APPLICATION_SUBMIT_VALIDATIONS := $(or $(BYPASS_APPLICATION_SUBMIT_VALIDATIONS), false) export SWAGGER_ENABLED := $(or ${SWAGGER_ENABLED}, true) -export APPLICATION_ARCHIVE_DAYS := $(or ${APPLICATION_ARCHIVE_DAYS}, 43) +export APPLICATION_ARCHIVE_DAYS := $(or ${APPLICATION_ARCHIVE_DAYS}, 365) export REDIS_PORT := $(or ${REDIS_PORT}, 6379) export CLAMAV_PORT := $(or ${CLAMAV_PORT}, 3310) export API_PORT := $(or ${API_PORT}, 7070) @@ -530,4 +530,4 @@ update-sysdig-team: @oc process -f openshift/sysdig-team.yml -p LICENSE_PLATE=0c27fb | oc apply -f - @echo "Updating Sysdig Team for license plate a6ef19.\n" @oc project a6ef19-tools - @oc process -f openshift/sysdig-team.yml -p LICENSE_PLATE=a6ef19 | oc apply -f - \ No newline at end of file + @oc process -f openshift/sysdig-team.yml -p LICENSE_PLATE=a6ef19 | oc apply -f - diff --git a/sources/Makefile b/sources/Makefile index 97a9f59455..dad10c9357 100644 --- a/sources/Makefile +++ b/sources/Makefile @@ -47,7 +47,7 @@ export IS_FULLTIME_ALLOWED := $(or $(IS_FULLTIME_ALLOWED), true) export INSTITUTION_REQUEST_FOLDER := $(or $(INSTITUTION_REQUEST_FOLDER), OUT) export INSTITUTION_RESPONSE_FOLDER := $(or $(INSTITUTION_RESPONSE_FOLDER), IN) export SWAGGER_ENABLED := $(or ${SWAGGER_ENABLED}, true) -export APPLICATION_ARCHIVE_DAYS := $(or ${APPLICATION_ARCHIVE_DAYS}, 43) +export APPLICATION_ARCHIVE_DAYS := $(or ${APPLICATION_ARCHIVE_DAYS}, 365) #Formio forms integration export FORMIO_SOURCE_REPO_URL := $(or ${FORMIO_SOURCE_REPO_URL}, https://github.com/formio/formio.git) export FORMIO_SOURCE_REPO_TAG := $(or ${FORMIO_SOURCE_REPO_TAG}, v4.3.0) From b8dadd8fee7c352a7db98f8cd636b008fea24b65 Mon Sep 17 00:00:00 2001 From: Andre Pestana Date: Thu, 20 Feb 2025 17:23:47 -0800 Subject: [PATCH 2/2] updated tests --- .../ecert-full-time-process-integration.scheduler.e2e-spec.ts | 2 +- .../ecert-part-time-process-integration.scheduler.e2e-spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-full-time-process-integration.scheduler.e2e-spec.ts b/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-full-time-process-integration.scheduler.e2e-spec.ts index 091c9570ae..8e89ecd73a 100644 --- a/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-full-time-process-integration.scheduler.e2e-spec.ts +++ b/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-full-time-process-integration.scheduler.e2e-spec.ts @@ -71,7 +71,7 @@ describe( beforeAll(async () => { // Env variable required for querying the eligible e-Cert records. - process.env.APPLICATION_ARCHIVE_DAYS = "42"; + process.env.APPLICATION_ARCHIVE_DAYS = "365"; const { nestApplication, dataSource, sshClientMock } = await createTestingAppModule(); app = nestApplication; diff --git a/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-part-time-process-integration.scheduler.e2e-spec.ts b/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-part-time-process-integration.scheduler.e2e-spec.ts index 4a46e4fac0..b14b5685ef 100644 --- a/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-part-time-process-integration.scheduler.e2e-spec.ts +++ b/sources/packages/backend/apps/queue-consumers/src/processors/schedulers/esdc-integration/ecert-integration/_tests_/ecert-part-time-process-integration.scheduler.e2e-spec.ts @@ -66,7 +66,7 @@ describe( beforeAll(async () => { // Env variable required for querying the eligible e-Cert records. - process.env.APPLICATION_ARCHIVE_DAYS = "42"; + process.env.APPLICATION_ARCHIVE_DAYS = "365"; const { nestApplication, dataSource, sshClientMock } = await createTestingAppModule(); app = nestApplication;