Incremental/bug fixes.

Author: jadudm

dev-local/.env.container

@@ -51,3 +51,4 @@ RUNNING_IN_LOCAL_STACK="${RUNNING_IN_LOCAL_STACK}"
 SUPER_USER_EMAIL="${SUPER_USER_EMAIL}"
 SUPER_USER_NAME="${SUPER_USER_NAME}"
 SUPER_USER_PASSWORD="${SUPER_USER_PASSWORD}"
+LOCAL_TESTING_TARGET="${LOCAL_TESTING_TARGET}"

dev-local/Dockerfile.local

@@ -1,7 +1,5 @@
-# FIXME: Update to most recent python.
 FROM python:3.11-trixie
 
-# FIXME: Uncertain implications
 ENV PYTHONUNBUFFERED=1
 ENV PYDEVD_DISABLE_FILE_VALIDATION=1
 
@@ -24,8 +22,6 @@ USER DEV
 ADD .. /code
 WORKDIR /code
 
-# FIXME: Is this how to use venvs 
-# reliably in a Dockerfile?
 RUN python -m venv /tmp/venv
 RUN . /tmp/venv/bin/activate
 ENV PATH="/tmp/venv/bin:${PATH}"

dev-local/README.md

@@ -8,6 +8,10 @@ The containerized local build should provide a local development experience that
 
 These tools assume you are a developer working on the project, and have access to the VPN and other systems.
 
+## TL;DR
+
+
+
 ## pre-requisites
 
 It is assumed you have a *NIX-like shell, and have the ability to run GNU Make or a reasonable fascimilie thereof. 
@@ -16,7 +20,7 @@ A Mac, out-of-the-box, should "just work," as well as an Intel-based Linux host.
 
 ### configuring `kion`
 
