18263 - New queues use PUB/SUB

.github/workflows/events-listener-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - queue_python_upgrade
     paths:
       - "queue_services/events-listener/**"
       - "pay-api/src/pay_api/models/**"

.github/workflows/payment-reconciliations-ci.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - queue_python_upgrade
     paths:
       - "queue_services/payment-reconciliations/**"
       - "pay-api/src/pay_api/models/**"

queue_services/payment-reconciliations/README.md

@@ -3,63 +3,16 @@
 
 
 # Application Name
-
-BC Registries Payments system API
+BC Registries Payment Reconciliation Queue
 
 ## Technology Stack Used
 * Python, Flask
 * Postgres -  SQLAlchemy, psycopg2-binary & alembic
 
-## Third-Party Products/Libraries used and the the License they are covert by
-
-## Project Status
-As of 2018-02-22 in **ALPHA**
-
-## Documnentation
-
-GitHub Pages (https://guides.github.com/features/pages/) are a neat way to document you application/project.
-
-## Security
-
-Future - BCGov Keycloak
-
-Current - JWT hack
-
-## Files in this repository
-
-```
-docs/           - Project Documentation
-└── images
-└── icons
-
-openshift/      - OpenShift-specific files
-├── scripts     - helper scripts
-└── templates   - application templates
-```
-
-## Deployment (Local Development)
-
-* Developer Workstation Requirements/Setup
-* Application Specific Setup
-
-## Deployment (OpenShift)
-
-See (openshift/Readme.md)
-
-## Getting Help or Reporting an Issue
-
-To report bugs/issues/feature requests, please file an [issue](../../issues).
-
-## How to Contribute
-
-If you would like to contribute, please see our [CONTRIBUTING](./CONTRIBUTING.md) guidelines.
-
-Please note that this project is released with a [Contributor Code of Conduct](./CODE_OF_CONDUCT.md).
-By participating in this project you agree to abide by its terms.
 
 ## License
 
-    Copyright 2018 Province of British Columbia
+    Copyright 2024 Province of British Columbia
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

queue_services/payment-reconciliations/app.py

@@ -14,22 +14,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""s2i based launch script to run the service."""
-import asyncio
+"""Provides the WSGI entry point for running the application."""
 import os
 
-from reconciliations.worker import APP_CONFIG, cb_subscription_handler, qsm
+from reconciliations import create_app
 
+app = create_app()
 
 if __name__ == '__main__':
-
-    # my_config = config.get_named_config(os.getenv('DEPLOYMENT_ENV', 'production'))
-
-    event_loop = asyncio.get_event_loop()
-    event_loop.run_until_complete(qsm.run(loop=event_loop,
-                                          config=APP_CONFIG,
-                                          callback=cb_subscription_handler))
-    try:
-        event_loop.run_forever()
-    finally:
-        event_loop.close()
+    server_port = os.environ.get('PORT', '8080')
+    app.run(debug=False, port=server_port, host='0.0.0.0')

queue_services/payment-reconciliations/requirements.txt

@@ -1,93 +1,84 @@
--e git+https://github.com/bcgov/lear.git@30dba30463c99aaedfdcfd463213e71ba0d35b51#egg=entity_queue_common&subdirectory=queue_services/common
--e git+https://github.com/bcgov/sbc-common-components.git@b93585ea3ac273b9e51c4dd5ddbc8190fd95da6a#egg=sbc_common_components&subdirectory=python
--e git+https://github.com/bcgov/sbc-pay.git@6d4a94c8d78f11322487f93eb65ec6e9d5238b35#egg=pay_api&subdirectory=pay-api
-Flask-Caching==2.0.2
+-e git+https://github.com/bcgov/sbc-common-components.git@5807c201b057875f9061f60b408ab765ebaa4235#egg=sbc_common_components&subdirectory=python
+-e git+https://github.com/bcgov/sbc-pay.git@b33d8e36435060a30f3cdd14c3d05a3a949d3b5a#egg=pay_api&subdirectory=pay-api
+-e git+https://github.com/bolyachevets/namex.git@d856f2be4dded0fd3c33b3bfb6da280e4c54a848#egg=gcp_queue&subdirectory=services/pubsub
+-e git+https://github.com/thorwolpert/flask-jwt-oidc.git@40cc811ccf70e838c5f7522fe8d83b7e58853539#egg=flask_jwt_oidc
+Flask-Caching==2.1.0
+Flask-Cors==4.0.0
 Flask-Migrate==2.7.0
 Flask-Moment==1.0.5
-Flask-OpenTracing==1.1.0
-Flask-SQLAlchemy==2.5.1
+Flask-OpenTracing==2.0.0
+Flask-SQLAlchemy==3.1.1
 Flask-Script==2.0.6
-Flask==1.1.2
-Jinja2==3.0.3
-Mako==1.2.4
-MarkupSafe==2.1.3
-PyMeeus==0.5.12
-SQLAlchemy-Continuum==1.3.15
+Flask==2.3.3
+Jinja2==3.1.3
+Mako==1.3.2
+MarkupSafe==2.1.5
 SQLAlchemy-Utils==0.41.1
-SQLAlchemy==1.3.24
-Werkzeug==1.0.1
-aiohttp==3.9.2
-aiosignal==1.3.1
-alembic==1.11.1
-aniso8601==9.0.1
-async-timeout==4.0.2
+SQLAlchemy==2.0.28
+Werkzeug==3.0.1
+alembic==1.13.1
+argon2-cffi-bindings==21.2.0
+argon2-cffi==23.1.0
 asyncio-nats-client==0.11.5
 asyncio-nats-streaming==0.4.0
-attrs==23.1.0
-blinker==1.6.2
+attrs==23.2.0
+blinker==1.7.0
 cachelib==0.9.0
-cachetools==5.3.1
-cattrs==23.1.2
-certifi==2023.7.22
-cffi==1.15.1
-charset-normalizer==3.1.0
-click==8.1.3
-convertdate==2.4.0
-croniter==1.4.1
-cryptography==42.0.2
+cachetools==5.3.3
+cattrs==23.2.3
+certifi==2024.2.2
+cffi==1.16.0
+charset-normalizer==3.3.2
+click==8.1.7
+croniter==2.0.2
+cryptography==42.0.5
 dpath==2.1.6
 ecdsa==0.18.0
-exceptiongroup==1.1.1
 expiringdict==1.2.2
-flask-jwt-oidc==0.3.0
-flask-marshmallow==0.11.0
-flask-restx==1.1.0
-frozenlist==1.3.3
-google-api-core==2.11.1
-google-auth==2.18.1
-google-cloud-pubsub==2.17.0
-googleapis-common-protos==1.59.1
-grpc-google-iam-v1==0.12.6
-grpcio-status==1.48.2
-grpcio==1.54.3
-gunicorn==20.1.0
-hijri-converter==2.3.1
+flask-marshmallow==1.2.0
+google-api-core==2.17.1
+google-auth==2.28.1
+google-cloud-pubsub==2.20.0
+googleapis-common-protos==1.62.0
+greenlet==3.0.3
+grpc-google-iam-v1==0.13.0
+grpcio-status==1.62.0
+grpcio==1.62.0
+gunicorn==21.2.0
 holidays==0.37
-idna==3.4
-itsdangerous==2.0.1
+idna==3.6
+itsdangerous==2.1.2
 jaeger-client==4.8.0
 jsonschema==4.17.3
-korean-lunar-calendar==0.3.1
-launchdarkly-server-sdk==8.1.4
-marshmallow-sqlalchemy==0.25.0
-marshmallow==3.19.0
-minio==7.1.15
-multidict==6.0.4
+launchdarkly-eventsource==1.1.1
+launchdarkly-server-sdk==9.2.1
+marshmallow-sqlalchemy==1.0.0
+marshmallow==3.21.1
+minio==7.2.5
 opentracing==2.4.0
-packaging==23.1
-proto-plus==1.22.2
-protobuf==3.19.6
-psycopg2-binary==2.9.6
+packaging==23.2
+proto-plus==1.23.0
+protobuf==4.25.3
+psycopg2-binary==2.9.9
 pyRFC3339==1.1
 pyasn1-modules==0.3.0
-pyasn1==0.5.0
-pycountry==22.3.5
+pyasn1==0.5.1
+pycountry==23.12.11
 pycparser==2.21
-pyrsistent==0.19.3
-python-dateutil==2.8.2
-python-dotenv==1.0.0
+pycryptodome==3.20.0
+pyrsistent==0.20.0
+python-dateutil==2.9.0.post0
+python-dotenv==1.0.1
 python-jose==3.3.0
-pytz==2023.3
+pytz==2024.1
 requests==2.31.0
 rsa==4.9
-semver==2.13.0
-sentry-sdk==1.26.0
-simple-cloudevent @ git+https://github.com/daxiom/simple-cloudevent.py.git@447cabb988202206ac69e71177d7cd11b6c0b002
+semver==3.0.2
+sentry-sdk==1.40.6
 six==1.16.0
 strict-rfc3339==0.7
 threadloop==1.0.2
 thrift==0.16.0
-tornado==6.3.3
-typing_extensions==4.6.3
-urllib3==1.26.17
-yarl==1.9.2
+tornado==6.4
+typing_extensions==4.10.0
+urllib3==2.2.1