From fd6929842895132a2a52cae0cae6b80deec2d6cc Mon Sep 17 00:00:00 2001 From: SKairinos Date: Tue, 31 Dec 2024 11:02:49 +0000 Subject: [PATCH] fix: use new cfl package --- .deploy/rds.json | 6 ------ .deploy/service.json | 6 ++++-- Pipfile | 4 ++-- Pipfile.lock | 22 +++++++++++----------- 4 files changed, 17 insertions(+), 21 deletions(-) delete mode 100644 .deploy/rds.json diff --git a/.deploy/rds.json b/.deploy/rds.json deleted file mode 100644 index 225797e..0000000 --- a/.deploy/rds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "databaseName": "REPLACE_IN_PIPELINE", - "schemaName": "REPLACE_IN_PIPELINE", - "engine": "REPLACE_IN_PIPELINE", - "nodeType": "S_XSMALL" -} diff --git a/.deploy/service.json b/.deploy/service.json index f638dea..7914cc3 100644 --- a/.deploy/service.json +++ b/.deploy/service.json @@ -1,5 +1,6 @@ { "type": "rolling", + "secondaryServerGroupName": "REPLACE_IN_PIPELINE", "targetPlatform": "REPLACE_IN_PIPELINE", "applicationData": { "artifactUrl": "REPLACE_IN_PIPELINE", @@ -10,8 +11,8 @@ "pythonVersion": "REPLACE_IN_PIPELINE" }, "profiles": [ - { "name": "loadBalancer", "healthCheckPath": "/health-check/" }, - { "name": "healthcheck", "interval": 30 }, + { "name": "loadBalancer", "healthCheckPath": "REPLACE_IN_PIPELINE" }, + { "name": "healthcheck", "interval": "REPLACE_IN_PIPELINE" }, { "name": "environmentVariables", "variables": { @@ -22,6 +23,7 @@ "ENV": "REPLACE_IN_PIPELINE", "SERVICE_PROTOCOL": "REPLACE_IN_PIPELINE", "SERVICE_PORT": "REPLACE_IN_PIPELINE", + "SERVICE_SITE_URL": "REPLACE_IN_PIPELINE", "MAIL_ENABLED": "REPLACE_IN_PIPELINE", "STATIC_URL": "REPLACE_IN_PIPELINE", "AWS_STORAGE_BUCKET_NAME": "REPLACE_IN_PIPELINE", diff --git a/Pipfile b/Pipfile index 3eba067..45c5ebc 100644 --- a/Pipfile +++ b/Pipfile @@ -22,11 +22,11 @@ name = "pypi" # 5. Run `pipenv install --dev` in your terminal. [packages] -codeforlife = "==0.24.4" +codeforlife = "==0.24.6" # 🚫 Don't add [packages] below that are inherited from the CFL package. [dev-packages] -codeforlife = {version = "==0.24.4", extras = ["dev"]} +codeforlife = {version = "==0.24.6", extras = ["dev"]} # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]} # 🚫 Don't add [dev-packages] below that are inherited from the CFL package. diff --git a/Pipfile.lock b/Pipfile.lock index c577ed2..4907be5 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cfe32d36a2ce6fc24c9ab73deb0db42b98c332c9ccda8e32d6827a65222270f5" + "sha256": "402c673584ffcc02f8a1dea545f0ec7e67e4fded4f6b9b7a306854d91d484ef2" }, "pipfile-spec": 6, "requires": { @@ -176,12 +176,12 @@ }, "codeforlife": { "hashes": [ - "sha256:23cd9b242987ed7a6f8fbc808ad219b327b8008abe96aec0f2722eb36f672118", - "sha256:5553f159e245bd7119d4ea5e6f5c3b0d46ee9dfe5f8f474148540ef8db65a4d9" + "sha256:1a1097780a42002d768288d452526c647263bde5b7eca19496c3a135ba9a8b8e", + "sha256:895a69393daeb77c4eee721a35893466d1a82d27b40de6c28faa3f4cae629caf" ], "index": "pypi", "markers": "python_version == '3.12'", - "version": "==0.24.4" + "version": "==0.24.6" }, "codeforlife-portal": { "hashes": [ @@ -734,7 +734,7 @@ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "python-dotenv": { @@ -906,7 +906,7 @@ "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.17.0" }, "sqlparse": { @@ -1186,12 +1186,12 @@ }, "codeforlife": { "hashes": [ - "sha256:23cd9b242987ed7a6f8fbc808ad219b327b8008abe96aec0f2722eb36f672118", - "sha256:5553f159e245bd7119d4ea5e6f5c3b0d46ee9dfe5f8f474148540ef8db65a4d9" + "sha256:1a1097780a42002d768288d452526c647263bde5b7eca19496c3a135ba9a8b8e", + "sha256:895a69393daeb77c4eee721a35893466d1a82d27b40de6c28faa3f4cae629caf" ], "index": "pypi", "markers": "python_version == '3.12'", - "version": "==0.24.4" + "version": "==0.24.6" }, "codeforlife-portal": { "hashes": [ @@ -2094,7 +2094,7 @@ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "python-dotenv": { @@ -2266,7 +2266,7 @@ "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.17.0" }, "sqlparse": {