From 1e86345a338ad75c9b4c4f3c5bb0f9050a18ed8a Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 5 Dec 2022 10:46:26 -0500 Subject: [PATCH] Fixes based off KB's super kind review. ------- * Remove unnecessary packages from dockerfile for the demo-connect proxy. * Rename an environment variable that mentioned Status.im in what is now a generic connector. * Fixed a spelling mistake. --- connector-proxy-demo/Dockerfile | 3 +-- connector-proxy-demo/bin/boot_server_in_docker | 2 +- docker-compose.yml | 2 +- .../config/permissions/{demo.yml => example.yml} | 0 .../spiffworkflow_backend/integration/test_openid_blueprint.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) rename spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/{demo.yml => example.yml} (100%) diff --git a/connector-proxy-demo/Dockerfile b/connector-proxy-demo/Dockerfile index e2d89beb..2e1a76b7 100644 --- a/connector-proxy-demo/Dockerfile +++ b/connector-proxy-demo/Dockerfile @@ -6,8 +6,7 @@ RUN useradd _gunicorn --no-create-home --user-group RUN apt-get update && \ apt-get install -y -q \ gcc libssl-dev \ - curl git-core libpq-dev \ - gunicorn3 default-mysql-client + curl gunicorn3 WORKDIR /app COPY pyproject.toml poetry.lock /app/ diff --git a/connector-proxy-demo/bin/boot_server_in_docker b/connector-proxy-demo/bin/boot_server_in_docker index d64f417b..1179bf5b 100755 --- a/connector-proxy-demo/bin/boot_server_in_docker +++ b/connector-proxy-demo/bin/boot_server_in_docker @@ -7,7 +7,7 @@ function error_handler() { trap 'error_handler ${LINENO} $?' ERR set -o errtrace -o errexit -o nounset -o pipefail -port="${CONNECTOR_PROXY_STATUS_IM_PORT:-}" +port="${CONNECTOR_PROXY_PORT:-}" if [[ -z "$port" ]]; then port=7004 fi diff --git a/docker-compose.yml b/docker-compose.yml index 7e05ba2a..1cf55024 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - SPIFFWORKFLOW_BACKEND_DATABASE_URI=mysql+mysqlconnector://root:my-secret-pw@spiffworkflow-db:7003/spiffworkflow_backend_development - BPMN_SPEC_ABSOLUTE_DIR=/app/process_models - SPIFFWORKFLOW_BACKEND_LOAD_FIXTURE_DATA=false - - SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME=demo.yml + - SPIFFWORKFLOW_BACKEND_PERMISSIONS_FILE_NAME=example.yml - RUN_BACKGROUND_SCHEDULER=true - OPEN_ID_CLIENT_ID=spiffworkflow-backend - OPEN_ID_CLIENT_SECRET_KEY=my_open_id_secret_key diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/demo.yml b/spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/example.yml similarity index 100% rename from spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/demo.yml rename to spiffworkflow-backend/src/spiffworkflow_backend/config/permissions/example.yml diff --git a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_openid_blueprint.py b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_openid_blueprint.py index 90db8c2f..20a0bb67 100644 --- a/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_openid_blueprint.py +++ b/spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_openid_blueprint.py @@ -4,7 +4,7 @@ from flask.testing import FlaskClient from tests.spiffworkflow_backend.helpers.base_test import BaseTest -class TestFaskOpenId(BaseTest): +class TestFlaskOpenId(BaseTest): """An integrated Open ID that responds to openID requests. By referencing a build in YAML file. Useful for