Merge branch 'main' into feature/improved_errors

spiffworkflow-backend/keycloak/bin/add_test_users_to_keycloak

@@ -8,6 +8,7 @@ trap 'error_handler ${LINENO} $?' ERR
 set -o errtrace -o errexit -o nounset -o pipefail
 
 user_file_with_one_email_per_line="${1:-}"
+keycloak_realm="${2:-spiffworkflow}"
 if [[ -z "${1:-}" ]]; then
   >&2 echo "usage: $(basename "$0") [user_file_with_one_email_per_line]"
   exit 1
@@ -42,7 +43,7 @@ while read -r user_email; do
     username=$(awk -F '@' '{print $1}' <<<"$user_email")
     credentials='{"type":"password","value":"'"${username}"'","temporary":false}'
 
-    curl --fail --location --request POST 'http://localhost:7002/admin/realms/spiffworkflow/users' \
+    curl --fail --location --request POST "http://localhost:7002/admin/realms/${keycloak_realm}/users" \
       -H 'Content-Type: application/json' \
       -H "Authorization: Bearer $backend_token" \
       --data-raw '{"email":"'"${user_email}"'", "enabled":"true", "username":"'"${username}"'", "credentials":['"${credentials}"']}'

spiffworkflow-backend/keycloak/test_user_lists/sartography

@@ -0,0 +1,8 @@
+alex@sartography.com
+dan@sartography.com
+kevin@sartography.com
+jason@sartography.com
+mike@sartography.com
+elizabeth@sartography.com
+jon@sartography.com
+natalia@sartography.com

spiffworkflow-backend/src/spiffworkflow_backend/config/__init__.py

@@ -62,7 +62,7 @@ def setup_config(app: Flask) -> None:
         "SPIFFWORKFLOW_BACKEND_ENV", "development"
     )
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
-    app.config.from_object("spiffworkflow_backend.config.default")
+    load_config_file(app, "spiffworkflow_backend.config.default")
 
     env_config_prefix = "spiffworkflow_backend.config."
     if (

spiffworkflow-backend/src/spiffworkflow_backend/config/sartography.py

@@ -0,0 +1,10 @@
+"""Default."""
+from os import environ
+
+environment_identifier_for_this_config_file_only = environ["SPIFFWORKFLOW_BACKEND_ENV"]
+OPEN_ID_SERVER_URL = f"https://keycloak.{environment_identifier_for_this_config_file_only}.spiffworkflow.org/realms/sartography"
+GIT_BRANCH = environ.get("GIT_BRANCH", default="main")
+GIT_CLONE_URL_FOR_PUBLISHING = environ.get(
+    "GIT_CLONE_URL",
+    default="https://github.com/sartography/sartography-process-models.git",
+)

spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_process_instance_service.py

@@ -1,6 +1,4 @@
 """Test_process_instance_processor."""
-import os
-
 from flask.app import Flask
 from tests.spiffworkflow_backend.helpers.base_test import BaseTest
 from tests.spiffworkflow_backend.helpers.test_data import load_test_spec
@@ -21,11 +19,7 @@ class TestProcessInstanceService(BaseTest):
         with_db_and_bpmn_file_cleanup: None,
         with_super_admin_user: UserModel,
     ) -> None:
-        """Test_does_not_log_set_data_when_calling_engine_steps_on_waiting_call_activity.
+        """Test_does_not_log_set_data_when_calling_engine_steps_on_waiting_call_activity."""
-        """
-        tmp_file = "/tmp/testfile.txt"
-        if os.path.isfile(tmp_file):
-            os.remove(tmp_file)
         process_model = load_test_spec(
             process_model_id="test_group/call-activity-to-human-task",
             process_model_source_directory="call-activity-to-human-task",
@@ -41,10 +35,10 @@ class TestProcessInstanceService(BaseTest):
         ).all()
         initial_length = len(process_instance_logs)
 
+        # ensure we have something in the logs
+        assert initial_length > 0
+
         # logs should NOT increase after running this a second time since it's just waiting on a human task
-        print("HEY NOW")
-        with open(tmp_file, "w") as f:
-            f.write("HEY")
         processor.do_engine_steps(save=True)
         process_instance_logs = SpiffLoggingModel.query.filter_by(
             process_instance_id=process_instance.id