Tracking pull request to merge release-2.7.0 to master (#2320)

* set 2.7.0

* update pr number

* reduce the backend workers to 2

* increase spilo cpu

* update notificastion server cpu usage

* chore: updated cryptography package

* Bump requests from 2.28.1 to 2.31.0 in /backend

Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.28.1...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: tfrs-2181 - squash migrations

* Compliance Report slow loading time fix

Compliance Report Model changes to include latest_report and root_report information
To migrate the data to these new columns
Using select_related and prefetch_related wherever necessary
Making use of the new columns in data retrieval

* minor fixes

* review comments fixes

* remove cache logic

Since cache wasn't showing the updated details. have removed it for now.

* fix: updated babelrc file

* chore: package.json updates

* compliance & exclusion report save issue

* code redundancy fix

* fix for Director is not able to accept compliance report

* Exclusion Report not visible to IDIR users fix

- Added cache for Compliance Report & Organizations
- changes to ComplianceReport Query to retrieve latest reports

* minor typo fixes

* feat: updated maxCredits service method to account for reserved credits

* fix: updated cache_key to sanitize spaces

* updated credit balance display logic

* add new test approval resource

* bug and failed test cases fix

* revert unintended squash change

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Your Name <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Zorkin <[email protected]>
Co-authored-by: tim738745 <[email protected]>
Co-authored-by: Prashanth Venkateshappa <[email protected]>
Co-authored-by: jig-patel <[email protected]>
Co-authored-by: Prashanth <[email protected]>

.github/workflows/tfrs-release.yaml

@@ -1,11 +1,11 @@
 ## For each release, the value of name, branches, RELEASE_NAME and PR_NUMBER need to be adjusted accordingly
 ## For each release, update lib/config.js: version and releaseBranch
 
-name: TFRS release-2.6.0
+name: TFRS release-2.7.0
 
 on:
   push:
-    branches: [ release-2.6.0 ]
+    branches: [ release-2.7.0 ]
     paths:
       - frontend/**
       - backend/**
@@ -15,8 +15,8 @@ on:
 env:
   ## The pull request number of the Tracking pull request to merge the release branch to main
   ## Also remember to update the version in .pipeline/lib/config.js
-  PR_NUMBER: 2236
-  RELEASE_NAME: release-2.6.0
+  PR_NUMBER: 2320
+  RELEASE_NAME: release-2.7.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -153,7 +153,7 @@ jobs:
         uses: trstringer/[email protected]
         with:
           secret: ${{ github.TOKEN }}
-          approvers: AlexZorkin,emi-hi,tim738745,kuanfandevops,jig-patel
+          approvers: AlexZorkin,emi-hi,tim738745,kuanfandevops,jig-patel,prv-proton
           minimum-approvals: 1
           issue-title: "TFRS ${{ env.RELEASE_NAME }} Test Deployment"
 

.pipeline/lib/config.js

@@ -1,7 +1,7 @@
 'use strict';
 const options= require('@bcgov/pipeline-cli').Util.parseArguments()
 const changeId = options.pr //aka pull-request
-const version = '2.6.0'
+const version = '2.7.0'
 const name = 'tfrs'
 const ocpName = 'apps.silver.devops'
 
@@ -13,7 +13,7 @@ options.git.repository='tfrs'
 const phases = {
   build: {  namespace:'0ab226-tools'    , name: `${name}`, phase: 'build'  , changeId:changeId, suffix: `-build-${changeId}`  , 
             instance: `${name}-build-${changeId}`  , version:`${version}-${changeId}`, tag:`build-${version}-${changeId}`,
-            releaseBranch: 'release-2.6.0'
+            releaseBranch: 'release-2.7.0'
           },
   dev: {namespace:'0ab226-dev'    , name: `${name}`, phase: 'dev'  , changeId:changeId, suffix: `-dev`  , 
         instance: `${name}-dev`  , version:`${version}`, tag:`dev-${version}`, dbServiceName: 'tfrs-spilo',
@@ -51,7 +51,7 @@ const phases = {
         celeryCpuRequest: '100m', celeryCpuLimit: '250m', celeryMemoryRequest: '1600Mi', celeryMemoryLimit: '3Gi',
         scanHandlerCpuRequest: '25m', scanHandlerCpuLimit: '50m', scanHandlerMemoryRequest: '50Mi', scanHandlerMemoryLimit: '100Mi',
         scanCoordinatorCpuRequest: '50m', scanCoordinatorCpuLimit: '100m', scanCoordinatorMemoryRequest: '30Mi', scanCoordinatorMemoryLimit: '60Mi',
-        notificationServerCpuRequest: '25m', notificationServerCpuLimit: '50m', notificationServerMemoryRequest: '100Mi', notificationServerMemoryLimit: '200Mi',
+        notificationServerCpuRequest: '100m', notificationServerCpuLimit: '200m', notificationServerMemoryRequest: '120Mi', notificationServerMemoryLimit: '240Mi',
         patroniCpuRequest: '300m', patroniCpuLimit: '700m', patroniMemoryRequest: '250Mi', patroniMemoryLimit: '1Gi', patroniPvcSize: '3Gi', 
             patroniReplica: 2, storageClass: 'netapp-block-standard', ocpName: `${ocpName}`,
         rabbitmqCpuRequest: '250m', rabbitmqCpuLimit: '400m', rabbitmqMemoryRequest: '500Mi', rabbitmqMemoryLimit: '1Gi', rabbitmqPvcSize: '1Gi', 
@@ -73,7 +73,7 @@ const phases = {
         celeryCpuRequest: '100m', celeryCpuLimit: '250mm', celeryMemoryRequest: '1600Mi', celeryMemoryLimit: '3Gi',
         scanHandlerCpuRequest: '25m', scanHandlerCpuLimit: '50m', scanHandlerMemoryRequest: '50Mi', scanHandlerMemoryLimit: '100Mi',
         scanCoordinatorCpuRequest: '50m', scanCoordinatorCpuLimit: '100m', scanCoordinatorMemoryRequest: '30Mi', scanCoordinatorMemoryLimit: '60Mi',
-        notificationServerCpuRequest: '25m', notificationServerCpuLimit: '50m', notificationServerMemoryRequest: '100Mi', notificationServerMemoryLimit: '200Mi',
+        notificationServerCpuRequest: '100m', notificationServerCpuLimit: '200m', notificationServerMemoryRequest: '120Mi', notificationServerMemoryLimit: '240Mi',
         patroniCpuRequest: '300m', patroniCpuLimit: '600m', patroniMemoryRequest: '500Mi', patroniMemoryLimit: '2Gi', patroniPvcSize: '10Gi', 
             patroniReplica: 3, storageClass: 'netapp-block-standard', ocpName: `${ocpName}`,
         rabbitmqCpuRequest: '250m', rabbitmqCpuLimit: '400m', rabbitmqMemoryRequest: '500Mi', rabbitmqMemoryLimit: '1Gi', rabbitmqPvcSize: '1Gi', 

backend/api/fixtures/test/test_compliance_reporting.json

@@ -41,7 +41,11 @@
       "compliance_period": [
         "2018"
       ],
-      "create_timestamp": "2019-01-01"
+      "create_timestamp": "2019-01-01",
+      "update_timestamp": "2019-01-01",
+      "root_report": 1,
+      "latest_report": 1,
+      "traversal": 0
     },
     "model": "api.compliancereport",
     "pk": 1
@@ -58,7 +62,11 @@
       "compliance_period": [
         "2018"
       ],
-      "create_timestamp": "2019-01-01"
+      "create_timestamp": "2019-01-01",
+      "update_timestamp": "2019-01-01",
+      "root_report": 2,
+      "latest_report": 2,
+      "traversal": 0
     },
     "model": "api.compliancereport",
     "pk": 2
@@ -75,7 +83,11 @@
       "compliance_period": [
         "2019"
       ],
-      "create_timestamp": "2019-01-01"
+      "create_timestamp": "2019-01-01",
+      "update_timestamp": "2019-01-01",
+      "root_report": 3,
+      "latest_report": 3,
+      "traversal": 0
     },
     "model": "api.compliancereport",
     "pk": 3