From 4b8ad438f25049b1089042e249e7f2bd38b38a2b Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:05:37 -0700
Subject: [PATCH 01/39] notify-admin-550

---
 .github/workflows/checks.yml |   6 ++
 poetry.lock                  | 187 ++++++++++++++++++++---------------
 2 files changed, 111 insertions(+), 82 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index bf775fc63..fc6590d51 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -55,6 +55,12 @@ jobs:
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
+      - name: Health check
+        if: if [[ $(curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* ]]
+          uses: actions/github-script@v3
+          with:
+            script: |
+              core.setFailed('Health check failed')
 
   validate-new-relic-config:
     runs-on: ubuntu-latest
diff --git a/poetry.lock b/poetry.lock
index d9e0a0ac7..779c6847b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -155,19 +155,30 @@ files = [
     {file = "blinker-1.6.2.tar.gz", hash = "sha256:4afd3de66ef3a9f8067559fb7a1cbe555c17dcbe15971b05d1b625c3e7abe213"},
 ]
 
+[[package]]
+name = "boolean-py"
+version = "4.0"
+description = "Define boolean algebras, create and parse boolean expressions and create custom boolean DSL."
+optional = false
+python-versions = "*"
+files = [
+    {file = "boolean.py-4.0-py3-none-any.whl", hash = "sha256:2876f2051d7d6394a531d82dc6eb407faa0b01a0a0b3083817ccd7323b8d96bd"},
+    {file = "boolean.py-4.0.tar.gz", hash = "sha256:17b9a181630e43dde1851d42bef546d616d5d9b4480357514597e78b203d06e4"},
+]
+
 [[package]]
 name = "boto3"
-version = "1.28.40"
+version = "1.28.46"
 description = "The AWS SDK for Python"
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "boto3-1.28.40-py3-none-any.whl", hash = "sha256:bd7c760afb195eaeaab907dc6b2c21fa64ddbba3fed4a869e80d820ddbd6cc70"},
-    {file = "boto3-1.28.40.tar.gz", hash = "sha256:6ff9a5b815e106656596064d51c9b6ba97a307807baa5f89634384b7d3f7ecc6"},
+    {file = "boto3-1.28.46-py3-none-any.whl", hash = "sha256:04445d70127c25fad69e2cab7e3f5cb219c8d6e60463af3657f20e29ac517957"},
+    {file = "boto3-1.28.46.tar.gz", hash = "sha256:2ca2852f7b7c1bc2e56f10f968d4c8483c8228b935ecd89a444ae8292ad0dc24"},
 ]
 
 [package.dependencies]
-botocore = ">=1.31.40,<1.32.0"
+botocore = ">=1.31.46,<1.32.0"
 jmespath = ">=0.7.1,<2.0.0"
 s3transfer = ">=0.6.0,<0.7.0"
 
@@ -176,13 +187,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
 
 [[package]]
 name = "botocore"
-version = "1.31.40"
+version = "1.31.46"
 description = "Low-level, data-driven core of boto 3."
 optional = false
 python-versions = ">= 3.7"
 files = [
-    {file = "botocore-1.31.40-py3-none-any.whl", hash = "sha256:df766969f0d9ef9eda1a9c9946e0e173c10199f37a9e4c92861f11ddb5c9e702"},
-    {file = "botocore-1.31.40.tar.gz", hash = "sha256:ce22a82ef8674f49691477d09558992cc87e7331f65c6a5b0da897ab192240ca"},
+    {file = "botocore-1.31.46-py3-none-any.whl", hash = "sha256:ac0c1258b1782cde42950bd00138fdce6bd7d04855296af8c326d5844a426473"},
+    {file = "botocore-1.31.46.tar.gz", hash = "sha256:6c30be3371624a80d6a881d9c7771a80e0eb82697ee374aaf522cd59b76e14dd"},
 ]
 
 [package.dependencies]
