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 4df86fc7..1275ad97 100644 --- a/.github/workflows/build.from.developer.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.developer.branch.deploy.to.dev.yml @@ -29,7 +29,7 @@ env: MAX_MEM: "2048Mi" MIN_REPLICAS: "3" MAX_REPLICAS: "5" - STORAGE_LIMIT: "16Gi" + STORAGE_LIMIT: "15Gi" on: # https://docs.github.com/en/actions/reference/events-that-trigger-workflows @@ -131,4 +131,4 @@ jobs: - name: ZAP Scan uses: zaproxy/action-api-scan@v0.1.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 }}-dev.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 b463490d..96a10fea 100644 --- a/.github/workflows/build.from.main.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.main.branch.deploy.to.dev.yml @@ -29,7 +29,7 @@ env: MAX_MEM: "2048Mi" MIN_REPLICAS: "3" MAX_REPLICAS: "5" - STORAGE_LIMIT: "16Gi" + STORAGE_LIMIT: "15Gi" on: workflow_dispatch: 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 5b07caae..d903865b 100644 --- a/.github/workflows/build.from.release.branch.deploy.to.dev.yml +++ b/.github/workflows/build.from.release.branch.deploy.to.dev.yml @@ -29,7 +29,7 @@ env: MAX_MEM: "2048Mi" MIN_REPLICAS: "3" MAX_REPLICAS: "5" - STORAGE_LIMIT: "16Gi" + STORAGE_LIMIT: "15Gi" on: workflow_dispatch: diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 1c608460..8379df45 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -24,7 +24,7 @@ env: MAX_MEM: "2048Mi" MIN_REPLICAS: "3" MAX_REPLICAS: "5" - STORAGE_LIMIT: "128Gi" + STORAGE_LIMIT: "127Gi" on: diff --git a/.github/workflows/deploy_test.yml b/.github/workflows/deploy_test.yml index a84af3ea..f088a770 100644 --- a/.github/workflows/deploy_test.yml +++ b/.github/workflows/deploy_test.yml @@ -24,7 +24,7 @@ env: MAX_MEM: "2048Mi" MIN_REPLICAS: "3" MAX_REPLICAS: "5" - STORAGE_LIMIT: "16Gi" + STORAGE_LIMIT: "15Gi" on: diff --git a/api/pom.xml b/api/pom.xml index 9cea9d3c..595d8fbf 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -6,7 +6,7 @@ ca.bc.gov.educ educ-grad-distribution-api - 1.8.57 + 1.8.58 educ-grad-distribution-api Ministry of Education GRAD DISTRIBUTION API diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/process/PostingSchoolReportProcess.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/process/PostingSchoolReportProcess.java index bb281b70..87d9da3e 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/distribution/process/PostingSchoolReportProcess.java +++ b/api/src/main/java/ca/bc/gov/educ/api/distribution/process/PostingSchoolReportProcess.java @@ -105,7 +105,6 @@ private void mergeDocuments(ProcessorData processorData,String mincode,String fi objs.setDestinationFileName(pBuilder.toString()); objs.addSources(locations); objs.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly()); - sftpUtils.sftpUploadTSW(processorData.getBatchId(),mincode,fileName); }catch (Exception e) { logger.debug(EXCEPTION,e.getLocalizedMessage()); } diff --git a/api/src/main/java/ca/bc/gov/educ/api/distribution/util/SFTPUtils.java b/api/src/main/java/ca/bc/gov/educ/api/distribution/util/SFTPUtils.java index 6fc4ff99..86c7097d 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/distribution/util/SFTPUtils.java +++ b/api/src/main/java/ca/bc/gov/educ/api/distribution/util/SFTPUtils.java @@ -29,18 +29,6 @@ public class SFTPUtils { @Value("${sftp.bcmail.known-hosts}") private String BCMAIL_KNOWN_HOSTS; - @Value("${sftp.tsw.host}") - private String TSW_REMOTE_HOST; - @Value("${sftp.tsw.username}") - private String TSW_SFTP_USERNAME; - @Value("${sftp.tsw.priv-key}") - private String TSW_PRIVATE_KEY; - @Value("${sftp.tsw.pub-key}") - private String TSW_PUBLIC_KEY; - @Value("${sftp.tsw.known-hosts}") - private String TSW_KNOWN_HOSTS; - - @Value("${sftp.bcmail.location}") private String BC_MAIL_LOCATION; @@ -89,27 +77,7 @@ public boolean sftpUploadBCMail(Long batchId, String rootFolder, String mincode) } /** - * Method specific for uploading files to TSW - * @param batchId batch id - * @param mincode mincode - * @param fileName the filename - * @return true if successful - */ - public boolean sftpUploadTSW(Long batchId,String mincode,String fileName) { - Map> files = new HashMap<>(); - String localFile = formatPath(EducDistributionApiConstants.TMP_DIR + EducDistributionApiConstants.DEL + batchId + EducDistributionApiConstants.DEL + mincode + EducDistributionApiConstants.DEL + fileName+".pdf"); - String remoteFile = "/$1$dga5037/EDUC/XTD"; - String location1 = remoteFile+"/WEB/"+fileName+".pdf"; - String location2 = remoteFile+"/TSWSFTP/"+fileName+".pdf"; - String location3 = remoteFile+"/WEB/PST/"+fileName+".pdf"; - files.computeIfAbsent(localFile, v -> new ArrayList<>()).add(location1); - files.computeIfAbsent(localFile, v -> new ArrayList<>()).add(location2); - files.computeIfAbsent(localFile, v -> new ArrayList<>()).add(location3); - return sftpUpload(files, TSW_SFTP_USERNAME, TSW_REMOTE_HOST, REMOTE_PORT, TSW_PRIVATE_KEY, TSW_PUBLIC_KEY, TSW_KNOWN_HOSTS); - } - - /** - * Method for uploading files to an sftp server + * Method for uploading files to a sftp server * @param files a map of local -> remote file paths. Use of Map> enables the key (the file to upload) * to have multiple upload locations (the List represents the upload locations) * @param userName the username to log into the sftp server diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index ccdef19e..9c3698a8 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -89,12 +89,6 @@ sftp: pub-key: ${BCMAIL_SSH_PUBLIC_KEY} known-hosts: ${BCMAIL_KNOWN_HOSTS_ENTRY} location: ${BCMAIL_LOCATION} - tsw: - host: ${TSW_SFTP_HOST} - username: ${TSW_SFTP_USER} - priv-key: ${grad_vms_id_rsa} - pub-key: ${grad_vms_id_rsa.pub} - known-hosts: ${TSW_KNOWN_HOSTS_ENTRY} endpoint: keycloak: diff --git a/api/src/test/resources/application.yaml b/api/src/test/resources/application.yaml index cd725935..7f784568 100644 --- a/api/src/test/resources/application.yaml +++ b/api/src/test/resources/application.yaml @@ -91,13 +91,7 @@ sftp: pub-key: 676 known-hosts: 45fsdss location: /Index/Dev - tsw: - host: 454@tsw.aril.com - username: tswmail - priv-key: 565 - pub-key: 888 - known-hosts: 5644ddww - + #Endpoints endpoint: keycloak: @@ -173,4 +167,4 @@ splunk: enabled: false scheduler: - clean-tmp-cache-cron: 0 0 */4 * * * \ No newline at end of file + clean-tmp-cache-cron: 0 0 */4 * * *