-*To run the tools, you must be in a `kion` shell. What follows is a way to set up an alias that makes running the correct configuration easier.*
+*To run the tools, you must be in a `kion` shell. What follows is a way to set up an alias that makes running the correct configuration easier. You can also run `kion stak` or `kion s` and navigate the menus to achieve a similar result.*
 
 You should already have a `.kion.yaml` in your home directory. If not, follow the [local desktop development](https://confluence.cms.gov/spaces/BB2/pages/484224999/Local+Desktop+Development) onboarding docs to set up Cloudtamer/`kion`.
 
@@ -31,7 +35,7 @@ Then add the alias as:
 
 ```
 favorites:
-  - name: BB2-NON-PROD
+  - name: bbnp
     account: <account-number>
     cloud_access_role: <cloud-access-role>
     access_type: cli
@@ -40,10 +44,10 @@ favorites:
 If you already have some aliases, you can just add this one to the list. The account number and cloud access role can be obtained from the Cloudtamer dashboard. This is not strictly necessary, as the tooling cannot automate a `kion` call *and* then continue, as `kion` opens a new shell. However, it is much easier (and, for this documentation, the preferred method) to invoke
 
 ```
-kion f BB2-NON-PROD
+kion f bbnp
 ```
 
-than to navigate a menu structure. You may ultimately choose a shorter alias, e.g. `kion f bnp`.
+than to navigate a menu structure. You may ultimately choose a shorter alias, e.g. `kion f bbnp`.
 
 ## to start
 
@@ -93,26 +97,36 @@ make run-local bfd=test auth=live
 
 Each combination has different implications. Only some make sense at this time (Nov '25):
 
-| bfd / auth | mock | live |
+|  | auth=mock | auth=live |
 | --- | --- | --- |
-| local | local unit tests | testing SLSX sequences |
-| test | ⛔ | Full-up against `test` | 
-| sbx | ⛔ | Full-up against `sbx` | 
+| **bfd=local** | local unit tests | testing SLSX sequences |
+| **bfd=test** | ⛔ | Full-up against `test` | 
+| **bfd=sbx** | ⛔ | Full-up against `sbx` | 
 
 * `local/mock`: This makes sense for running unit tests; only local tests will run in this configuration.
-* `local/live`: Manual testing of SLSX sequences should be able to be performed with this combination (TBD)
-* `test/mock`: Not a valid condition; a mock authentication will not work with a live server.
+* `local/live`: Manual testing of SLSX sequences should be able to be performed with this combination. No BFD/FHIR URLs are set, though, which may break things.
+* `test/mock`: *Not a valid condition*; a mock authentication will not work with a live server.
 * `test/live`: Live SLSX exchanges with medicare.gov and calls against the `test` BFD environment.
-* `sbx/mock`: Not a valid condition.
+* `sbx/mock`: *Not a valid condition*.
 * `sbx/live`: Live SLSX exchanges and calls against the `sbx` BFD environment.
 
 
+### running daemonized
+
+You cann add `daemon=1` to any of the above commands, and the stack will run in the background.
+
+For example:
+
+```
+make run-local bfd=test auth=live daemon=1
+```
+
 ### running against `test`
 
 When launched with
 
 ```
-make run-local TARGET=test
+make run-local bfd=test auth=live
 ```
 
 the tooling obtains and sources credentials for running against our `test` environment.
@@ -122,7 +136,7 @@ the tooling obtains and sources credentials for running against our `test` envir
 Similarly,
 
 ```
-make run-local TARGET=sbx
+make run-local bfd=sbx auth=live
 ```
 
 runs against SBX. 
@@ -135,9 +149,9 @@ runs against SBX.
 
 In a nutshell:
 
-1. Run `kion f BB2-NON-PROD` to authenticate/obtain AWS credentials.
+1. Run `kion f bbnp` to authenticate/obtain AWS credentials.
 1. Obtain certificates for the remote environment (if you selected `test` or `sbx`)
-1. `docker compose --profile mock-sls up` for `local`, `docker compose --profile slsx up` for live envs.
+1. Pass appropriate env vars through to the app, based on choices.
 
 ## future work
 

dev-local/docker-compose-local.yaml

@@ -36,33 +36,4 @@ services:
       - "5678:5678"
     depends_on:
       - db
-      - msls
-
-  # web_msls:
-  #   build: .
-  #   command: ./start-local.sh
-  #   env_file:
-  #     - .env.local
-  #   volumes:
-  #     - ..:/code
-  #     - ~/.bb2/certstore:/certstore
-  #   ports:
-  #     - "8000:8000"
-  #     - "5678:5678"
-  #   depends_on:
-  #     - db
-  #     - msls
-  #   profiles:
-  #     - mocksls
-  #   platform: linux/amd64
-  # unittests:
-  #   build: .
-  #   command: python3 -m debugpy --listen 0.0.0.0:6789 --wait-for-client runtests.py
-  #   env_file:
-  #     - docker-compose/unittests-env-vars.env
-  #   ports:
-  #     - "6789:6789"
-  #   volumes:
-  #     - .:/code
-  #   profiles:
-  #     - tests
+      - msls

dev-local/run-tests-in-both-environments.bash

@@ -19,12 +19,27 @@ check_valid_env () {
     #####
     # ERR
     else
-        echo "'bfd' must be set to 'local', 'test', or 'sbx'."
-        echo "'bfd' is currently set to '${bfd}'."
+        echo "⛔ 'bfd' must be set to 'local', 'test', or 'sbx'."
+        echo "⛔ 'bfd' is currently set to '${bfd}'."
         echo "Exiting."
         return -2
     fi 
 
+
+    if [[ "${bfd}" == "local" && "${auth}" == "live" ]]; then
+        echo "⚠️ ${bfd}/${auth} may work for SLSX testing, but not for BFD calls."
+    fi 
+
+    if [[ "${bfd}" == "test" && "${auth}" == "mock" ]]; then
+        echo "⛔ ${bfd}/${auth} is not a valid combination. Exiting."
+        return -3
+    fi 
+
+    if [[ "${bfd}" == "sbx" && "${auth}" == "mock" ]]; then
+        echo "⛔ ${bfd}/${auth} is not a valid combination. Exiting."
+        return -4
+    fi 
+
     echo "✅ check_valid_env"
 }
 
@@ -96,16 +111,20 @@ set_bfd_urls () {
     if [[ "${bfd}" == "local" ]]; then
         echo "⚠️  No FHIR URLs set for local testing."
         echo "   There are no mock BFD endpoints for local testing at this time."
+        export LOCAL_TESTING_TARGET="local"
     #####
     # TEST
     elif [[ "${bfd}" == "test" ]]; then
         export FHIR_URL="${FHIR_URL_TEST}"
         export FHIR_URL_V3="${FHIR_URL_V3_TEST}"
+        export LOCAL_TESTING_TARGET="test"
     #####
     # SBX
     elif [[ "${bfd}" == "sbx" ]]; then
         export FHIR_URL="${FHIR_URL_SBX}"
         export FHIR_URL_V3="${FHIR_URL_V3_SBX}"
+        # FIXME: Do we use "impl" or "sbx"? ...
+        export LOCAL_TESTING_TARGET="impl"
     fi
 
     echo "✅ set_bfd_urls"
@@ -143,6 +162,10 @@ set_auth_profile () {
 export CERT_AND_SALT="YES"
 
 retrieve_certs () {
+    echo "🎁 Retrieving certs for the '${bfd}' environment with suffix '${CERT_SUFFIX}'."
+
+    unset CERT_SUFFIX
+
     if [[ "${bfd}" == "local" ]]; then
         echo "🆗 Running locally. Not retrieving certs."
         echo "🆗 Running locally. Not retrieving salt."
@@ -173,10 +196,12 @@ retrieve_certs () {
         KEY="ca.key.nocrypt.pem"
 
         # Remove them first
+        echo "  Removing ${BB2_CERTSTORE}/$CERT"
         rm -f "${BB2_CERTSTORE}/$CERT"
+        echo "  Removing ${BB2_CERTSTORE}/$KEY"
         rm -f "${BB2_CERTSTORE}/$KEY"
 
-        echo "🎁 Retrieving certs for the '${bfd}' environment with suffix '${CERT_SUFFIX}'."
+        echo "  Fetching ${BB2_CERTSTORE}/$CERT"
         aws secretsmanager get-secret-value \
             --secret-id /bb2/local_integration_tests/fhir_client/certstore/local_integration_tests_certificate${CERT_SUFFIX} \
             --query 'SecretString' \
@@ -187,6 +212,7 @@ retrieve_certs () {
             return -3
         fi
 
+        echo "  Fetching ${BB2_CERTSTORE}/$KEY"
         aws secretsmanager get-secret-value \
             --secret-id /bb2/local_integration_tests/fhir_client/certstore/local_integration_tests_private_key${CERT_SUFFIX} \
             --query 'SecretString' \