@@ -472,63 +483,63 @@ files = [
 
 [[package]]
 name = "coverage"
-version = "7.3.0"
+version = "7.3.1"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db76a1bcb51f02b2007adacbed4c88b6dee75342c37b05d1822815eed19edee5"},
-    {file = "coverage-7.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c02cfa6c36144ab334d556989406837336c1d05215a9bdf44c0bc1d1ac1cb637"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:477c9430ad5d1b80b07f3c12f7120eef40bfbf849e9e7859e53b9c93b922d2af"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce2ee86ca75f9f96072295c5ebb4ef2a43cecf2870b0ca5e7a1cbdd929cf67e1"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68d8a0426b49c053013e631c0cdc09b952d857efa8f68121746b339912d27a12"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b3eb0c93e2ea6445b2173da48cb548364f8f65bf68f3d090404080d338e3a689"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:90b6e2f0f66750c5a1178ffa9370dec6c508a8ca5265c42fbad3ccac210a7977"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96d7d761aea65b291a98c84e1250cd57b5b51726821a6f2f8df65db89363be51"},
-    {file = "coverage-7.3.0-cp310-cp310-win32.whl", hash = "sha256:63c5b8ecbc3b3d5eb3a9d873dec60afc0cd5ff9d9f1c75981d8c31cfe4df8527"},
-    {file = "coverage-7.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:97c44f4ee13bce914272589b6b41165bbb650e48fdb7bd5493a38bde8de730a1"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74c160285f2dfe0acf0f72d425f3e970b21b6de04157fc65adc9fd07ee44177f"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b543302a3707245d454fc49b8ecd2c2d5982b50eb63f3535244fd79a4be0c99d"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad0f87826c4ebd3ef484502e79b39614e9c03a5d1510cfb623f4a4a051edc6fd"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:13c6cbbd5f31211d8fdb477f0f7b03438591bdd077054076eec362cf2207b4a7"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fac440c43e9b479d1241fe9d768645e7ccec3fb65dc3a5f6e90675e75c3f3e3a"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3c9834d5e3df9d2aba0275c9f67989c590e05732439b3318fa37a725dff51e74"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4c8e31cf29b60859876474034a83f59a14381af50cbe8a9dbaadbf70adc4b214"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7a9baf8e230f9621f8e1d00c580394a0aa328fdac0df2b3f8384387c44083c0f"},
-    {file = "coverage-7.3.0-cp311-cp311-win32.whl", hash = "sha256:ccc51713b5581e12f93ccb9c5e39e8b5d4b16776d584c0f5e9e4e63381356482"},
-    {file = "coverage-7.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:887665f00ea4e488501ba755a0e3c2cfd6278e846ada3185f42d391ef95e7e70"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d000a739f9feed900381605a12a61f7aaced6beae832719ae0d15058a1e81c1b"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:59777652e245bb1e300e620ce2bef0d341945842e4eb888c23a7f1d9e143c446"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9737bc49a9255d78da085fa04f628a310c2332b187cd49b958b0e494c125071"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5247bab12f84a1d608213b96b8af0cbb30d090d705b6663ad794c2f2a5e5b9fe"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2ac9a1de294773b9fa77447ab7e529cf4fe3910f6a0832816e5f3d538cfea9a"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:85b7335c22455ec12444cec0d600533a238d6439d8d709d545158c1208483873"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:36ce5d43a072a036f287029a55b5c6a0e9bd73db58961a273b6dc11a2c6eb9c2"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:211a4576e984f96d9fce61766ffaed0115d5dab1419e4f63d6992b480c2bd60b"},
-    {file = "coverage-7.3.0-cp312-cp312-win32.whl", hash = "sha256:56afbf41fa4a7b27f6635bc4289050ac3ab7951b8a821bca46f5b024500e6321"},
-    {file = "coverage-7.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f297e0c1ae55300ff688568b04ff26b01c13dfbf4c9d2b7d0cb688ac60df479"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac0dec90e7de0087d3d95fa0533e1d2d722dcc008bc7b60e1143402a04c117c1"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:438856d3f8f1e27f8e79b5410ae56650732a0dcfa94e756df88c7e2d24851fcd"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1084393c6bda8875c05e04fce5cfe1301a425f758eb012f010eab586f1f3905e"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49ab200acf891e3dde19e5aa4b0f35d12d8b4bd805dc0be8792270c71bd56c54"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a67e6bbe756ed458646e1ef2b0778591ed4d1fcd4b146fc3ba2feb1a7afd4254"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8f39c49faf5344af36042b293ce05c0d9004270d811c7080610b3e713251c9b0"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7df91fb24c2edaabec4e0eee512ff3bc6ec20eb8dccac2e77001c1fe516c0c84"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:34f9f0763d5fa3035a315b69b428fe9c34d4fc2f615262d6be3d3bf3882fb985"},
-    {file = "coverage-7.3.0-cp38-cp38-win32.whl", hash = "sha256:bac329371d4c0d456e8d5f38a9b0816b446581b5f278474e416ea0c68c47dcd9"},
-    {file = "coverage-7.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b859128a093f135b556b4765658d5d2e758e1fae3e7cc2f8c10f26fe7005e543"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed8d310afe013db1eedd37176d0839dc66c96bcfcce8f6607a73ffea2d6ba"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61260ec93f99f2c2d93d264b564ba912bec502f679793c56f678ba5251f0393"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97af9554a799bd7c58c0179cc8dbf14aa7ab50e1fd5fa73f90b9b7215874ba28"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3558e5b574d62f9c46b76120a5c7c16c4612dc2644c3d48a9f4064a705eaee95"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37d5576d35fcb765fca05654f66aa71e2808d4237d026e64ac8b397ffa66a56a"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:07ea61bcb179f8f05ffd804d2732b09d23a1238642bf7e51dad62082b5019b34"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80501d1b2270d7e8daf1b64b895745c3e234289e00d5f0e30923e706f110334e"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4eddd3153d02204f22aef0825409091a91bf2a20bce06fe0f638f5c19a85de54"},
-    {file = "coverage-7.3.0-cp39-cp39-win32.whl", hash = "sha256:2d22172f938455c156e9af2612650f26cceea47dc86ca048fa4e0b2d21646ad3"},
-    {file = "coverage-7.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:60f64e2007c9144375dd0f480a54d6070f00bb1a28f65c408370544091c9bc9e"},
-    {file = "coverage-7.3.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:5492a6ce3bdb15c6ad66cb68a0244854d9917478877a25671d70378bdc8562d0"},
-    {file = "coverage-7.3.0.tar.gz", hash = "sha256:49dbb19cdcafc130f597d9e04a29d0a032ceedf729e41b181f51cd170e6ee865"},
+    {file = "coverage-7.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cd0f7429ecfd1ff597389907045ff209c8fdb5b013d38cfa7c60728cb484b6e3"},
+    {file = "coverage-7.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:966f10df9b2b2115da87f50f6a248e313c72a668248be1b9060ce935c871f276"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0575c37e207bb9b98b6cf72fdaaa18ac909fb3d153083400c2d48e2e6d28bd8e"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:245c5a99254e83875c7fed8b8b2536f040997a9b76ac4c1da5bff398c06e860f"},
+    {file = "coverage-7.3.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c96dd7798d83b960afc6c1feb9e5af537fc4908852ef025600374ff1a017392"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:de30c1aa80f30af0f6b2058a91505ea6e36d6535d437520067f525f7df123887"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:50dd1e2dd13dbbd856ffef69196781edff26c800a74f070d3b3e3389cab2600d"},
+    {file = "coverage-7.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b9c0c19f70d30219113b18fe07e372b244fb2a773d4afde29d5a2f7930765136"},
+    {file = "coverage-7.3.1-cp310-cp310-win32.whl", hash = "sha256:770f143980cc16eb601ccfd571846e89a5fe4c03b4193f2e485268f224ab602f"},
+    {file = "coverage-7.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:cdd088c00c39a27cfa5329349cc763a48761fdc785879220d54eb785c8a38520"},
+    {file = "coverage-7.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74bb470399dc1989b535cb41f5ca7ab2af561e40def22d7e188e0a445e7639e3"},
+    {file = "coverage-7.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:025ded371f1ca280c035d91b43252adbb04d2aea4c7105252d3cbc227f03b375"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6191b3a6ad3e09b6cfd75b45c6aeeffe7e3b0ad46b268345d159b8df8d835f9"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7eb0b188f30e41ddd659a529e385470aa6782f3b412f860ce22b2491c89b8593"},
+    {file = "coverage-7.3.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75c8f0df9dfd8ff745bccff75867d63ef336e57cc22b2908ee725cc552689ec8"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:7eb3cd48d54b9bd0e73026dedce44773214064be93611deab0b6a43158c3d5a0"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ac3c5b7e75acac31e490b7851595212ed951889918d398b7afa12736c85e13ce"},
+    {file = "coverage-7.3.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5b4ee7080878077af0afa7238df1b967f00dc10763f6e1b66f5cced4abebb0a3"},
+    {file = "coverage-7.3.1-cp311-cp311-win32.whl", hash = "sha256:229c0dd2ccf956bf5aeede7e3131ca48b65beacde2029f0361b54bf93d36f45a"},
+    {file = "coverage-7.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:c6f55d38818ca9596dc9019eae19a47410d5322408140d9a0076001a3dcb938c"},
+    {file = "coverage-7.3.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5289490dd1c3bb86de4730a92261ae66ea8d44b79ed3cc26464f4c2cde581fbc"},
+    {file = "coverage-7.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ca833941ec701fda15414be400c3259479bfde7ae6d806b69e63b3dc423b1832"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd694e19c031733e446c8024dedd12a00cda87e1c10bd7b8539a87963685e969"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aab8e9464c00da5cb9c536150b7fbcd8850d376d1151741dd0d16dfe1ba4fd26"},
+    {file = "coverage-7.3.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:87d38444efffd5b056fcc026c1e8d862191881143c3aa80bb11fcf9dca9ae204"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8a07b692129b8a14ad7a37941a3029c291254feb7a4237f245cfae2de78de037"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:2829c65c8faaf55b868ed7af3c7477b76b1c6ebeee99a28f59a2cb5907a45760"},
+    {file = "coverage-7.3.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1f111a7d85658ea52ffad7084088277135ec5f368457275fc57f11cebb15607f"},
+    {file = "coverage-7.3.1-cp312-cp312-win32.whl", hash = "sha256:c397c70cd20f6df7d2a52283857af622d5f23300c4ca8e5bd8c7a543825baa5a"},
+    {file = "coverage-7.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:5ae4c6da8b3d123500f9525b50bf0168023313963e0e2e814badf9000dd6ef92"},
+    {file = "coverage-7.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ca70466ca3a17460e8fc9cea7123c8cbef5ada4be3140a1ef8f7b63f2f37108f"},
+    {file = "coverage-7.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f2781fd3cabc28278dc982a352f50c81c09a1a500cc2086dc4249853ea96b981"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6407424621f40205bbe6325686417e5e552f6b2dba3535dd1f90afc88a61d465"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:04312b036580ec505f2b77cbbdfb15137d5efdfade09156961f5277149f5e344"},
+    {file = "coverage-7.3.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac9ad38204887349853d7c313f53a7b1c210ce138c73859e925bc4e5d8fc18e7"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:53669b79f3d599da95a0afbef039ac0fadbb236532feb042c534fbb81b1a4e40"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:614f1f98b84eb256e4f35e726bfe5ca82349f8dfa576faabf8a49ca09e630086"},
+    {file = "coverage-7.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f1a317fdf5c122ad642db8a97964733ab7c3cf6009e1a8ae8821089993f175ff"},
+    {file = "coverage-7.3.1-cp38-cp38-win32.whl", hash = "sha256:defbbb51121189722420a208957e26e49809feafca6afeef325df66c39c4fdb3"},
+    {file = "coverage-7.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:f4f456590eefb6e1b3c9ea6328c1e9fa0f1006e7481179d749b3376fc793478e"},
+    {file = "coverage-7.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f12d8b11a54f32688b165fd1a788c408f927b0960984b899be7e4c190ae758f1"},
+    {file = "coverage-7.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f09195dda68d94a53123883de75bb97b0e35f5f6f9f3aa5bf6e496da718f0cb6"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c6601a60318f9c3945be6ea0f2a80571f4299b6801716f8a6e4846892737ebe4"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07d156269718670d00a3b06db2288b48527fc5f36859425ff7cec07c6b367745"},
+    {file = "coverage-7.3.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:636a8ac0b044cfeccae76a36f3b18264edcc810a76a49884b96dd744613ec0b7"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5d991e13ad2ed3aced177f524e4d670f304c8233edad3210e02c465351f785a0"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:586649ada7cf139445da386ab6f8ef00e6172f11a939fc3b2b7e7c9082052fa0"},
+    {file = "coverage-7.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4aba512a15a3e1e4fdbfed2f5392ec221434a614cc68100ca99dcad7af29f3f8"},
+    {file = "coverage-7.3.1-cp39-cp39-win32.whl", hash = "sha256:6bc6f3f4692d806831c136c5acad5ccedd0262aa44c087c46b7101c77e139140"},
+    {file = "coverage-7.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:553d7094cb27db58ea91332e8b5681bac107e7242c23f7629ab1316ee73c4981"},
+    {file = "coverage-7.3.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:220eb51f5fb38dfdb7e5d54284ca4d0cd70ddac047d750111a68ab1798945194"},
+    {file = "coverage-7.3.1.tar.gz", hash = "sha256:6cb7fe1581deb67b782c153136541e20901aa312ceedaf1467dcb35255787952"},
 ]
 
 [package.extras]
@@ -592,16 +603,17 @@ test-randomorder = ["pytest-randomly"]
 
 [[package]]
 name = "cyclonedx-python-lib"
-version = "4.1.0"
+version = "4.2.1"
 description = "A library for producing CycloneDX SBOM (Software Bill of Materials) files."
 optional = false
 python-versions = ">=3.7,<4.0"
 files = [
-    {file = "cyclonedx_python_lib-4.1.0-py3-none-any.whl", hash = "sha256:28b8c6c96372345c61464561b3040ede38d1c82026f706d87e8728ba5f7f4ddb"},
-    {file = "cyclonedx_python_lib-4.1.0.tar.gz", hash = "sha256:7996657f9788758ed05bea8c247e3e6ffcccfbc48818cd34795a4ae094b307bd"},
+    {file = "cyclonedx_python_lib-4.2.1-py3-none-any.whl", hash = "sha256:b6b3818d48ed932545d3c5c819cbfe9a1fe452fba363388d2005ba9b054c81cb"},
+    {file = "cyclonedx_python_lib-4.2.1.tar.gz", hash = "sha256:adcb074d00e5171754fc2f04269987cdf11342d2dbce2b9eeee7ebb218b1ed94"},
 ]
 
 [package.dependencies]
+license-expression = ">=30,<31"
 packageurl-python = ">=0.11"
 py-serializable = ">=0.11.1,<0.12.0"
 sortedcontainers = ">=2.4.0,<3.0.0"
@@ -994,18 +1006,21 @@ smmap = ">=3.0.1,<6"
 
 [[package]]
 name = "gitpython"
-version = "3.1.35"
+version = "3.1.36"
 description = "GitPython is a Python library used to interact with Git repositories"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "GitPython-3.1.35-py3-none-any.whl", hash = "sha256:c19b4292d7a1d3c0f653858db273ff8a6614100d1eb1528b014ec97286193c09"},
-    {file = "GitPython-3.1.35.tar.gz", hash = "sha256:9cbefbd1789a5fe9bcf621bb34d3f441f3a90c8461d377f84eda73e721d9b06b"},
+    {file = "GitPython-3.1.36-py3-none-any.whl", hash = "sha256:8d22b5cfefd17c79914226982bb7851d6ade47545b1735a9d010a2a4c26d8388"},
+    {file = "GitPython-3.1.36.tar.gz", hash = "sha256:4bb0c2a6995e85064140d31a33289aa5dce80133a23d36fcd372d716c54d3ebf"},
 ]
 
 [package.dependencies]
 gitdb = ">=4.0.1,<5"
 
+[package.extras]
+test = ["black", "coverage[toml]", "ddt (>=1.1.1,!=1.4.3)", "mypy", "pre-commit", "pytest", "pytest-cov", "pytest-sugar", "virtualenv"]
+
 [[package]]
 name = "govuk-bank-holidays"
 version = "0.13"
@@ -1379,6 +1394,24 @@ completion = ["shtab"]
 docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
 testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-ruff"]
 
+[[package]]
+name = "license-expression"
+version = "30.1.1"
+description = "license-expression is a comprehensive utility library to parse, compare, simplify and normalize license expressions (such as SPDX license expressions) using boolean logic."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "license-expression-30.1.1.tar.gz", hash = "sha256:42375df653ad85e6f5b4b0385138b2dbea1f5d66360783d8625c3e4f97f11f0c"},
+    {file = "license_expression-30.1.1-py3-none-any.whl", hash = "sha256:8d7e5e2de0d04fc104a4f952c440e8f08a5ba63480a0dad015b294770b7e58ec"},
+]
+
+[package.dependencies]
+"boolean.py" = ">=4.0"
+
+[package.extras]
+docs = ["Sphinx (==5.1.0)", "doc8 (>=0.8.1)", "sphinx-rtd-theme (>=0.5.0)", "sphinxcontrib-apidoc (>=0.3.0)"]
+testing = ["black", "isort", "pytest (>=6,!=7.0.0)", "pytest-xdist (>=2)", "twine"]
+
 [[package]]
 name = "lml"
 version = "0.1.0"
@@ -1565,16 +1598,6 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
@@ -1984,13 +2007,13 @@ ptyprocess = ">=0.5"
 
 [[package]]
 name = "phonenumbers"
-version = "8.13.19"
+version = "8.13.20"
 description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers."
 optional = false
 python-versions = "*"
 files = [
-    {file = "phonenumbers-8.13.19-py2.py3-none-any.whl", hash = "sha256:ba542f20f6dc83be8f127f240f9b5b7e7c1dec42aceff1879400d4dc0c781d81"},
-    {file = "phonenumbers-8.13.19.tar.gz", hash = "sha256:38180247697240ccedd74dec4bfbdbc22bb108b9c5f991f270ca3e41395e6f96"},
+    {file = "phonenumbers-8.13.20-py2.py3-none-any.whl", hash = "sha256:97f151fc904b0d6274dd92b02c82a7936e7dcaf9c7204f2f3e9c7ed0381f5098"},
+    {file = "phonenumbers-8.13.20.tar.gz", hash = "sha256:bf2b35a806d37979e5361109429da46d9a047e59d9af98639d733c834e7dab22"},
 ]
 
 [[package]]
@@ -3260,13 +3283,13 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.24.4"
+version = "20.24.5"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.4-py3-none-any.whl", hash = "sha256:29c70bb9b88510f6414ac3e55c8b413a1f96239b6b789ca123437d5e892190cb"},
-    {file = "virtualenv-20.24.4.tar.gz", hash = "sha256:772b05bfda7ed3b8ecd16021ca9716273ad9f4467c801f27e83ac73430246dca"},
+    {file = "virtualenv-20.24.5-py3-none-any.whl", hash = "sha256:b80039f280f4919c77b30f1c23294ae357c4c8701042086e3fc005963e4e537b"},
+    {file = "virtualenv-20.24.5.tar.gz", hash = "sha256:e8361967f6da6fbdf1426483bfe9fca8287c242ac0bc30429905721cefbff752"},
 ]
 
 [package.dependencies]

From 6bd98188f989b65271ff671792a55ee24f66728d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:33:56 -0700
Subject: [PATCH 02/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index fc6590d51..e613b2465 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
       - name: Health check
-        if: if [[ $(curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* ]]
+        if: ${{ (curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* }}
           uses: actions/github-script@v3
           with:
             script: |

From 5a7c19ed228961e9f97a2370f0875472b1e13832 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:39:26 -0700
Subject: [PATCH 03/39] try again

---
 .github/workflows/checks.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index e613b2465..3f8a0c845 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,10 +57,11 @@ jobs:
         run: poetry run coverage report --fail-under=90
       - name: Health check
         if: ${{ (curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* }}
-          uses: actions/github-script@v3
-          with:
-            script: |
-              core.setFailed('Health check failed')
+        steps:
+          - uses: actions/github-script@v3
+            with:
+              script: |
+                core.setFailed('Health check failed')
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 94152b51ef3c8fddc2dca193b005a428f78ba6bc Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:42:34 -0700
Subject: [PATCH 04/39] try again

---
 .github/workflows/checks.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3f8a0c845..f422cfe13 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,11 +57,9 @@ jobs:
         run: poetry run coverage report --fail-under=90
       - name: Health check
         if: ${{ (curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* }}
-        steps:
-          - uses: actions/github-script@v3
-            with:
-              script: |
-                core.setFailed('Health check failed')
+        run: |
+          echo "blaahahaha"
+          exit 1
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 6596b7e89c3103832a32330261d1c3f218f1bf87 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:45:30 -0700
Subject: [PATCH 05/39] try again

---
 .github/workflows/checks.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index f422cfe13..b1d18efaa 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -32,6 +32,8 @@ jobs:
           output: report-markdown
           annotations: failed-tests
           prnumber: ${{ steps.findPr.outputs.number }}
+      - name: Install curl
+        run: sudo apt install curl
       - name: Run style checks
         run: poetry run flake8 .
       - name: Check imports alphabetized

From 30439bd3d9c95f948f14dfd52686cba1a65b8f76 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:54:13 -0700
Subject: [PATCH 06/39] try again

---
 .github/workflows/checks.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b1d18efaa..4fb079dc3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -32,8 +32,6 @@ jobs:
           output: report-markdown
           annotations: failed-tests
           prnumber: ${{ steps.findPr.outputs.number }}
-      - name: Install curl
-        run: sudo apt install curl
       - name: Run style checks
         run: poetry run flake8 .
       - name: Check imports alphabetized
@@ -60,7 +58,8 @@ jobs:
       - name: Health check
         if: ${{ (curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* }}
         run: |
-          echo "blaahahaha"
+          response = $(curl -v https://notify-staging.app.cloud.gov/_status)        
+          echo "response from curl= $response" 
           exit 1
 
   validate-new-relic-config:

From e5e0cf5dee8190cccc3b5352989d5487634e62ee Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 13:56:49 -0700
Subject: [PATCH 07/39] try again

---
 .github/workflows/checks.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 4fb079dc3..bceaaf6e9 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -56,7 +56,6 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
       - name: Health check
-        if: ${{ (curl -v https://notify-staging.app.cloud.gov/_status) != *"ok"* }}
         run: |
           response = $(curl -v https://notify-staging.app.cloud.gov/_status)        
           echo "response from curl= $response" 

From 3909bfd1c492688a864bc91496e2623e8cc8d487 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 14:13:25 -0700
Subject: [PATCH 08/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index bceaaf6e9..b30dc96a3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -59,7 +59,7 @@ jobs:
         run: |
           response = $(curl -v https://notify-staging.app.cloud.gov/_status)        
           echo "response from curl= $response" 
-          exit 1
+          # exit 1
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 611ebc48d1b7ed84d0b31cf5b69011759e6739b0 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 14:20:46 -0700
Subject: [PATCH 09/39] try again

---
 .github/workflows/checks.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b30dc96a3..4f67b2b5c 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,7 +57,9 @@ jobs:
         run: poetry run coverage report --fail-under=90
       - name: Health check
         run: |
-          response = $(curl -v https://notify-staging.app.cloud.gov/_status)        
+          # response = $(curl -v https://notify-staging.app.cloud.gov/_status)
+          response = $(curl -v http://localhost:6012/_status)
+          
           echo "response from curl= $response" 
           # exit 1
 

From f83056851e093baa57a7d084b600e860bfd33f3a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 14:29:22 -0700
Subject: [PATCH 10/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 4f67b2b5c..a4d9a96fe 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Health check
         run: |
           # response = $(curl -v https://notify-staging.app.cloud.gov/_status)
-          response = $(curl -v http://localhost:6012/_status)
+          response = $(curl -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
           
           echo "response from curl= $response" 
           # exit 1

From f69d7d106e333adc1d9797d48d85837afc1dfc24 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 14:38:16 -0700
Subject: [PATCH 11/39] try again

---
 .github/workflows/checks.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a4d9a96fe..010915afc 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,6 +62,13 @@ jobs:
           
           echo "response from curl= $response" 
           # exit 1
+        env:
+          NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
+          NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
+          NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}
+          NOTIFY_E2E_TEST_HTTP_AUTH_USER: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}
+          NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
+          NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
 
   validate-new-relic-config:
     runs-on: ubuntu-latest

From 96452f8338d0ca2f7998b07258b195cec45e42e3 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 14:48:14 -0700
Subject: [PATCH 12/39] try again

---
 .github/workflows/checks.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 010915afc..4f3e659dd 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -58,9 +58,8 @@ jobs:
       - name: Health check
         run: |
           # response = $(curl -v https://notify-staging.app.cloud.gov/_status)
-          response = $(curl -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
+          $(curl -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
           
-          echo "response from curl= $response" 
           # exit 1
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}

From 3a94826ad60da9b673498c2fc3e0d3fc20372ad1 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Tue, 12 Sep 2023 15:03:28 -0700
Subject: [PATCH 13/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 4f3e659dd..5f965a705 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Health check
         run: |
           # response = $(curl -v https://notify-staging.app.cloud.gov/_status)
-          $(curl -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
+          $(curl -u ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }} -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
           
           # exit 1
         env:

From eec791265c4479b7c75fd46f67beac7baee00f8f Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 07:48:03 -0700
Subject: [PATCH 14/39] try again

---
 .github/workflows/checks.yml | 12 +++++++-----
 .github/workflows/deploy.yml |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 5f965a705..59d1776b3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -56,12 +56,14 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
       - name: Health check
-        run: |
-          # response = $(curl -v https://notify-staging.app.cloud.gov/_status)
-          $(curl -u ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }} -v ${{ secrets.NOTIFY_E2E_TEST_URI }}_status)
-          
-          # exit 1
+        if: ${{ (curl -u "$login" -v "$status_page") != *"ok"* }}
+        steps:
+          - uses: actions/github-script@v6
+            with:
+              script: core.setFailed('Health check failed')
         env:
+          login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
+          status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b754e327a..513f50b95 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -84,7 +84,7 @@ jobs:
             deploy-config/egress_proxy/notify-admin-staging.*.acl
             .github/actions/deploy-proxy/action.yml
             .github/workflows/deploy.yml
-      - name: Deploy egress proxy
+      - name: Deploy egress proxyf
         if: steps.changed-egress-config.outputs.any_changed == 'true'
         uses: ./.github/actions/deploy-proxy
         with:

From f23f13f20147488a4580984e3a4a27cc8e88d75f Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 07:51:43 -0700
Subject: [PATCH 15/39] try again

---
 .github/workflows/checks.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 59d1776b3..b944b9ac8 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,10 +57,9 @@ jobs:
         run: poetry run coverage report --fail-under=90
       - name: Health check
         if: ${{ (curl -u "$login" -v "$status_page") != *"ok"* }}
-        steps:
-          - uses: actions/github-script@v6
-            with:
-              script: core.setFailed('Health check failed')
+        uses: actions/github-script@v6
+          with:
+            script: core.setFailed('Health check failed')
         env:
           login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
           status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status

From 7e4cdd23a1b04f8a2ef692bbe6b9dd766803de78 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 07:54:01 -0700
Subject: [PATCH 16/39] try again

---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b944b9ac8..fa88057db 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -58,8 +58,8 @@ jobs:
       - name: Health check
         if: ${{ (curl -u "$login" -v "$status_page") != *"ok"* }}
         uses: actions/github-script@v6
-          with:
-            script: core.setFailed('Health check failed')
+        with:
+          script: core.setFailed('Health check failed')
         env:
           login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
           status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status

From 1d397852b3fb7786469d968eea90e35d4047e62f Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:00:25 -0700
Subject: [PATCH 17/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index fa88057db..1a9aeebeb 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
       - name: Health check
-        if: ${{ (curl -u "$login" -v "$status_page") != *"ok"* }}
+        if: (curl -u "$login" -v "$status_page") != *"ok"*
         uses: actions/github-script@v6
         with:
           script: core.setFailed('Health check failed')

From f0cfb5144108a8df203426962de2e3c348c6390c Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:07:19 -0700
Subject: [PATCH 18/39] try again

---
 .github/workflows/checks.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 1a9aeebeb..b6660262e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -55,14 +55,19 @@ jobs:
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
+#      - name: Health check
+#        if: (curl -u "$login" -v "$status_page") != *"ok"*
+#        uses: actions/github-script@v6
+#        with:
+#          script: core.setFailed('Health check failed')
+
       - name: Health check
-        if: (curl -u "$login" -v "$status_page") != *"ok"*
-        uses: actions/github-script@v6
-        with:
-          script: core.setFailed('Health check failed')
+        run: |
+          response = $(curl ${{secrets.NOTIFY_E2E_TEST_URI}}_status -header "Accept: application/json" -header "X-Username: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}" -header "X-Password: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
+          echo "response from curl= $response"
         env:
-          login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
-          status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
+          # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
+          # status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}

From bfe8c74ce2f3190aadda5557bb291f4c28d80e77 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:14:50 -0700
Subject: [PATCH 19/39] try again

---
 .github/workflows/checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index b6660262e..00ef6003e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -63,8 +63,8 @@ jobs:
 
       - name: Health check
         run: |
-          response = $(curl ${{secrets.NOTIFY_E2E_TEST_URI}}_status -header "Accept: application/json" -header "X-Username: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}" -header "X-Password: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
-          echo "response from curl= $response"
+          response=$(curl ${{secrets.NOTIFY_E2E_TEST_URI}}_status -header "Accept: application/json" -header "X-Username: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}" -header "X-Password: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
+          echo "response from curl=$response"
         env:
           # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
           # status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status

From 51e2da1be0b190ec0854a82f14d26997026c5fd2 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:30:05 -0700
Subject: [PATCH 20/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 00ef6003e..ed7d49740 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Health check
         run: |
-          response=$(curl ${{secrets.NOTIFY_E2E_TEST_URI}}_status -header "Accept: application/json" -header "X-Username: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}" -header "X-Password: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
+          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}"         
           echo "response from curl=$response"
         env:
           # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}

From 851505c90607fbe757b5cb8246f68b178a2e4b02 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:36:48 -0700
Subject: [PATCH 21/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index ed7d49740..817785537 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -63,7 +63,7 @@ jobs:
 
       - name: Health check
         run: |
-          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}"         
+          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
           echo "response from curl=$response"
         env:
           # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}

From bfb49d44ae6c3d129a9b1db83df226822914c763 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:47:11 -0700
Subject: [PATCH 22/39] try again

---
 .github/workflows/checks.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 817785537..3aae543af 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -64,7 +64,9 @@ jobs:
       - name: Health check
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
-          echo "response from curl=$response"
+          if response == *"ok"*; then
+            exit 1
+          endif
         env:
           # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
           # status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status

From b85a26e6be052ba46fbcc800679cea184de563e4 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 08:59:15 -0700
Subject: [PATCH 23/39] try again

---
 .github/workflows/checks.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3aae543af..353e3bfd7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -64,7 +64,8 @@ jobs:
       - name: Health check
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
-          if response == *"ok"*; then
+          echo "curl response is $response"
+          if $response == *"ok"*; then
             exit 1
           endif
         env:

From bb9bd9872e029dadad0b5207f746b34b4e138839 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:09:55 -0700
Subject: [PATCH 24/39] try again

---
 .github/workflows/checks.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 353e3bfd7..a215c4263 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,12 +62,16 @@ jobs:
 #          script: core.setFailed('Health check failed')
 
       - name: Health check
-        run: |
-          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")         
-          echo "curl response is $response"
-          if $response == *"ok"*; then
-            exit 1
-          endif
+        if: $(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}") == *"ok"*
+        uses: actions/github-script@v6
+        with:
+          script: core.setFailed('Health check failed')
+#        run: |
+#          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
+#          echo "curl response is $response"
+#          if $response == *"ok"*; then
+#            exit 1
+#          endif
         env:
           # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
           # status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status

From f87d71742545d7ff4dcea14c303902a5f5a38c8e Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:11:51 -0700
Subject: [PATCH 25/39] try again

---
 .github/workflows/checks.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a215c4263..aba8e9bab 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,7 +62,7 @@ jobs:
 #          script: core.setFailed('Health check failed')
 
       - name: Health check
-        if: $(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}") == *"ok"*
+        if: $(curl -url $status_page -u "$login") == *"ok"*
         uses: actions/github-script@v6
         with:
           script: core.setFailed('Health check failed')
@@ -73,8 +73,8 @@ jobs:
 #            exit 1
 #          endif
         env:
-          # login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
-          # status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
+          login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
+          status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}

From b164d175a894466e6fd186e9b37a05cadbe4cb1a Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:19:36 -0700
Subject: [PATCH 26/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index aba8e9bab..65a0e367f 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,7 +62,7 @@ jobs:
 #          script: core.setFailed('Health check failed')
 
       - name: Health check
-        if: $(curl -url $status_page -u "$login") == *"ok"*
+        if: $(curl -url "${{ status_page }}" -u "${{ login}} ") == *"ok"*
         uses: actions/github-script@v6
         with:
           script: core.setFailed('Health check failed')

From c890d12a2633582934f8037c78ceaa68d040105d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:22:01 -0700
Subject: [PATCH 27/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 65a0e367f..0f42fb2ec 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,7 +62,7 @@ jobs:
 #          script: core.setFailed('Health check failed')
 
       - name: Health check
-        if: $(curl -url "${{ status_page }}" -u "${{ login}} ") == *"ok"*
+        if: $(curl -url "${{secrets.NOTIFY_E2E_TEST_URI}}_status" -u "${{ login}} ") == *"ok"*
         uses: actions/github-script@v6
         with:
           script: core.setFailed('Health check failed')

From 35f80589c11d2de48e8c0e30a9cc599e7348fdf5 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:33:59 -0700
Subject: [PATCH 28/39] try again

---
 .github/workflows/checks.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 0f42fb2ec..49946d980 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -62,19 +62,16 @@ jobs:
 #          script: core.setFailed('Health check failed')
 
       - name: Health check
-        if: $(curl -url "${{secrets.NOTIFY_E2E_TEST_URI}}_status" -u "${{ login}} ") == *"ok"*
-        uses: actions/github-script@v6
-        with:
-          script: core.setFailed('Health check failed')
-#        run: |
-#          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
-#          echo "curl response is $response"
-#          if $response == *"ok"*; then
-#            exit 1
-#          endif
+        run: |
+          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
+          echo "curl response is $response"
+          if $response == *"ok"*; then
+            exit 1
+          endif
+      - name: Health check passed
+        run: |
+          echo "Health check passed"
         env:
-          login: ${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER}}:${{secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD}}
-          status_page: ${{secrets.NOTIFY_E2E_TEST_URI}}_status
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
           NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}

From daaa04b292b89e6de93055983256952038f81466 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:43:11 -0700
Subject: [PATCH 29/39] try again

---
 .github/workflows/checks.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 49946d980..6d1818e95 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -65,12 +65,12 @@ jobs:
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
           echo "curl response is $response"
-          if $response == *"ok"*; then
-            exit 1
-          endif
-      - name: Health check passed
-        run: |
-          echo "Health check passed"
+#          if $response != *"ok"*; then
+#            echo "Health check failed"
+#            exit 1
+#          else;
+#            echo "Health check passed"
+#          endif
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 2a641d0d4e42f262291421f86881a019c455bfbc Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 09:52:11 -0700
Subject: [PATCH 30/39] try again

---
 .github/workflows/checks.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 6d1818e95..9143ecc74 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -65,12 +65,12 @@ jobs:
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
           echo "curl response is $response"
-#          if $response != *"ok"*; then
-#            echo "Health check failed"
-#            exit 1
-#          else;
-#            echo "Health check passed"
-#          endif
+          if $response != *"ok"*; then
+            echo "Health check failed"
+            exit 1
+          else;
+            echo "Health check passed"
+          endif
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From f433d69596aaa06451fcc18e25797ef14b567d20 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 10:10:01 -0700
Subject: [PATCH 31/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 9143ecc74..2710aa9a1 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -68,7 +68,7 @@ jobs:
           if $response != *"ok"*; then
             echo "Health check failed"
             exit 1
-          else;
+          else
             echo "Health check passed"
           endif
         env:

From a1974a251edb787bf8c3e53b43ee779549304843 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 10:28:01 -0700
Subject: [PATCH 32/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 2710aa9a1..01be1dec7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -70,7 +70,7 @@ jobs:
             exit 1
           else
             echo "Health check passed"
-          endif
+          fi
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
           NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}

From 1d9239aa13e506ffc333ee319d0295cada6da021 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 10:35:53 -0700
Subject: [PATCH 33/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 01be1dec7..a51edcf61 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -65,7 +65,7 @@ jobs:
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
           echo "curl response is $response"
-          if $response != *"ok"*; then
+          if $response == *"ok"*; then
             echo "Health check failed"
             exit 1
           else

From 21e5c7d1031f64899d295f2b2c493f1d7a0938a4 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 10:52:51 -0700
Subject: [PATCH 34/39] try again

---
 .github/workflows/checks.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a51edcf61..22d3fe822 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -64,7 +64,6 @@ jobs:
       - name: Health check
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
-          echo "curl response is $response"
           if $response == *"ok"*; then
             echo "Health check failed"
             exit 1

From 50f6a66542210c3a84ecda90db3d0be3302ac901 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 11:05:52 -0700
Subject: [PATCH 35/39] try again

---
 .github/workflows/checks.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 22d3fe822..475b85663 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -63,8 +63,7 @@ jobs:
 
       - name: Health check
         run: |
-          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
-          if $response == *"ok"*; then
+          if $(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}") == *"ok"*; then
             echo "Health check failed"
             exit 1
           else

From 5f84cd1bbe7a949f0cad40fdc8ec94e88b219ceb Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 11:17:07 -0700
Subject: [PATCH 36/39] try again

---
 .github/workflows/checks.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 475b85663..bc547e837 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -63,7 +63,8 @@ jobs:
 
       - name: Health check
         run: |
-          if $(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}") == *"ok"*; then
+          response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
+          if [$response == *"ok"*]; then
             echo "Health check failed"
             exit 1
           else

From ddaee26074e1d44a3eea9db125b33e8abb1c6bc9 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 11:27:15 -0700
Subject: [PATCH 37/39] try again

---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index bc547e837..10ff71c46 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -64,7 +64,7 @@ jobs:
       - name: Health check
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
-          if [$response == *"ok"*]; then
+          if grep -q "ok" <<< "$response"; then
             echo "Health check failed"
             exit 1
           else

From fe259b491dcaff921ab13d0f7a9338b8c83a0b33 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 11:34:44 -0700
Subject: [PATCH 38/39] try again

---
 .github/workflows/checks.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 10ff71c46..720cc56f9 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -55,20 +55,14 @@ jobs:
           NOTIFY_E2E_TEST_URI: ${{ secrets.NOTIFY_E2E_TEST_URI }}
       - name: Check coverage threshold
         run: poetry run coverage report --fail-under=90
-#      - name: Health check
-#        if: (curl -u "$login" -v "$status_page") != *"ok"*
-#        uses: actions/github-script@v6
-#        with:
-#          script: core.setFailed('Health check failed')
-
       - name: Health check
         run: |
           response=$(curl -url ${{secrets.NOTIFY_E2E_TEST_URI}}_status -u "${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_USER }}:${{ secrets.NOTIFY_E2E_TEST_HTTP_AUTH_PASSWORD }}")
           if grep -q "ok" <<< "$response"; then
+            echo "Health check passed"
+          else
             echo "Health check failed"
             exit 1
-          else
-            echo "Health check passed"
           fi
         env:
           NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}

From 6c1a5687e87591f1e1b9d3e3ca4976156ccaa013 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 13 Sep 2023 11:42:45 -0700
Subject: [PATCH 39/39] fix typo

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 513f50b95..b754e327a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -84,7 +84,7 @@ jobs:
             deploy-config/egress_proxy/notify-admin-staging.*.acl
             .github/actions/deploy-proxy/action.yml
             .github/workflows/deploy.yml
-      - name: Deploy egress proxyf
+      - name: Deploy egress proxy
         if: steps.changed-egress-config.outputs.any_changed == 'true'
         uses: ./.github/actions/deploy-proxy
         with: