M8F-131 - Reconfigured m8flow-connectors to use m8flow- prefixed folders

Author: andrepestana-aot

docker/m8flow-docker-compose.yml

@@ -216,6 +216,7 @@ services:
       M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR: "${M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR:-/app/process_models}"
       M8FLOW_BACKEND_DATABASE_URI: "postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@m8flow-db:5432/${POSTGRES_DB:-postgres}"
       M8FLOW_BACKEND_UPGRADE_DB: "${M8FLOW_BACKEND_UPGRADE_DB:-true}"
+      M8FLOW_BACKEND_CONNECTOR_PROXY_URL: "http://m8flow-connector-proxy:${CONNECTOR_PROXY_PORT:-8004}"
       KEYCLOAK_URL: "http://keycloak-proxy:7002"
       M8FLOW_KEYCLOAK_URL: "http://keycloak-proxy:7002"
       KEYCLOAK_HOSTNAME: "${KEYCLOAK_HOSTNAME:-http://localhost:7002}"
@@ -260,6 +261,7 @@ services:
     environment:
       M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR: "${M8FLOW_BACKEND_BPMN_SPEC_ABSOLUTE_DIR:-/app/process_models}"
       M8FLOW_BACKEND_DATABASE_URI: "postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@m8flow-db:5432/${POSTGRES_DB:-postgres}"
+      M8FLOW_BACKEND_CONNECTOR_PROXY_URL: "http://m8flow-connector-proxy:${CONNECTOR_PROXY_PORT:-8004}"
       M8FLOW_BACKEND_CELERY_BROKER_URL: "${M8FLOW_BACKEND_CELERY_BROKER_URL:-redis://redis:6379/0}"
       M8FLOW_BACKEND_CELERY_RESULT_BACKEND: "${M8FLOW_BACKEND_CELERY_RESULT_BACKEND:-redis://redis:6379/0}"
       M8FLOW_BACKEND_RUNNING_IN_CELERY_WORKER: "true"

m8flow-connector-proxy/poetry.lock

@@ -17,9 +17,9 @@ spiffworkflow-proxy = {git = "https://github.com/sartography/spiffworkflow-proxy
 # m8flow-connector-http = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-http", branch = "main" }
 m8flow-connector-smtp = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-smtp", branch = "main" }
 connector-postgres-v2 = {git = "https://github.com/sartography/connector-postgres.git"}
-connector-slack = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-slack", branch = "main" }
-connector-salesforce = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-salesforce", branch = "main" }
-connector-stripe = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/connector-stripe", branch = "main" }
+m8flow-connector-slack = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-slack", branch = "main" }
+m8flow-connector-salesforce = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-salesforce", branch = "main" }
+m8flow-connector-stripe = { git = "https://github.com/AOT-Technologies/m8flow-connectors.git", subdirectory = "connectors/m8flow-connector-stripe", branch = "main" }
 # dependencies for connector
 psycopg2-binary = "^2.9.9"
 

m8flow-connector-proxy/pyproject.toml

@@ -97,8 +97,8 @@ M8FLOW_BACKEND_CELERY_FLOWER_BASIC_AUTH=admin:admin
 
 
 # --- Connector proxy ---
-CONNECTOR_PROXY_PORT=8004
-M8FLOW_BACKEND_CONNECTOR_PROXY_URL=http://localhost:8004
+# CONNECTOR_PROXY_PORT=8004
+# M8FLOW_BACKEND_CONNECTOR_PROXY_URL=http://localhost:8004
 # --- M8Flow Connector: SMTP ---
 # Local directory for connector to map attachments to.
 M8FLOW_CONNECTOR_SMTP_ATTACHMENTS_DIR=../email_attachments