Merge branch 'develop' into dependabot/npm_and_yarn/prime-angular-fro…

…ntend/follow-redirects-1.15.6

.github/workflows/build-pr.yml

@@ -4,7 +4,6 @@ on:
   push:
     paths-ignore: # do NOT trigger on changes to backup service.
     - prime-database-backup/**
-    - .github/workflows/build-deploy-backup-dev.yml
     branches-ignore:
     - 'develop'
     - 'test'
@@ -13,7 +12,6 @@ on:
   pull_request:
     paths-ignore:
     - prime-database-backup/**
-    - .github/workflows/build-deploy-backup-dev.yml
     branches-ignore:
     - 'develop'
     - 'test'

.github/workflows/test-pr.yml

@@ -12,7 +12,7 @@ jobs:
     defaults:
       run:
         working-directory: ./prime-angular-frontend
-  
+
     if: github.ref != 'develop' || (github.ref == 'develop' && github.event.pull_request.merged == true)
 
     runs-on: ubuntu-latest
@@ -59,15 +59,15 @@ jobs:
       - name: Collect Frontend Report
         run: |
           cc-test-reporter format-coverage -t lcov -o coverage/frontend.json coverage/lcov.info
-      
+
       - name: Create frontend coverage file artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: frontend
           path: ./prime-angular-frontend/coverage/frontend.json
           retention-days: 1
 
-  
+
   collect-backend-coverage:
     defaults:
       run:
@@ -101,7 +101,7 @@ jobs:
         run: |
           cd ../
           dotnet tool install -g dotnet-reportgenerator-globaltool --version 5.3.6
-        
+
       - uses: amancevice/setup-code-climate@v0
         with:
           cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }}
@@ -122,12 +122,12 @@ jobs:
           cd ../prime-dotnet-webapi
           cc-test-reporter format-coverage -t lcov -o ../prime-dotnet-webapi-tests/coverage/backend.json ../prime-dotnet-webapi-tests/coverage/lcov.info -p /home/runner/work/moh-prime/moh-prime/prime-dotnet-webapi
       - name: Create backend coverage file artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: backend
           path: ./prime-dotnet-webapi-tests/coverage/backend.json
           retention-days: 1
-          
+
 
   codeclimate-sum-coverage:
     needs: [ collect-frontend-coverage, collect-backend-coverage ]
@@ -146,25 +146,25 @@ jobs:
           cc_test_reporter_version: latest  # optional
 
       - name: Download frontend artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: frontend
           # path: frontend/
 
       - name: Download backend artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: backend
           # path: backend/
 
       - name: Sum files
-        run: |          
+        run: |
           cc-test-reporter sum-coverage -p 2 frontend.json backend.json
           cc-test-reporter upload-coverage -i ./coverage/codeclimate.json
-      
+
       - name: Create summed report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: summed
           path: ./coverage/codeclimate.json
-          retention-days: 1
+          retention-days: 1

document-manager/backend/.env-local

@@ -1,5 +1,5 @@
 DB_HOST=postgres
-SQLALCHEMY_DATABASE_URI=postgres://postgres:postgres@postgres:5432/postgres
+SQLALCHEMY_DATABASE_URI=postgresql://postgres:postgres@postgres:5432/postgres
 
 # Used for building Location header redirects back to ourselves
 DOCUMENT_MANAGER_URL=http://localhost:6001

document-manager/backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.12.4
 SHELL ["/bin/bash","-c"]
 
 # Update installation utility

document-manager/backend/Dockerfile.migrate

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.12.4
 SHELL ["/bin/bash","-c"]
 
 # Update installation utility

document-manager/backend/app/__init__.py

@@ -4,8 +4,8 @@
 
 from flask import Flask, current_app, request
 from flask_cors import CORS
-from flask_restplus import Resource
-from flask_restplus.apidoc import apidoc
+from flask_restx import Resource
+from flask_restx.apidoc import apidoc
 from flask_migrate import MigrateCommand
 
 from flask_jwt_oidc.exceptions import AuthError

document-manager/backend/app/docman/resources/document.py

@@ -5,7 +5,7 @@
 
 from werkzeug.exceptions import BadRequest, NotFound, Conflict, RequestEntityTooLarge, InternalServerError
 from flask import request, current_app, send_file, make_response, jsonify
-from flask_restplus import Resource, reqparse
+from flask_restx import Resource, reqparse
 
 from app.docman.models.document import Document
 from app.extensions import api, cache, jwt
@@ -307,8 +307,8 @@ def get(self, document_guid):
         if not doc:
             raise NotFound()
 
-        return send_file(filename_or_fp=doc.full_storage_path,
-                         attachment_filename=doc.filename,
+        return send_file(path_or_file=doc.full_storage_path,
+                         download_name=doc.filename,
                          as_attachment=True)
 
 
@@ -348,6 +348,6 @@ def get(self, token):
         if not doc:
             raise NotFound('Could not find document')
 
-        return send_file(filename_or_fp=doc.full_storage_path,
-                         attachment_filename=doc.filename,
+        return send_file(path_or_file=doc.full_storage_path,
+                         download_name=doc.filename,
                          as_attachment=True)

document-manager/backend/app/helper.py

@@ -1,5 +1,5 @@
 from flask import url_for
-from flask_restplus import Api as BaseApi
+from flask_restx import Api as BaseApi
 
 
 class Api(BaseApi):

document-manager/backend/app/routes.py

@@ -3,7 +3,7 @@
 from .healthcheck import *
 
 from flask_jwt_oidc.exceptions import AuthError
-from flask_restplus import Resource
+from flask_restx import Resource
 from healthcheck import HealthCheck
 
 

document-manager/backend/app/utils/custom_reqparser.py

@@ -1,4 +1,4 @@
-from flask_restplus import reqparse
+from flask_restx import reqparse
 from werkzeug.exceptions import BadRequest
 
 DEFAULT_MISSING_REQUIRED = 'Missing required argument.'

document-manager/backend/openshift.dockerfile

@@ -1,4 +1,4 @@
-FROM public.ecr.aws/bitnami/python:3.6-prod
+FROM public.ecr.aws/bitnami/python:3.12.4
 
 WORKDIR /opt/app-root/src
 

document-manager/backend/requirements.txt

@@ -1,26 +1,32 @@
+blinker==1.8.2
 cached_property==1.5.1
+click==8.1.7
+colorama==0.4.6
 factory-boy==2.12.0
-Flask==1.0.3
+Flask==2.3.2
 Flask-APScheduler==1.11.0
-Flask-Caching==1.7.2
-Flask-Cors==3.0.9
+Flask-Caching==2.0.2
+Flask-Cors==4.0.1
 flask-compress==1.4.0
 Flask-Migrate==2.5.2
-flask-restplus==0.12.1
-Flask-SQLAlchemy==2.4.0
+flask-restx==1.1.0
+Flask-SQLAlchemy==3.0.5
 flask_jwt_oidc==0.1.5
+itsdangerous==2.2.0
+Jinja2==3.1.4
+MarkupSafe==2.1.5
 postgres==3.0.0
-psycopg2==2.8.2
-psycopg2-binary==2.8.2
+psycopg2==2.9.6
+psycopg2-binary==2.9.6
 py-healthcheck==1.10.1
 pytest==4.5.0
 pytest-cov==2.7.1
 python-dateutil==2.8.0
 python-dotenv==0.10.2
 python-magic==0.4.18
 redis==3.2.1
-requests==2.22.0
-SQLAlchemy==1.3.4
-uwsgi==2.0.18
+requests==2.32.0
+SQLAlchemy==2.0.19
+uwsgi==2.0.23
 uwsgitop==0.11
-Werkzeug==0.15.4
+Werkzeug==3.0.3

infrastructure/prime-app-ephemeral-template.yml

@@ -198,7 +198,7 @@ objects:
             "url": "",
             "realm": "",
             "clientId": ""
-          }      
+          }
         }
       }
 
@@ -688,6 +688,8 @@ objects:
                   name: pharmanet-api
               - configMapRef:
                   name: verifiable-credential
+              - configMapRef:
+                  name: provider-enrolment-team
               - secretRef:
                   name: canada-post-addresscomplete-secrets
               - secretRef:
@@ -839,7 +841,7 @@ objects:
                   name: keycloak
                   key: JWT_WELL_KNOWN_CONFIG
             - name: SQLALCHEMY_DATABASE_URI
-              value: "postgres://$(PGUSER):$(PGPASSWORD)@$(PGHOST):5432/$(PGDATABASE)"
+              value: "postgresql://$(PGUSER):$(PGPASSWORD)@$(PGHOST):5432/$(PGDATABASE)"
           envFrom:
             - configMapRef:
                 name: document-manager
@@ -888,7 +890,7 @@ objects:
                     name: keycloak
                     key: JWT_WELL_KNOWN_CONFIG
               - name: SQLALCHEMY_DATABASE_URI
-                value: "postgres://$(PGUSER):$(PGPASSWORD)@$(PGHOST):5432/$(PGDATABASE)"
+                value: "postgresql://$(PGUSER):$(PGPASSWORD)@$(PGHOST):5432/$(PGDATABASE)"
             envFrom:
               - configMapRef:
                   name: document-manager
@@ -997,7 +999,7 @@ objects:
                 memory: 100Mi
               requests:
                 cpu: 5m
-                memory: 50Mi 
+                memory: 50Mi
             readinessProbe:
               exec:
                 command: